diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 51e93adfafebde78d63dfe8787a2d791b181a5dc..0df82a9ed13043e04415266524d60daf71fec057 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
{
"ImportPath": "github.com/jbenet/go-ipfs",
- "GoVersion": "go1.3.3",
+ "GoVersion": "go1.3",
"Packages": [
"./..."
],
@@ -66,14 +66,14 @@
"ImportPath": "github.com/jbenet/commander",
"Rev": "e0cf317891f0ab6f1ac64dfcb754b4fb5e69f7df"
},
- {
- "ImportPath": "github.com/jbenet/go-datastore",
- "Rev": "da593f5071b3ce60bf45b548193863bc3c885c3c"
- },
{
"ImportPath": "github.com/jbenet/go-base58",
"Rev": "568a28d73fd97651d3442392036a658b6976eed5"
},
+ {
+ "ImportPath": "github.com/jbenet/go-datastore",
+ "Rev": "da593f5071b3ce60bf45b548193863bc3c885c3c"
+ },
{
"ImportPath": "github.com/jbenet/go-is-domain",
"Rev": "93b717f2ae17838a265e30277275ee99ee7198d6"
diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/doc.go b/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/doc.go
deleted file mode 100644
index 208b7d11444cf7151699c1a09e360152a918cc27..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/doc.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Package keytransform introduces a Datastore Shim that transforms keys before
-// passing them to its child. It can be used to manipulate what keys look like
-// to the user, for example namespacing keys, reversing them, etc.
-//
-// Use the Wrap function to wrap a datastore with any KeyTransform.
-// A KeyTransform is simply an interface with two functions, a conversion and
-// its inverse. For example:
-//
-// import (
-// ktds "github.com/jbenet/datastore.go/keytransform"
-// ds "github.com/jbenet/datastore.go"
-// )
-//
-// func reverseKey(k ds.Key) ds.Key {
-// return k.Reverse()
-// }
-//
-// func invertKeys(d ds.Datastore) {
-// return ktds.Wrap(d, &ktds.Pair{
-// Convert: reverseKey,
-// Invert: reverseKey, // reverse is its own inverse.
-// })
-// }
-//
-package keytransform
diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/interface.go b/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/interface.go
deleted file mode 100644
index 3ae83f3571e382ff11597e9e2833105eeefe7ec9..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/interface.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package keytransform
-
-import ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
-
-// KeyMapping is a function that maps one key to annother
-type KeyMapping func(ds.Key) ds.Key
-
-// KeyTransform is an object with a pair of functions for (invertibly)
-// transforming keys
-type KeyTransform interface {
- ConvertKey(ds.Key) ds.Key
- InvertKey(ds.Key) ds.Key
-}
-
-// Datastore is a keytransform.Datastore
-type Datastore interface {
- ds.Shim
- KeyTransform
-}
-
-// Wrap wraps a given datastore with a KeyTransform function.
-// The resulting wrapped datastore will use the transform on all Datastore
-// operations.
-func Wrap(child ds.Datastore, t KeyTransform) Datastore {
- if t == nil {
- panic("t (KeyTransform) is nil")
- }
-
- if child == nil {
- panic("child (ds.Datastore) is nil")
- }
-
- return &ktds{child: child, KeyTransform: t}
-}
diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/doc.go b/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/doc.go
deleted file mode 100644
index 2d7dcad4d29888a8e820b0f4b62d99cff9648319..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/doc.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Package namespace introduces a namespace Datastore Shim, which basically
-// mounts the entire child datastore under a prefix.
-//
-// Use the Wrap function to wrap a datastore with any Key prefix. For example:
-//
-// import (
-// "fmt"
-//
-// ds "github.com/jbenet/datastore.go"
-// nsds "github.com/jbenet/datastore.go/namespace"
-// )
-//
-// func main() {
-// mp := ds.NewMapDatastore()
-// ns := nsds.Wrap(mp, ds.NewKey("/foo/bar"))
-//
-// // in the Namespace Datastore:
-// ns.Put(ds.NewKey("/beep"), "boop")
-// v2, _ := ns.Get(ds.NewKey("/beep")) // v2 == "boop"
-//
-// // and, in the underlying MapDatastore:
-// v3, _ := mp.Get(ds.NewKey("/foo/bar/beep")) // v3 == "boop"
-// }
-package namespace
diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/example_test.go b/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/example_test.go
deleted file mode 100644
index f42caf3b6276964250575fb8861ab1816033ca64..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/example_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package namespace_test
-
-import (
- "fmt"
-
- ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
- nsds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace"
-)
-
-func Example() {
- mp := ds.NewMapDatastore()
- ns := nsds.Wrap(mp, ds.NewKey("/foo/bar"))
-
- k := ds.NewKey("/beep")
- v := "boop"
-
- ns.Put(k, v)
- fmt.Printf("ns.Put %s %s\n", k, v)
-
- v2, _ := ns.Get(k)
- fmt.Printf("ns.Get %s -> %s\n", k, v2)
-
- k3 := ds.NewKey("/foo/bar/beep")
- v3, _ := mp.Get(k3)
- fmt.Printf("mp.Get %s -> %s\n", k3, v3)
- // Output:
- // ns.Put /beep -> boop
- // ns.Get /beep -> boop
- // mp.Get /foo/bar/beep -> boop
-}
diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/namespace.go b/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/namespace.go
deleted file mode 100644
index 815385f89266edf2717f786586f6899ab5637fc2..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/namespace.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package namespace
-
-import (
- "fmt"
- "strings"
-
- ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
- ktds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform"
-)
-
-// PrefixTransform constructs a KeyTransform with a pair of functions that
-// add or remove the given prefix key.
-//
-// Warning: will panic if prefix not found when it should be there. This is
-// to avoid insidious data inconsistency errors.
-func PrefixTransform(prefix ds.Key) ktds.KeyTransform {
- return &ktds.Pair{
-
- // Convert adds the prefix
- Convert: func(k ds.Key) ds.Key {
- return prefix.Child(k)
- },
-
- // Invert removes the prefix. panics if prefix not found.
- Invert: func(k ds.Key) ds.Key {
- if !prefix.IsAncestorOf(k) {
- fmt.Errorf("Expected prefix (%s) in key (%s)", prefix, k)
- panic("expected prefix not found")
- }
-
- s := strings.TrimPrefix(k.String(), prefix.String())
- return ds.NewKey(s)
- },
- }
-}
-
-// Wrap wraps a given datastore with a key-prefix.
-func Wrap(child ds.Datastore, prefix ds.Key) ktds.Datastore {
- if child == nil {
- panic("child (ds.Datastore) is nil")
- }
-
- return ktds.Wrap(child, PrefixTransform(prefix))
-}
diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/namespace_test.go b/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/namespace_test.go
deleted file mode 100644
index f49a5f9daa3c8cb4a0173638880c979a6b15c304..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/namespace_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package namespace_test
-
-import (
- "bytes"
- "sort"
- "testing"
-
- ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
- ns "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace"
- . "launchpad.net/gocheck"
-)
-
-// Hook up gocheck into the "go test" runner.
-func Test(t *testing.T) { TestingT(t) }
-
-type DSSuite struct{}
-
-var _ = Suite(&DSSuite{})
-
-func (ks *DSSuite) TestBasic(c *C) {
-
- mpds := ds.NewMapDatastore()
- nsds := ns.Wrap(mpds, ds.NewKey("abc"))
-
- keys := strsToKeys([]string{
- "foo",
- "foo/bar",
- "foo/bar/baz",
- "foo/barb",
- "foo/bar/bazb",
- "foo/bar/baz/barb",
- })
-
- for _, k := range keys {
- err := nsds.Put(k, []byte(k.String()))
- c.Check(err, Equals, nil)
- }
-
- for _, k := range keys {
- v1, err := nsds.Get(k)
- c.Check(err, Equals, nil)
- c.Check(bytes.Equal(v1.([]byte), []byte(k.String())), Equals, true)
-
- v2, err := mpds.Get(ds.NewKey("abc").Child(k))
- c.Check(err, Equals, nil)
- c.Check(bytes.Equal(v2.([]byte), []byte(k.String())), Equals, true)
- }
-
- listA, errA := mpds.KeyList()
- listB, errB := nsds.KeyList()
- c.Check(errA, Equals, nil)
- c.Check(errB, Equals, nil)
- c.Check(len(listA), Equals, len(listB))
-
- // sort them cause yeah.
- sort.Sort(ds.KeySlice(listA))
- sort.Sort(ds.KeySlice(listB))
-
- for i, kA := range listA {
- kB := listB[i]
- c.Check(nsds.InvertKey(kA), Equals, kB)
- c.Check(kA, Equals, nsds.ConvertKey(kB))
- }
-}
-
-func strsToKeys(strs []string) []ds.Key {
- keys := make([]ds.Key, len(strs))
- for i, s := range strs {
- keys[i] = ds.NewKey(s)
- }
- return keys
-}
diff --git a/net/handshake/pb/handshake.pb.go b/net/handshake/pb/handshake.pb.go
index d80a2b477c50422c9e46b869eab96a140f3f3969..2308297b96a666b7eae9b74b6ac6d7f64e7b57a6 100644
--- a/net/handshake/pb/handshake.pb.go
+++ b/net/handshake/pb/handshake.pb.go
@@ -14,7 +14,7 @@ It has these top-level messages:
*/
package handshake_pb
-import proto "code.google.com/p/gogoprotobuf/proto"
+import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
import json "encoding/json"
import math "math"