@cryptotaxi247 / kubo / commits / cafd81c8c

Import go-datastore to gx

License: MIT Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>

Jakub Sztandera committed Jun 11, 2016 at 16:18 UTC cafd81c8c60e3d41707bd3dac09324be6c7ff06b
50 files changed +90 -84
blocks/blockstore/blockstore.go
+3 -3
@@ -7,13 +7,13 @@ import (
7 "sync"
8 "sync/atomic"
9
10 - ds "github.com/ipfs/go-datastore"
11 - dsns "github.com/ipfs/go-datastore/namespace"
12 - dsq "github.com/ipfs/go-datastore/query"
10 blocks "github.com/ipfs/go-ipfs/blocks"
11 key "github.com/ipfs/go-ipfs/blocks/key"
12 mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
13 logging "gx/ipfs/QmYtB7Qge8cJpXc4irsEp8zRqfnZMBeB7aTrMEkPk67DRv/go-log"
14 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
15 + dsns "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/namespace"
16 + dsq "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/query"
17 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
18 )
19
blocks/blockstore/blockstore_test.go
+3 -3
@@ -5,9 +5,9 @@ import (
5 "fmt"
6 "testing"
7
8 - ds "github.com/ipfs/go-datastore"
9 - dsq "github.com/ipfs/go-datastore/query"
10 - ds_sync "github.com/ipfs/go-datastore/sync"
8 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
9 + dsq "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/query"
10 + ds_sync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
11 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
13 blocks "github.com/ipfs/go-ipfs/blocks"
blocks/blockstore/write_cache_test.go
+3 -3
@@ -3,10 +3,10 @@ package blockstore
3 import (
4 "testing"
5
6 - ds "github.com/ipfs/go-datastore"
7 - dsq "github.com/ipfs/go-datastore/query"
8 - syncds "github.com/ipfs/go-datastore/sync"
6 "github.com/ipfs/go-ipfs/blocks"
7 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
8 + dsq "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/query"
9 + syncds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
10 )
11
12 func TestReturnsErrorWhenSizeNegative(t *testing.T) {
blocks/key/key.go
+1 -1
@@ -4,9 +4,9 @@ import (
4 "encoding/json"
5 "fmt"
6
7 - ds "github.com/ipfs/go-datastore"
7 b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58"
8 mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
9 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
10 )
11
12 // Key is a string representation of multihash for use with maps.
blockservice/test/blocks_test.go
+2 -2
@@ -5,14 +5,14 @@ import (
5 "testing"
6 "time"
7
8 - ds "github.com/ipfs/go-datastore"
9 - dssync "github.com/ipfs/go-datastore/sync"
8 blocks "github.com/ipfs/go-ipfs/blocks"
9 blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
10 blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
11 key "github.com/ipfs/go-ipfs/blocks/key"
12 . "github.com/ipfs/go-ipfs/blockservice"
13 offline "github.com/ipfs/go-ipfs/exchange/offline"
14 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
15 + dssync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
16 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
17 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
18 )
core/builder.go
+2 -2
@@ -5,8 +5,6 @@ import (
5 "encoding/base64"
6 "errors"
7
8 - ds "github.com/ipfs/go-datastore"
9 - dsync "github.com/ipfs/go-datastore/sync"
8 bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
9 key "github.com/ipfs/go-ipfs/blocks/key"
10 bserv "github.com/ipfs/go-ipfs/blockservice"
@@ -16,6 +14,8 @@ import (
14 pin "github.com/ipfs/go-ipfs/pin"
15 repo "github.com/ipfs/go-ipfs/repo"
16 cfg "github.com/ipfs/go-ipfs/repo/config"
17 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
18 + dsync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
19
20 goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
21 ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
core/core.go
+1 -1
@@ -16,7 +16,6 @@ import (
16 "net"
17 "time"
18
19 - ds "github.com/ipfs/go-datastore"
19 diag "github.com/ipfs/go-ipfs/diagnostics"
20 peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
21 discovery "gx/ipfs/QmQkQP7WmeT9FRJDsEzAaGYDparttDiB6mCpVBrq2MuWQS/go-libp2p/p2p/discovery"
@@ -34,6 +33,7 @@ import (
33 pstore "gx/ipfs/QmXHUpFsnpCmanRnacqYkFoLoFfEq5yS2nUgGkAjJ1Nj9j/go-libp2p-peerstore"
34 logging "gx/ipfs/QmYtB7Qge8cJpXc4irsEp8zRqfnZMBeB7aTrMEkPk67DRv/go-log"
35 ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
36 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
37 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
38
39 routing "github.com/ipfs/go-ipfs/routing"
core/corerouting/core.go
+1 -1
@@ -3,7 +3,6 @@ package corerouting
3 import (
4 "errors"
5
6 - ds "github.com/ipfs/go-datastore"
6 core "github.com/ipfs/go-ipfs/core"
7 repo "github.com/ipfs/go-ipfs/repo"
8 routing "github.com/ipfs/go-ipfs/routing"
@@ -11,6 +10,7 @@ import (
10 gcproxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
11 "gx/ipfs/QmQkQP7WmeT9FRJDsEzAaGYDparttDiB6mCpVBrq2MuWQS/go-libp2p/p2p/host"
12 pstore "gx/ipfs/QmXHUpFsnpCmanRnacqYkFoLoFfEq5yS2nUgGkAjJ1Nj9j/go-libp2p-peerstore"
13 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
14 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15 )
16
core/coreunix/add.go
+2 -2
@@ -7,8 +7,6 @@ import (
7 "os"
8 gopath "path"
9
10 - ds "github.com/ipfs/go-datastore"
11 - syncds "github.com/ipfs/go-datastore/sync"
10 bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
11 key "github.com/ipfs/go-ipfs/blocks/key"
12 bserv "github.com/ipfs/go-ipfs/blockservice"
@@ -17,6 +15,8 @@ import (
15 "github.com/ipfs/go-ipfs/importer/chunk"
16 mfs "github.com/ipfs/go-ipfs/mfs"
17 "github.com/ipfs/go-ipfs/pin"
18 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
19 + syncds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
20 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
21
22 bs "github.com/ipfs/go-ipfs/blocks/blockstore"
core/coreunix/metadata_test.go
+2 -2
@@ -5,8 +5,8 @@ import (
5 "io/ioutil"
6 "testing"
7
8 - ds "github.com/ipfs/go-datastore"
9 - dssync "github.com/ipfs/go-datastore/sync"
8 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
9 + dssync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
10 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
12 bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
core/mock/mock.go
+2 -2
@@ -3,8 +3,8 @@ package coremock
3 import (
4 "net"
5
6 - "github.com/ipfs/go-datastore"
7 - syncds "github.com/ipfs/go-datastore/sync"
6 + "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
7 + syncds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
8 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9
10 commands "github.com/ipfs/go-ipfs/commands"
exchange/bitswap/decision/engine_test.go
+2 -2
@@ -8,13 +8,13 @@ import (
8 "sync"
9 "testing"
10
11 - ds "github.com/ipfs/go-datastore"
12 - dssync "github.com/ipfs/go-datastore/sync"
11 blocks "github.com/ipfs/go-ipfs/blocks"
12 blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
13 message "github.com/ipfs/go-ipfs/exchange/bitswap/message"
14 testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
15 peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
16 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
17 + dssync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
18 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19 )
20
exchange/bitswap/testnet/peernet.go
+1 -1
@@ -1,12 +1,12 @@
1 package bitswap
2
3 import (
4 - ds "github.com/ipfs/go-datastore"
4 bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
5 mockrouting "github.com/ipfs/go-ipfs/routing/mock"
6 testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
7 peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
8 mockpeernet "gx/ipfs/QmQkQP7WmeT9FRJDsEzAaGYDparttDiB6mCpVBrq2MuWQS/go-libp2p/p2p/net/mock"
9 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
10 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11 )
12
exchange/bitswap/testutils.go
+2 -2
@@ -3,8 +3,6 @@ package bitswap
3 import (
4 "time"
5
6 - ds "github.com/ipfs/go-datastore"
7 - ds_sync "github.com/ipfs/go-datastore/sync"
6 blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
7 tn "github.com/ipfs/go-ipfs/exchange/bitswap/testnet"
8 datastore2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
@@ -12,6 +10,8 @@ import (
10 testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
11 peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
12 p2ptestutil "gx/ipfs/QmQkQP7WmeT9FRJDsEzAaGYDparttDiB6mCpVBrq2MuWQS/go-libp2p/p2p/test/util"
13 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
14 + ds_sync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
15 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16 )
17
exchange/offline/offline_test.go
+2 -2
@@ -3,12 +3,12 @@ package offline
3 import (
4 "testing"
5
6 - ds "github.com/ipfs/go-datastore"
7 - ds_sync "github.com/ipfs/go-datastore/sync"
6 blocks "github.com/ipfs/go-ipfs/blocks"
7 "github.com/ipfs/go-ipfs/blocks/blockstore"
8 "github.com/ipfs/go-ipfs/blocks/blocksutil"
9 key "github.com/ipfs/go-ipfs/blocks/key"
10 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
11 + ds_sync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
12 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13 )
14
exchange/reprovide/reprovide_test.go
+2 -2
@@ -3,12 +3,12 @@ package reprovide_test
3 import (
4 "testing"
5
6 - ds "github.com/ipfs/go-datastore"
7 - dssync "github.com/ipfs/go-datastore/sync"
6 blocks "github.com/ipfs/go-ipfs/blocks"
7 blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
8 mock "github.com/ipfs/go-ipfs/routing/mock"
9 testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
10 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
11 + dssync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
12 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
14 . "github.com/ipfs/go-ipfs/exchange/reprovide"
merkledag/merkledag_test.go
+2 -2
@@ -10,8 +10,6 @@ import (
10 "sync"
11 "testing"
12
13 - ds "github.com/ipfs/go-datastore"
14 - dssync "github.com/ipfs/go-datastore/sync"
13 bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
14 key "github.com/ipfs/go-ipfs/blocks/key"
15 bserv "github.com/ipfs/go-ipfs/blockservice"
@@ -23,6 +21,8 @@ import (
21 dstest "github.com/ipfs/go-ipfs/merkledag/test"
22 "github.com/ipfs/go-ipfs/pin"
23 uio "github.com/ipfs/go-ipfs/unixfs/io"
24 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
25 + dssync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
26 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
27 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
28 )
merkledag/test/utils.go
+2 -2
@@ -1,12 +1,12 @@
1 package mdutils
2
3 import (
4 - ds "github.com/ipfs/go-datastore"
5 - dssync "github.com/ipfs/go-datastore/sync"
4 "github.com/ipfs/go-ipfs/blocks/blockstore"
5 bsrv "github.com/ipfs/go-ipfs/blockservice"
6 "github.com/ipfs/go-ipfs/exchange/offline"
7 dag "github.com/ipfs/go-ipfs/merkledag"
8 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
9 + dssync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
10 )
11
12 func Mock() dag.DAGService {
merkledag/utils/utils.go
+2 -2
@@ -3,8 +3,8 @@ package dagutils
3 import (
4 "errors"
5
6 - ds "github.com/ipfs/go-datastore"
7 - syncds "github.com/ipfs/go-datastore/sync"
6 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
7 + syncds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
8 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9
10 bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
mfs/mfs_test.go
+2 -2
@@ -13,10 +13,10 @@ import (
13 "testing"
14 "time"
15
16 - ds "github.com/ipfs/go-datastore"
17 - dssync "github.com/ipfs/go-datastore/sync"
16 "github.com/ipfs/go-ipfs/path"
17 randbo "gx/ipfs/QmYvsG72GsfLgUeSojXArjnU6L4Wmwk7wuAxtNLuyXcc1T/randbo"
18 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
19 + dssync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
20 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
21
22 bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
namesys/namesys.go
+1 -1
@@ -4,10 +4,10 @@ import (
4 "strings"
5 "time"
6
7 - ds "github.com/ipfs/go-datastore"
7 path "github.com/ipfs/go-ipfs/path"
8 routing "github.com/ipfs/go-ipfs/routing"
9 ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
10 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
11 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12 )
13
namesys/publisher.go
+1 -1
@@ -6,8 +6,8 @@ import (
6 "fmt"
7 "time"
8
9 - ds "github.com/ipfs/go-datastore"
9 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
10 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
11 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
13 key "github.com/ipfs/go-ipfs/blocks/key"
namesys/republisher/repub.go
+1 -1
@@ -12,13 +12,13 @@ import (
12 "github.com/ipfs/go-ipfs/routing"
13 dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
14
15 - ds "github.com/ipfs/go-datastore"
15 peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
16 goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
17 gpctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
18 pstore "gx/ipfs/QmXHUpFsnpCmanRnacqYkFoLoFfEq5yS2nUgGkAjJ1Nj9j/go-libp2p-peerstore"
19 logging "gx/ipfs/QmYtB7Qge8cJpXc4irsEp8zRqfnZMBeB7aTrMEkPk67DRv/go-log"
20 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
21 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
22 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
23 )
24
namesys/resolve_test.go
+2 -2
@@ -5,13 +5,13 @@ import (
5 "testing"
6 "time"
7
8 - ds "github.com/ipfs/go-datastore"
9 - dssync "github.com/ipfs/go-datastore/sync"
8 key "github.com/ipfs/go-ipfs/blocks/key"
9 path "github.com/ipfs/go-ipfs/path"
10 mockrouting "github.com/ipfs/go-ipfs/routing/mock"
11 testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
12 peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
13 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
14 + dssync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
15 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17 )
package.json
+6
@@ -141,6 +141,12 @@
141 "hash": "QmczzCMvJ3HV57WBKDy8b4ucp7quT325JjDbixYRS5Pwvv",
142 "name": "fsnotify.v1",
143 "version": "1.3.0"
144 + },
145 + {
146 + "author": "jbenet",
147 + "hash": "QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN",
148 + "name": "go-datastore",
149 + "version": "0.0.1"
150 }
151 ],
152 "gxVersion": "0.4.0",
pin/pin.go
+1 -1
@@ -7,11 +7,11 @@ import (
7 "sync"
8 "time"
9
10 - ds "github.com/ipfs/go-datastore"
10 key "github.com/ipfs/go-ipfs/blocks/key"
11 "github.com/ipfs/go-ipfs/blocks/set"
12 mdag "github.com/ipfs/go-ipfs/merkledag"
13 logging "gx/ipfs/QmYtB7Qge8cJpXc4irsEp8zRqfnZMBeB7aTrMEkPk67DRv/go-log"
14 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
15 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16 )
17
pin/pin_test.go
+2 -2
@@ -6,13 +6,13 @@ import (
6
7 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
8
9 - ds "github.com/ipfs/go-datastore"
10 - dssync "github.com/ipfs/go-datastore/sync"
9 "github.com/ipfs/go-ipfs/blocks/blockstore"
10 key "github.com/ipfs/go-ipfs/blocks/key"
11 bs "github.com/ipfs/go-ipfs/blockservice"
12 "github.com/ipfs/go-ipfs/exchange/offline"
13 mdag "github.com/ipfs/go-ipfs/merkledag"
14 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
15 + dssync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
16 "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
17 )
18
pin/set_test.go
+2 -2
@@ -4,14 +4,14 @@ import (
4 "testing"
5 "testing/quick"
6
7 - "github.com/ipfs/go-datastore"
8 - dssync "github.com/ipfs/go-datastore/sync"
7 "github.com/ipfs/go-ipfs/blocks/blockstore"
8 "github.com/ipfs/go-ipfs/blocks/key"
9 "github.com/ipfs/go-ipfs/blockservice"
10 "github.com/ipfs/go-ipfs/exchange/offline"
11 "github.com/ipfs/go-ipfs/merkledag"
12 mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
13 + "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
14 + dssync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
15 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17 )
repo/fsrepo/defaultds.go
+5 -5
@@ -4,14 +4,14 @@ import (
4 "fmt"
5 "path"
6
7 - ds "github.com/ipfs/go-datastore"
8 - "github.com/ipfs/go-datastore/flatfs"
9 - levelds "github.com/ipfs/go-datastore/leveldb"
10 - "github.com/ipfs/go-datastore/measure"
11 - mount "github.com/ipfs/go-datastore/syncmount"
7 repo "github.com/ipfs/go-ipfs/repo"
8 config "github.com/ipfs/go-ipfs/repo/config"
9 "github.com/ipfs/go-ipfs/thirdparty/dir"
10 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
11 + "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/flatfs"
12 + levelds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/leveldb"
13 + "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/measure"
14 + mount "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/syncmount"
15 ldbopts "gx/ipfs/QmbBhyDKsY4mbY6xsKt3qu9Y7FPvMJ6qbD8AMjYYvPRw1g/goleveldb/leveldb/opt"
16 )
17
repo/fsrepo/fsrepo.go
+1 -1
@@ -10,7 +10,6 @@ import (
10 "strings"
11 "sync"
12
13 - "github.com/ipfs/go-datastore/measure"
13 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir"
14 repo "github.com/ipfs/go-ipfs/repo"
15 "github.com/ipfs/go-ipfs/repo/common"
@@ -20,6 +19,7 @@ import (
19 serialize "github.com/ipfs/go-ipfs/repo/fsrepo/serialize"
20 dir "github.com/ipfs/go-ipfs/thirdparty/dir"
21 logging "gx/ipfs/QmYtB7Qge8cJpXc4irsEp8zRqfnZMBeB7aTrMEkPk67DRv/go-log"
22 + "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/measure"
23 util "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
24 )
25
repo/fsrepo/fsrepo_test.go
+1 -1
@@ -7,9 +7,9 @@ import (
7 "path/filepath"
8 "testing"
9
10 - datastore "github.com/ipfs/go-datastore"
10 "github.com/ipfs/go-ipfs/repo/config"
11 "github.com/ipfs/go-ipfs/thirdparty/assert"
12 + datastore "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
13 )
14
15 // swap arg order
repo/repo.go
+1 -1
@@ -4,8 +4,8 @@ import (
4 "errors"
5 "io"
6
7 - ds "github.com/ipfs/go-datastore"
7 config "github.com/ipfs/go-ipfs/repo/config"
8 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
9 )
10
11 var (
routing/dht/dht.go
+1 -1
@@ -15,7 +15,6 @@ import (
15 kb "github.com/ipfs/go-ipfs/routing/kbucket"
16 record "github.com/ipfs/go-ipfs/routing/record"
17
18 - ds "github.com/ipfs/go-datastore"
18 peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
19 host "gx/ipfs/QmQkQP7WmeT9FRJDsEzAaGYDparttDiB6mCpVBrq2MuWQS/go-libp2p/p2p/host"
20 protocol "gx/ipfs/QmQkQP7WmeT9FRJDsEzAaGYDparttDiB6mCpVBrq2MuWQS/go-libp2p/p2p/protocol"
@@ -25,6 +24,7 @@ import (
24 pstore "gx/ipfs/QmXHUpFsnpCmanRnacqYkFoLoFfEq5yS2nUgGkAjJ1Nj9j/go-libp2p-peerstore"
25 logging "gx/ipfs/QmYtB7Qge8cJpXc4irsEp8zRqfnZMBeB7aTrMEkPk67DRv/go-log"
26 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
27 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
28 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
29 )
30
routing/dht/dht_test.go
+2 -2
@@ -9,13 +9,13 @@ import (
9 "testing"
10 "time"
11
12 - ds "github.com/ipfs/go-datastore"
13 - dssync "github.com/ipfs/go-datastore/sync"
12 key "github.com/ipfs/go-ipfs/blocks/key"
13 routing "github.com/ipfs/go-ipfs/routing"
14 record "github.com/ipfs/go-ipfs/routing/record"
15 ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci"
16 travisci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci/travis"
17 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
18 + dssync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
19
20 peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
21 netutil "gx/ipfs/QmQkQP7WmeT9FRJDsEzAaGYDparttDiB6mCpVBrq2MuWQS/go-libp2p/p2p/test/util"
routing/dht/ext_test.go
+2 -2
@@ -6,12 +6,12 @@ import (
6 "testing"
7 "time"
8
9 - ds "github.com/ipfs/go-datastore"
10 - dssync "github.com/ipfs/go-datastore/sync"
9 key "github.com/ipfs/go-ipfs/blocks/key"
10 routing "github.com/ipfs/go-ipfs/routing"
11 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
12 record "github.com/ipfs/go-ipfs/routing/record"
13 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
14 + dssync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
15
16 inet "gx/ipfs/QmQkQP7WmeT9FRJDsEzAaGYDparttDiB6mCpVBrq2MuWQS/go-libp2p/p2p/net"
17 mocknet "gx/ipfs/QmQkQP7WmeT9FRJDsEzAaGYDparttDiB6mCpVBrq2MuWQS/go-libp2p/p2p/net/mock"
routing/dht/handlers.go
+1 -1
@@ -5,10 +5,10 @@ import (
5 "fmt"
6 "time"
7
8 - ds "github.com/ipfs/go-datastore"
8 key "github.com/ipfs/go-ipfs/blocks/key"
9 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
10 lgbl "github.com/ipfs/go-ipfs/thirdparty/loggables"
11 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
12
13 peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14 pstore "gx/ipfs/QmXHUpFsnpCmanRnacqYkFoLoFfEq5yS2nUgGkAjJ1Nj9j/go-libp2p-peerstore"
routing/mock/centralized_client.go
+1 -1
@@ -4,11 +4,11 @@ import (
4 "errors"
5 "time"
6
7 - ds "github.com/ipfs/go-datastore"
7 key "github.com/ipfs/go-ipfs/blocks/key"
8 routing "github.com/ipfs/go-ipfs/routing"
9 dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
10 "github.com/ipfs/go-ipfs/thirdparty/testutil"
11 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
12
13 peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14 pstore "gx/ipfs/QmXHUpFsnpCmanRnacqYkFoLoFfEq5yS2nUgGkAjJ1Nj9j/go-libp2p-peerstore"
routing/mock/centralized_server.go
+2 -2
@@ -5,10 +5,10 @@ import (
5 "sync"
6 "time"
7
8 - ds "github.com/ipfs/go-datastore"
9 - dssync "github.com/ipfs/go-datastore/sync"
8 key "github.com/ipfs/go-ipfs/blocks/key"
9 "github.com/ipfs/go-ipfs/thirdparty/testutil"
10 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
11 + dssync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
12
13 peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14 pstore "gx/ipfs/QmXHUpFsnpCmanRnacqYkFoLoFfEq5yS2nUgGkAjJ1Nj9j/go-libp2p-peerstore"
routing/mock/dht.go
+2 -2
@@ -1,11 +1,11 @@
1 package mockrouting
2
3 import (
4 - ds "github.com/ipfs/go-datastore"
5 - sync "github.com/ipfs/go-datastore/sync"
4 dht "github.com/ipfs/go-ipfs/routing/dht"
5 "github.com/ipfs/go-ipfs/thirdparty/testutil"
6 mocknet "gx/ipfs/QmQkQP7WmeT9FRJDsEzAaGYDparttDiB6mCpVBrq2MuWQS/go-libp2p/p2p/net/mock"
7 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
8 + sync "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
9 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10 )
11
routing/mock/interface.go
+1 -1
@@ -5,13 +5,13 @@
5 package mockrouting
6
7 import (
8 - ds "github.com/ipfs/go-datastore"
8 key "github.com/ipfs/go-ipfs/blocks/key"
9 routing "github.com/ipfs/go-ipfs/routing"
10 delay "github.com/ipfs/go-ipfs/thirdparty/delay"
11 "github.com/ipfs/go-ipfs/thirdparty/testutil"
12 peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
13 pstore "gx/ipfs/QmXHUpFsnpCmanRnacqYkFoLoFfEq5yS2nUgGkAjJ1Nj9j/go-libp2p-peerstore"
14 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
15 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16 )
17
routing/offline/offline.go
+1 -1
@@ -4,11 +4,11 @@ import (
4 "errors"
5 "time"
6
7 - ds "github.com/ipfs/go-datastore"
7 key "github.com/ipfs/go-ipfs/blocks/key"
8 routing "github.com/ipfs/go-ipfs/routing"
9 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
10 record "github.com/ipfs/go-ipfs/routing/record"
11 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
12
13 "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14 ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
routing/supernode/server.go
+1 -1
@@ -4,11 +4,11 @@ import (
4 "errors"
5 "fmt"
6
7 - datastore "github.com/ipfs/go-datastore"
7 key "github.com/ipfs/go-ipfs/blocks/key"
8 dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
9 record "github.com/ipfs/go-ipfs/routing/record"
10 proxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
11 + datastore "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
12
13 peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14 pstore "gx/ipfs/QmXHUpFsnpCmanRnacqYkFoLoFfEq5yS2nUgGkAjJ1Nj9j/go-libp2p-peerstore"
routing/supernode/server_test.go
+1 -1
@@ -3,9 +3,9 @@ package supernode
3 import (
4 "testing"
5
6 - datastore "github.com/ipfs/go-datastore"
6 key "github.com/ipfs/go-ipfs/blocks/key"
7 dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
8 + datastore "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
9 )
10
11 func TestPutProviderDoesntResultInDuplicates(t *testing.T) {
test/integration/grandcentral_test.go
+2 -2
@@ -8,8 +8,8 @@ import (
8 "math"
9 "testing"
10
11 - "github.com/ipfs/go-datastore"
12 - syncds "github.com/ipfs/go-datastore/sync"
11 + "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
12 + syncds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
13 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14
15 key "github.com/ipfs/go-ipfs/blocks/key"
test/supernode_client/main.go
+2 -2
@@ -12,8 +12,6 @@ import (
12 gopath "path"
13 "time"
14
15 - "github.com/ipfs/go-datastore"
16 - syncds "github.com/ipfs/go-datastore/sync"
15 random "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random"
16 commands "github.com/ipfs/go-ipfs/commands"
17 core "github.com/ipfs/go-ipfs/core"
@@ -26,6 +24,8 @@ import (
24 ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
25 "github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
26 unit "github.com/ipfs/go-ipfs/thirdparty/unit"
27 + "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
28 + syncds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
29
30 pstore "gx/ipfs/QmXHUpFsnpCmanRnacqYkFoLoFfEq5yS2nUgGkAjJ1Nj9j/go-libp2p-peerstore"
31 logging "gx/ipfs/QmYtB7Qge8cJpXc4irsEp8zRqfnZMBeB7aTrMEkPk67DRv/go-log"
thirdparty/datastore2/datastore_closer.go
+1 -1
@@ -3,7 +3,7 @@ package datastore2
3 import (
4 "io"
5
6 - "github.com/ipfs/go-datastore"
6 + "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
7 )
8
9 type ThreadSafeDatastoreCloser interface {
thirdparty/datastore2/delayed.go
+2 -2
@@ -1,8 +1,8 @@
1 package datastore2
2
3 import (
4 - ds "github.com/ipfs/go-datastore"
5 - dsq "github.com/ipfs/go-datastore/query"
4 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
5 + dsq "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/query"
6
7 delay "github.com/ipfs/go-ipfs/thirdparty/delay"
8 )
thirdparty/datastore2/threadsafe.go
+1 -1
@@ -3,7 +3,7 @@ package datastore2
3 import (
4 "io"
5
6 - "github.com/ipfs/go-datastore"
6 + "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
7 )
8
9 // ClaimThreadSafe claims that a Datastore is threadsafe, even when
thirdparty/testutil/datastore.go
+2 -2
@@ -1,9 +1,9 @@
1 package testutil
2
3 import (
4 - "github.com/ipfs/go-datastore"
5 - syncds "github.com/ipfs/go-datastore/sync"
4 ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
5 + "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
6 + syncds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
7 )
8
9 func ThreadSafeCloserMapDatastore() ds2.ThreadSafeDatastoreCloser {
unixfs/mod/dagmodifier_test.go
+2 -2
@@ -7,7 +7,6 @@ import (
7 "os"
8 "testing"
9
10 - "github.com/ipfs/go-datastore/sync"
10 "github.com/ipfs/go-ipfs/blocks/blockstore"
11 bs "github.com/ipfs/go-ipfs/blockservice"
12 "github.com/ipfs/go-ipfs/exchange/offline"
@@ -18,9 +17,10 @@ import (
17 mdag "github.com/ipfs/go-ipfs/merkledag"
18 ft "github.com/ipfs/go-ipfs/unixfs"
19 uio "github.com/ipfs/go-ipfs/unixfs/io"
20 + "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore/sync"
21 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
22
23 - ds "github.com/ipfs/go-datastore"
23 + ds "gx/ipfs/QmZ6A6P6AMo8SR3jXAwzTuSU6B9R2Y4eqW2yW9VvfUayDN/go-datastore"
24 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
25 )
26