diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index ed90a76d8..0a2b0780b 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -67,7 +67,7 @@ "Rev": "e0cf317891f0ab6f1ac64dfcb754b4fb5e69f7df" }, { - "ImportPath": "github.com/jbenet/datastore.go", + "ImportPath": "github.com/jbenet/go-datastore", "Rev": "da593f5071b3ce60bf45b548193863bc3c885c3c" }, { diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/Godeps/Godeps.json b/Godeps/_workspace/src/github.com/jbenet/go-datastore/Godeps/Godeps.json similarity index 95% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/Godeps/Godeps.json rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/Godeps/Godeps.json index bebf4a58f..6d87a044d 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/Godeps/Godeps.json +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/Godeps/Godeps.json @@ -1,5 +1,5 @@ { - "ImportPath": "github.com/jbenet/datastore.go", + "ImportPath": "github.com/jbenet/go-datastore", "GoVersion": "go1.3.1", "Packages": [ "./..." diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/Godeps/Readme b/Godeps/_workspace/src/github.com/jbenet/go-datastore/Godeps/Readme similarity index 100% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/Godeps/Readme rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/Godeps/Readme diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/LICENSE b/Godeps/_workspace/src/github.com/jbenet/go-datastore/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/LICENSE rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/LICENSE diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/Makefile b/Godeps/_workspace/src/github.com/jbenet/go-datastore/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/Makefile rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/Makefile diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/README.md b/Godeps/_workspace/src/github.com/jbenet/go-datastore/README.md similarity index 92% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/README.md rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/README.md index 6c0a3124a..3230090a8 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/README.md +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/README.md @@ -8,7 +8,7 @@ Based on [datastore.py](https://github.com/datastore/datastore). ### Documentation -https://godoc.org/github.com/datastore/datastore.go +https://godoc.org/github.com/datastore/go-datastore ### License diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/basic_ds.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/basic_ds.go similarity index 100% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/basic_ds.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/basic_ds.go diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/datastore.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/datastore.go similarity index 100% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/datastore.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/datastore.go diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/elastigo/datastore.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/elastigo/datastore.go similarity index 99% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/elastigo/datastore.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/elastigo/datastore.go index d0f707bdc..32a7bdda3 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/elastigo/datastore.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/elastigo/datastore.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/codahale/blake2" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" "github.com/mattbaird/elastigo/api" "github.com/mattbaird/elastigo/core" ) diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/fs/fs.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/fs/fs.go similarity index 99% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/fs/fs.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/fs/fs.go index 1c1ac791d..2fa8fcd36 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/fs/fs.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/fs/fs.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" ) // Datastore uses a standard Go map for internal storage. diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/fs/fs_test.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/fs/fs_test.go similarity index 96% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/fs/fs_test.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/fs/fs_test.go index cd69647d0..8e5d94ac4 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/fs/fs_test.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/fs/fs_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" - fs "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go/fs" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + fs "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/fs" . "launchpad.net/gocheck" ) diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/io/io.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/io/io.go similarity index 97% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/io/io.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/io/io.go index 338b2e053..3d5d2c770 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/io/io.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/io/io.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" ) // CastAsReader does type assertions to find the type of a value and attempts diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/key.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/key.go similarity index 100% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/key.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/key.go diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/key_test.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/key_test.go similarity index 99% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/key_test.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/key_test.go index 55da4c151..d8f64baf6 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/key_test.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/key_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - . "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + . "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" . "gopkg.in/check.v1" ) diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/doc.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/keytransform/doc.go similarity index 87% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/doc.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/keytransform/doc.go index 208b7d114..b1f9ddf27 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/doc.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/keytransform/doc.go @@ -7,8 +7,8 @@ // its inverse. For example: // // import ( -// ktds "github.com/jbenet/datastore.go/keytransform" -// ds "github.com/jbenet/datastore.go" +// ktds "github.com/jbenet/go-datastore/keytransform" +// ds "github.com/jbenet/go-datastore" // ) // // func reverseKey(k ds.Key) ds.Key { diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/interface.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/keytransform/interface.go similarity index 96% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/interface.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/keytransform/interface.go index 3ae83f357..a9068a989 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/interface.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/keytransform/interface.go @@ -1,6 +1,6 @@ package keytransform -import ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" +import ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" // KeyMapping is a function that maps one key to annother type KeyMapping func(ds.Key) ds.Key diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/keytransform.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/keytransform/keytransform.go similarity index 98% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/keytransform.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/keytransform/keytransform.go index 7a7000244..6566905d9 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/keytransform.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/keytransform/keytransform.go @@ -1,6 +1,6 @@ package keytransform -import ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" +import ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" type Pair struct { Convert KeyMapping diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/keytransform_test.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/keytransform/keytransform_test.go similarity index 97% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/keytransform_test.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/keytransform/keytransform_test.go index ce82dd157..ec1bfac30 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform/keytransform_test.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/keytransform/keytransform_test.go @@ -5,8 +5,8 @@ import ( "sort" "testing" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" - kt "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + kt "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/keytransform" . "launchpad.net/gocheck" ) diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/leveldb/datastore.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/leveldb/datastore.go similarity index 98% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/leveldb/datastore.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/leveldb/datastore.go index 6fc2594a1..bc851d3bf 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/leveldb/datastore.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/leveldb/datastore.go @@ -1,7 +1,7 @@ package leveldb import ( - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/opt" ) diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/lru/datastore.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/lru/datastore.go similarity index 98% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/lru/datastore.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/lru/datastore.go index 2dd74faa9..b417b63a9 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/lru/datastore.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/lru/datastore.go @@ -4,7 +4,7 @@ import ( "errors" lru "github.com/hashicorp/golang-lru" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" ) // Datastore uses golang-lru for internal storage. diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/lru/datastore_test.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/lru/datastore_test.go similarity index 95% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/lru/datastore_test.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/lru/datastore_test.go index b030df9a2..49c77feca 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/lru/datastore_test.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/lru/datastore_test.go @@ -4,8 +4,8 @@ import ( "strconv" "testing" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" - lru "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go/lru" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + lru "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/lru" . "gopkg.in/check.v1" ) diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/doc.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace/doc.go similarity index 86% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/doc.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace/doc.go index 2d7dcad4d..89bec27ab 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/doc.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace/doc.go @@ -6,8 +6,8 @@ // import ( // "fmt" // -// ds "github.com/jbenet/datastore.go" -// nsds "github.com/jbenet/datastore.go/namespace" +// ds "github.com/jbenet/go-datastore" +// nsds "github.com/jbenet/go-datastore/namespace" // ) // // func main() { diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/example_test.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace/example_test.go similarity index 91% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/example_test.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace/example_test.go index f42caf3b6..ef9ad395b 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/example_test.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace/example_test.go @@ -3,8 +3,8 @@ 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" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + nsds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace" ) func Example() { diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/namespace.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace/namespace.go similarity index 95% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/namespace.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace/namespace.go index 815385f89..4ad5f3073 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/namespace.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace/namespace.go @@ -4,8 +4,8 @@ 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" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + ktds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/keytransform" ) // PrefixTransform constructs a KeyTransform with a pair of functions that diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/namespace_test.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace/namespace_test.go similarity index 96% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/namespace_test.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace/namespace_test.go index f49a5f9da..df8a4f419 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/namespace/namespace_test.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace/namespace_test.go @@ -5,8 +5,8 @@ import ( "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" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + ns "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace" . "launchpad.net/gocheck" ) diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/panic/panic.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/panic/panic.go similarity index 98% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/panic/panic.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/panic/panic.go index 31c1aec6f..a1c5850fe 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/panic/panic.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/panic/panic.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" ) type datastore struct { diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/query.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/query.go similarity index 100% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/query.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/query.go diff --git a/Godeps/_workspace/src/github.com/jbenet/datastore.go/sync/sync.go b/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync/sync.go similarity index 98% rename from Godeps/_workspace/src/github.com/jbenet/datastore.go/sync/sync.go rename to Godeps/_workspace/src/github.com/jbenet/go-datastore/sync/sync.go index 06a363410..1881adea1 100644 --- a/Godeps/_workspace/src/github.com/jbenet/datastore.go/sync/sync.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync/sync.go @@ -3,7 +3,7 @@ package sync import ( "sync" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" ) // MutexDatastore contains a child datastire and a mutex. diff --git a/blockservice/blocks_test.go b/blockservice/blocks_test.go index 764d2d400..41eceaae6 100644 --- a/blockservice/blocks_test.go +++ b/blockservice/blocks_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" blocks "github.com/jbenet/go-ipfs/blocks" u "github.com/jbenet/go-ipfs/util" ) diff --git a/blockservice/blockservice.go b/blockservice/blockservice.go index dcf15ce95..9f914dc38 100644 --- a/blockservice/blockservice.go +++ b/blockservice/blockservice.go @@ -5,7 +5,7 @@ import ( "time" context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" blocks "github.com/jbenet/go-ipfs/blocks" diff --git a/blockstore/blockstore.go b/blockstore/blockstore.go index 6a0d10b74..99892b24b 100644 --- a/blockstore/blockstore.go +++ b/blockstore/blockstore.go @@ -3,7 +3,7 @@ package blockstore import ( "errors" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" blocks "github.com/jbenet/go-ipfs/blocks" u "github.com/jbenet/go-ipfs/util" diff --git a/blockstore/blockstore_test.go b/blockstore/blockstore_test.go index 98c00a9fa..8daed5f3d 100644 --- a/blockstore/blockstore_test.go +++ b/blockstore/blockstore_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" blocks "github.com/jbenet/go-ipfs/blocks" u "github.com/jbenet/go-ipfs/util" ) diff --git a/core/core.go b/core/core.go index bb30d59d0..8d67de0e2 100644 --- a/core/core.go +++ b/core/core.go @@ -6,7 +6,7 @@ import ( "fmt" context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" diff --git a/core/datastore.go b/core/datastore.go index da73285f1..b6f9a5523 100644 --- a/core/datastore.go +++ b/core/datastore.go @@ -3,11 +3,11 @@ package core import ( "fmt" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" - fsds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go/fs" - ktds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go/keytransform" - lds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go/leveldb" - syncds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go/sync" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + fsds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/fs" + ktds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/keytransform" + lds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/leveldb" + syncds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" config "github.com/jbenet/go-ipfs/config" u "github.com/jbenet/go-ipfs/util" diff --git a/core/mock.go b/core/mock.go index adc30203f..2257e9885 100644 --- a/core/mock.go +++ b/core/mock.go @@ -1,8 +1,8 @@ package core import ( - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" - syncds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go/sync" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + syncds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" bs "github.com/jbenet/go-ipfs/blockservice" ci "github.com/jbenet/go-ipfs/crypto" mdag "github.com/jbenet/go-ipfs/merkledag" diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go index 4a3170fac..19ee6e2fc 100644 --- a/exchange/bitswap/bitswap.go +++ b/exchange/bitswap/bitswap.go @@ -2,7 +2,7 @@ package bitswap import ( context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" blocks "github.com/jbenet/go-ipfs/blocks" blockstore "github.com/jbenet/go-ipfs/blockstore" diff --git a/exchange/bitswap/bitswap_test.go b/exchange/bitswap/bitswap_test.go index 8a2f1f421..4c881a04e 100644 --- a/exchange/bitswap/bitswap_test.go +++ b/exchange/bitswap/bitswap_test.go @@ -8,7 +8,7 @@ import ( context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" blocks "github.com/jbenet/go-ipfs/blocks" bstore "github.com/jbenet/go-ipfs/blockstore" exchange "github.com/jbenet/go-ipfs/exchange" diff --git a/namesys/resolve_test.go b/namesys/resolve_test.go index c6ee63351..d7d49c5a6 100644 --- a/namesys/resolve_test.go +++ b/namesys/resolve_test.go @@ -3,7 +3,7 @@ package namesys import ( "testing" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" ci "github.com/jbenet/go-ipfs/crypto" "github.com/jbenet/go-ipfs/peer" mock "github.com/jbenet/go-ipfs/routing/mock" diff --git a/peer/peerstore.go b/peer/peerstore.go index 7bbb3e125..9513c6a93 100644 --- a/peer/peerstore.go +++ b/peer/peerstore.go @@ -6,7 +6,7 @@ import ( u "github.com/jbenet/go-ipfs/util" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" ) // Peerstore provides a threadsafe collection for peers. diff --git a/routing/dht/dht.go b/routing/dht/dht.go index 3617b7142..a0f14aa91 100644 --- a/routing/dht/dht.go +++ b/routing/dht/dht.go @@ -15,7 +15,7 @@ import ( u "github.com/jbenet/go-ipfs/util" context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto" diff --git a/routing/dht/dht_test.go b/routing/dht/dht_test.go index 23d9fcf17..590d5ead3 100644 --- a/routing/dht/dht_test.go +++ b/routing/dht/dht_test.go @@ -6,7 +6,7 @@ import ( context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ci "github.com/jbenet/go-ipfs/crypto" diff --git a/routing/dht/ext_test.go b/routing/dht/ext_test.go index b38b12d6c..43bd34f8a 100644 --- a/routing/dht/ext_test.go +++ b/routing/dht/ext_test.go @@ -8,7 +8,7 @@ import ( context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" msg "github.com/jbenet/go-ipfs/net/message" mux "github.com/jbenet/go-ipfs/net/mux" peer "github.com/jbenet/go-ipfs/peer" diff --git a/routing/dht/handlers.go b/routing/dht/handlers.go index 44802babb..d3c4d23e3 100644 --- a/routing/dht/handlers.go +++ b/routing/dht/handlers.go @@ -8,7 +8,7 @@ import ( peer "github.com/jbenet/go-ipfs/peer" u "github.com/jbenet/go-ipfs/util" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" ) var CloserPeerCount = 4 diff --git a/routing/mock/routing.go b/routing/mock/routing.go index caa74ffe3..9c6919589 100644 --- a/routing/mock/routing.go +++ b/routing/mock/routing.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" peer "github.com/jbenet/go-ipfs/peer" routing "github.com/jbenet/go-ipfs/routing" u "github.com/jbenet/go-ipfs/util" diff --git a/unixfs/io/dagmodifier_test.go b/unixfs/io/dagmodifier_test.go index 5c96aaae4..5e9edb727 100644 --- a/unixfs/io/dagmodifier_test.go +++ b/unixfs/io/dagmodifier_test.go @@ -13,7 +13,7 @@ import ( ft "github.com/jbenet/go-ipfs/unixfs" u "github.com/jbenet/go-ipfs/util" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" ) func getMockDagServ(t *testing.T) *mdag.DAGService { diff --git a/unixfs/io/dagwriter_test.go b/unixfs/io/dagwriter_test.go index 73ba5c4e9..ddf5f9d66 100644 --- a/unixfs/io/dagwriter_test.go +++ b/unixfs/io/dagwriter_test.go @@ -5,7 +5,7 @@ import ( "io" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" bs "github.com/jbenet/go-ipfs/blockservice" chunk "github.com/jbenet/go-ipfs/importer/chunk" mdag "github.com/jbenet/go-ipfs/merkledag" diff --git a/util/key.go b/util/key.go index abcbf6329..075b73c45 100644 --- a/util/key.go +++ b/util/key.go @@ -1,8 +1,8 @@ package util import ( - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" ) diff --git a/util/util.go b/util/util.go index 475e0eb92..db19e06c9 100644 --- a/util/util.go +++ b/util/util.go @@ -9,7 +9,7 @@ import ( "strings" "time" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go" + ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir" )