@cryptotaxi247 / kubo / commits / 6859b8ccd

Extract key and datastore License: MIT Signed-off-by: George Antoniadis <george@noodles.gr>

Extract key and datastore License: MIT Signed-off-by: George Antoniadis <george@noodles.gr>

George Antoniadis committed Sep 9, 2016 at 15:41 UTC 6859b8ccd8ae73ca7d50833b90ca69a6b37b9611
117 files changed +228 -204
blocks/blocks.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "errors"
7 "fmt"
8
9 - key "github.com/ipfs/go-ipfs/blocks/key"
9 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
10
11 mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
12 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
blocks/blockstore/arc_cache.go
+2 -2
@@ -2,11 +2,11 @@ package blockstore
2
3 import (
4 "github.com/ipfs/go-ipfs/blocks"
5 - key "github.com/ipfs/go-ipfs/blocks/key"
5 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
6
7 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
7 lru "gx/ipfs/QmVYxfoJQiZijTgPNHCHgHELvQpbsJNTg6Crmc3dQkj3yy/golang-lru"
8 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
10 )
11
12 type arccache struct {
blocks/blockstore/arc_cache_test.go
+3 -3
@@ -4,11 +4,11 @@ import (
4 "testing"
5
6 "github.com/ipfs/go-ipfs/blocks"
7 - "github.com/ipfs/go-ipfs/blocks/key"
7 + "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
8
9 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
10 - syncds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
9 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
11 + syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
12 )
13
14 var exampleBlock = blocks.NewBlock([]byte("foo"))
blocks/blockstore/blockstore.go
+4 -4
@@ -8,13 +8,13 @@ import (
8 "sync/atomic"
9
10 blocks "github.com/ipfs/go-ipfs/blocks"
11 - key "github.com/ipfs/go-ipfs/blocks/key"
12 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
13 - dsns "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/namespace"
14 - dsq "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/query"
11 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
12 mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
13 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
15 + dsns "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/namespace"
16 + dsq "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/query"
17 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
18 )
19
20 var log = logging.Logger("blockstore")
blocks/blockstore/blockstore_test.go
+4 -4
@@ -5,14 +5,14 @@ import (
5 "fmt"
6 "testing"
7
8 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
9 - dsq "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/query"
10 - ds_sync "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
8 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
9 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
11 + dsq "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/query"
12 + ds_sync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
13
14 blocks "github.com/ipfs/go-ipfs/blocks"
15 - key "github.com/ipfs/go-ipfs/blocks/key"
15 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
16 )
17
18 func TestGetWhenKeyNotPresent(t *testing.T) {
blocks/blockstore/bloom_cache.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "sync/atomic"
5
6 "github.com/ipfs/go-ipfs/blocks"
7 - key "github.com/ipfs/go-ipfs/blocks/key"
7 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
8
9 bloom "gx/ipfs/QmWQ2SJisXwcCLsUXLwYCKSfyExXjFRW2WbBH5sqCUnwX5/bbloom"
10 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
blocks/blockstore/bloom_cache_test.go
+3 -3
@@ -8,10 +8,10 @@ import (
8
9 "github.com/ipfs/go-ipfs/blocks"
10
11 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
12 - dsq "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/query"
13 - syncds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
11 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
13 + dsq "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/query"
14 + syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
15 )
16
17 func testBloomCached(bs GCBlockstore, ctx context.Context) (*bloomcache, error) {
blocks/key/key.go
+1 -1
@@ -4,10 +4,10 @@ import (
4 "encoding/json"
5 "fmt"
6
7 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
7 b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58"
8 mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
9 base32 "gx/ipfs/Qmb1DA2A9LS2wR4FFweB4uEDomFsdmnw1VLawLE1yQzudj/base32"
10 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
11 )
12
13 // Key is a string representation of multihash for use with maps.
blocks/set/set.go
+1 -1
@@ -3,8 +3,8 @@ package set
3
4 import (
5 "github.com/ipfs/go-ipfs/blocks/bloom"
6 - key "github.com/ipfs/go-ipfs/blocks/key"
6 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
7 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
8 )
9
10 var log = logging.Logger("blockset")
blocks/set/set_test.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "testing"
5
6 bu "github.com/ipfs/go-ipfs/blocks/blocksutil"
7 - k "github.com/ipfs/go-ipfs/blocks/key"
7 + k "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
8 )
9
10 const (
blockservice/blockservice.go
+1 -1
@@ -9,8 +9,8 @@ import (
9
10 blocks "github.com/ipfs/go-ipfs/blocks"
11 "github.com/ipfs/go-ipfs/blocks/blockstore"
12 - key "github.com/ipfs/go-ipfs/blocks/key"
12 exchange "github.com/ipfs/go-ipfs/exchange"
13 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
14
15 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
16 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
blockservice/test/blocks_test.go
+3 -3
@@ -8,14 +8,14 @@ import (
8
9 blocks "github.com/ipfs/go-ipfs/blocks"
10 blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
11 - key "github.com/ipfs/go-ipfs/blocks/key"
11 . "github.com/ipfs/go-ipfs/blockservice"
12 offline "github.com/ipfs/go-ipfs/exchange/offline"
13 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
14
15 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
16 - dssync "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
15 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
18 + dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
19 cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
20 )
21
cmd/ipfswatch/main.go
+1 -1
@@ -14,7 +14,7 @@ import (
14 coreunix "github.com/ipfs/go-ipfs/core/coreunix"
15 config "github.com/ipfs/go-ipfs/repo/config"
16 fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
17 - process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
17 + process "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
18 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19 fsnotify "gx/ipfs/QmczzCMvJ3HV57WBKDy8b4ucp7quT325JjDbixYRS5Pwvv/fsnotify.v1"
20 )
core/bootstrap.go
+3 -3
@@ -12,9 +12,9 @@ import (
12 lgbl "github.com/ipfs/go-ipfs/thirdparty/loggables"
13 math2 "github.com/ipfs/go-ipfs/thirdparty/math2"
14
15 - goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
16 - procctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
17 - periodicproc "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/periodic"
15 + goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
16 + procctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
17 + periodicproc "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/periodic"
18 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
19 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
20 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
core/builder.go
+5 -5
@@ -9,7 +9,6 @@ import (
9 "time"
10
11 bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
12 - key "github.com/ipfs/go-ipfs/blocks/key"
12 bserv "github.com/ipfs/go-ipfs/blockservice"
13 offline "github.com/ipfs/go-ipfs/exchange/offline"
14 dag "github.com/ipfs/go-ipfs/merkledag"
@@ -17,14 +16,15 @@ import (
16 pin "github.com/ipfs/go-ipfs/pin"
17 repo "github.com/ipfs/go-ipfs/repo"
18 cfg "github.com/ipfs/go-ipfs/repo/config"
19 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
20
21 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
22 - dsync "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
23 - goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
21 + retry "gx/ipfs/QmPF5kxTYFkzhaY5LmkExood7aTTZBHWQC6cjdDQBuGrjp/retry-datastore"
22 + goprocessctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
23 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
25 - retry "gx/ipfs/QmV71dCdjYivZwta22a7YvNmeS86r1EpnBjq9XAD21rBV9/retry-datastore"
24 ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
25 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
26 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
27 + dsync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
28 )
29
30 type BuildCfg struct {
core/commands/bitswap.go
+1 -1
@@ -5,10 +5,10 @@ import (
5 "fmt"
6 "io"
7
8 - key "github.com/ipfs/go-ipfs/blocks/key"
8 cmds "github.com/ipfs/go-ipfs/commands"
9 bitswap "github.com/ipfs/go-ipfs/exchange/bitswap"
10 decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision"
11 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12
13 "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
14 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
core/commands/block.go
+2 -2
@@ -10,11 +10,11 @@ import (
10
11 "github.com/ipfs/go-ipfs/blocks"
12 bs "github.com/ipfs/go-ipfs/blocks/blockstore"
13 - key "github.com/ipfs/go-ipfs/blocks/key"
13 cmds "github.com/ipfs/go-ipfs/commands"
14 "github.com/ipfs/go-ipfs/pin"
16 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
15 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
17 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
18 cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
19 )
20
core/commands/dht.go
+1 -1
@@ -7,13 +7,13 @@ import (
7 "io"
8 "time"
9
10 - key "github.com/ipfs/go-ipfs/blocks/key"
10 cmds "github.com/ipfs/go-ipfs/commands"
11 dag "github.com/ipfs/go-ipfs/merkledag"
12 notif "github.com/ipfs/go-ipfs/notifications"
13 path "github.com/ipfs/go-ipfs/path"
14 routing "github.com/ipfs/go-ipfs/routing"
15 ipdht "github.com/ipfs/go-ipfs/routing/dht"
16 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
17
18 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
19 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
core/commands/ls.go
+1 -1
@@ -6,13 +6,13 @@ import (
6 "io"
7 "text/tabwriter"
8
9 - key "github.com/ipfs/go-ipfs/blocks/key"
9 cmds "github.com/ipfs/go-ipfs/commands"
10 core "github.com/ipfs/go-ipfs/core"
11 merkledag "github.com/ipfs/go-ipfs/merkledag"
12 path "github.com/ipfs/go-ipfs/path"
13 unixfs "github.com/ipfs/go-ipfs/unixfs"
14 unixfspb "github.com/ipfs/go-ipfs/unixfs/pb"
15 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
16 )
17
18 type LsLink struct {
core/commands/publish.go
+1 -1
@@ -9,11 +9,11 @@ import (
9
10 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
12 - key "github.com/ipfs/go-ipfs/blocks/key"
12 cmds "github.com/ipfs/go-ipfs/commands"
13 core "github.com/ipfs/go-ipfs/core"
14 path "github.com/ipfs/go-ipfs/path"
15 crypto "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
16 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
17 )
18
19 var errNotOnline = errors.New("This command must be run in online mode. Try running 'ipfs daemon' first.")
core/commands/refs.go
+1 -1
@@ -6,11 +6,11 @@ import (
6 "io"
7 "strings"
8
9 - key "github.com/ipfs/go-ipfs/blocks/key"
9 cmds "github.com/ipfs/go-ipfs/commands"
10 "github.com/ipfs/go-ipfs/core"
11 dag "github.com/ipfs/go-ipfs/merkledag"
12 path "github.com/ipfs/go-ipfs/path"
13 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
14
15 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
core/core.go
+2 -2
@@ -17,8 +17,7 @@ import (
17 "time"
18
19 diag "github.com/ipfs/go-ipfs/diagnostics"
20 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
21 - goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
20 + goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
21 mamask "gx/ipfs/QmSMZwvs3n4GBikZ7hKzT17c3bk65FmyZo2JqtJ16swqCv/multiaddr-filter"
22 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
23 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
@@ -27,6 +26,7 @@ import (
26 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
27 ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
28 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
29 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
30 discovery "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/discovery"
31 p2phost "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/host"
32 p2pbhost "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/host/basic"
core/corehttp/corehttp.go
+1 -1
@@ -12,7 +12,7 @@ import (
12
13 core "github.com/ipfs/go-ipfs/core"
14 manet "gx/ipfs/QmPpRcbNUXauP3zWZ1NJMLWpe4QnmEHrd2ba2D3yqWznw7/go-multiaddr-net"
15 - "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
15 + "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
16 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
17 ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
18 )
core/corerepo/gc.go
+1 -1
@@ -4,11 +4,11 @@ import (
4 "errors"
5 "time"
6
7 - key "github.com/ipfs/go-ipfs/blocks/key"
7 "github.com/ipfs/go-ipfs/core"
8 mfs "github.com/ipfs/go-ipfs/mfs"
9 gc "github.com/ipfs/go-ipfs/pin/gc"
10 repo "github.com/ipfs/go-ipfs/repo"
11 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12
13 humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
14 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
core/corerouting/core.go
+1 -1
@@ -8,9 +8,9 @@ import (
8 routing "github.com/ipfs/go-ipfs/routing"
9 supernode "github.com/ipfs/go-ipfs/routing/supernode"
10 gcproxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
11 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
11 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
12 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
14 "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/host"
15 )
16
core/coreunix/add.go
+2 -2
@@ -20,10 +20,10 @@ import (
20 "github.com/ipfs/go-ipfs/pin"
21 unixfs "github.com/ipfs/go-ipfs/unixfs"
22
23 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
24 - syncds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
23 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
24 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
25 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
26 + syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
27 cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
28 )
29
core/coreunix/add_test.go
+1 -1
@@ -7,7 +7,6 @@ import (
7 "testing"
8 "time"
9
10 - "github.com/ipfs/go-ipfs/blocks/key"
10 "github.com/ipfs/go-ipfs/commands/files"
11 "github.com/ipfs/go-ipfs/core"
12 dag "github.com/ipfs/go-ipfs/merkledag"
@@ -15,6 +14,7 @@ import (
14 "github.com/ipfs/go-ipfs/repo"
15 "github.com/ipfs/go-ipfs/repo/config"
16 "github.com/ipfs/go-ipfs/thirdparty/testutil"
17 + "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
18
19 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
20 cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
core/coreunix/metadata_test.go
+2 -2
@@ -15,10 +15,10 @@ import (
15 ft "github.com/ipfs/go-ipfs/unixfs"
16 uio "github.com/ipfs/go-ipfs/unixfs/io"
17
18 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
19 - dssync "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
18 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
19 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
20 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
21 + dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
22 cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
23 )
24
core/mock/mock.go
+2 -2
@@ -3,9 +3,9 @@ package coremock
3 import (
4 "net"
5
6 - "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
7 - syncds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
6 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7 + "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
8 + syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
9
10 commands "github.com/ipfs/go-ipfs/commands"
11 core "github.com/ipfs/go-ipfs/core"
exchange/bitswap/bitswap.go
+3 -3
@@ -10,7 +10,6 @@ import (
10
11 blocks "github.com/ipfs/go-ipfs/blocks"
12 blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
13 - key "github.com/ipfs/go-ipfs/blocks/key"
13 exchange "github.com/ipfs/go-ipfs/exchange"
14 decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision"
15 bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
@@ -20,9 +19,10 @@ import (
19 flags "github.com/ipfs/go-ipfs/flags"
20 "github.com/ipfs/go-ipfs/thirdparty/delay"
21 loggables "github.com/ipfs/go-ipfs/thirdparty/loggables"
22 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
23
24 - process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
25 - procctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
24 + process "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
25 + procctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
26 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
27 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
28 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
exchange/bitswap/bitswap_test.go
+1 -1
@@ -13,10 +13,10 @@ import (
13 blocks "github.com/ipfs/go-ipfs/blocks"
14 blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
15 blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
16 - key "github.com/ipfs/go-ipfs/blocks/key"
16 tn "github.com/ipfs/go-ipfs/exchange/bitswap/testnet"
17 mockrouting "github.com/ipfs/go-ipfs/routing/mock"
18 delay "github.com/ipfs/go-ipfs/thirdparty/delay"
19 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
20 p2ptestutil "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/test/util"
21 )
22
exchange/bitswap/decision/bench_test.go
+1 -1
@@ -4,10 +4,10 @@ import (
4 "math"
5 "testing"
6
7 - key "github.com/ipfs/go-ipfs/blocks/key"
7 "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
8 "github.com/ipfs/go-ipfs/thirdparty/testutil"
9 "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
10 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
11 )
12
13 // FWIW: At the time of this commit, including a timestamp in task increases
exchange/bitswap/decision/engine_test.go
+2 -2
@@ -12,10 +12,10 @@ import (
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 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
16 - dssync "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
15 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
16 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
18 + dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
19 )
20
21 type peerAndEngine struct {
exchange/bitswap/decision/ledger.go
+1 -1
@@ -4,9 +4,9 @@ import (
4 "sync"
5 "time"
6
7 - key "github.com/ipfs/go-ipfs/blocks/key"
7 wl "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
8 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
9 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
10 )
11
12 // keySet is just a convenient alias for maps of keys, where we only care
exchange/bitswap/decision/peer_request_queue.go
+1 -1
@@ -4,10 +4,10 @@ import (
4 "sync"
5 "time"
6
7 - key "github.com/ipfs/go-ipfs/blocks/key"
7 wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
8 pq "github.com/ipfs/go-ipfs/thirdparty/pq"
9 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
10 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
11 )
12
13 type peerRequestQueue interface {
exchange/bitswap/decision/peer_request_queue_test.go
+1 -1
@@ -7,9 +7,9 @@ import (
7 "strings"
8 "testing"
9
10 - key "github.com/ipfs/go-ipfs/blocks/key"
10 "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
11 "github.com/ipfs/go-ipfs/thirdparty/testutil"
12 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
13 )
14
15 func TestPushPop(t *testing.T) {
exchange/bitswap/message/message.go
+1 -1
@@ -4,9 +4,9 @@ import (
4 "io"
5
6 blocks "github.com/ipfs/go-ipfs/blocks"
7 - key "github.com/ipfs/go-ipfs/blocks/key"
7 pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/pb"
8 wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
9 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
10 inet "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/net"
11
12 ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
exchange/bitswap/message/message_test.go
+1 -1
@@ -7,8 +7,8 @@ import (
7 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
8
9 blocks "github.com/ipfs/go-ipfs/blocks"
10 - key "github.com/ipfs/go-ipfs/blocks/key"
10 pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/pb"
11 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12 )
13
14 func TestAppendWanted(t *testing.T) {
exchange/bitswap/network/interface.go
+1 -1
@@ -1,10 +1,10 @@
1 package network
2
3 import (
4 - key "github.com/ipfs/go-ipfs/blocks/key"
4 bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
5 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
6 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
8 protocol "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/protocol"
9 )
10
exchange/bitswap/network/ipfs_impl.go
+1 -1
@@ -3,9 +3,9 @@ package network
3 import (
4 "io"
5
6 - key "github.com/ipfs/go-ipfs/blocks/key"
6 bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
7 routing "github.com/ipfs/go-ipfs/routing"
8 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
9
10 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
11 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
exchange/bitswap/notifications/notifications.go
+1 -1
@@ -3,8 +3,8 @@ package notifications
3 import (
4 pubsub "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/briantigerchow/pubsub"
5 blocks "github.com/ipfs/go-ipfs/blocks"
6 - key "github.com/ipfs/go-ipfs/blocks/key"
6 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
8 )
9
10 const bufferSize = 16
exchange/bitswap/notifications/notifications_test.go
+1 -1
@@ -7,8 +7,8 @@ import (
7
8 blocks "github.com/ipfs/go-ipfs/blocks"
9 blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
10 - key "github.com/ipfs/go-ipfs/blocks/key"
10 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12 )
13
14 func TestDuplicates(t *testing.T) {
exchange/bitswap/stat.go
+1 -1
@@ -1,7 +1,7 @@
1 package bitswap
2
3 import (
4 - key "github.com/ipfs/go-ipfs/blocks/key"
4 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
5 "sort"
6 )
7
exchange/bitswap/testnet/peernet.go
+1 -1
@@ -4,9 +4,9 @@ import (
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 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
7 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
8 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
10 mockpeernet "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/net/mock"
11 )
12
exchange/bitswap/testnet/virtual.go
+1 -1
@@ -3,7 +3,6 @@ package bitswap
3 import (
4 "errors"
5
6 - key "github.com/ipfs/go-ipfs/blocks/key"
6 bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
7 bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
8 routing "github.com/ipfs/go-ipfs/routing"
@@ -12,6 +11,7 @@ import (
11 testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
12 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
13 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
15 )
16
17 func VirtualNetwork(rs mockrouting.Server, d delay.D) Network {
exchange/bitswap/testutils.go
+2 -2
@@ -8,10 +8,10 @@ import (
8 datastore2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
9 delay "github.com/ipfs/go-ipfs/thirdparty/delay"
10 testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
11 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
12 - ds_sync "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
11 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
12 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
14 + ds_sync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
15 p2ptestutil "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/test/util"
16 )
17
exchange/bitswap/wantlist/wantlist.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "sort"
7 "sync"
8
9 - key "github.com/ipfs/go-ipfs/blocks/key"
9 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
10
11 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12 )
exchange/bitswap/wantmanager.go
+1 -1
@@ -4,13 +4,13 @@ import (
4 "sync"
5 "time"
6
7 - key "github.com/ipfs/go-ipfs/blocks/key"
7 engine "github.com/ipfs/go-ipfs/exchange/bitswap/decision"
8 bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
9 bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
10 wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
11 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
12 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
14 )
15
16 type WantManager struct {
exchange/bitswap/workers.go
+3 -3
@@ -4,14 +4,14 @@ import (
4 "sync"
5 "time"
6
7 - process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
8 - procctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
7 + process "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
8 + procctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
9 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
11 - key "github.com/ipfs/go-ipfs/blocks/key"
11 wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
12 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
13 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
14 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
15 )
16
17 var TaskWorkerCount = 8
exchange/interface.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "io"
6
7 blocks "github.com/ipfs/go-ipfs/blocks"
8 - key "github.com/ipfs/go-ipfs/blocks/key"
8 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
9
10 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11 )
exchange/offline/offline.go
+1 -1
@@ -5,8 +5,8 @@ package offline
5 import (
6 blocks "github.com/ipfs/go-ipfs/blocks"
7 "github.com/ipfs/go-ipfs/blocks/blockstore"
8 - key "github.com/ipfs/go-ipfs/blocks/key"
8 exchange "github.com/ipfs/go-ipfs/exchange"
9 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
10
11 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12 )
exchange/offline/offline_test.go
+3 -3
@@ -6,10 +6,10 @@ import (
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/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
11 - ds_sync "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
9 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
11 + ds_sync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
12 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
13 )
14
15 func TestBlockReturnsErr(t *testing.T) {
exchange/reprovide/reprovide_test.go
+2 -2
@@ -7,9 +7,9 @@ import (
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/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
11 - dssync "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
10 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
12 + dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
13
14 . "github.com/ipfs/go-ipfs/exchange/reprovide"
15 )
fuse/ipns/ipns_unix.go
+1 -1
@@ -14,13 +14,13 @@ import (
14 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
15 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16
17 - key "github.com/ipfs/go-ipfs/blocks/key"
17 core "github.com/ipfs/go-ipfs/core"
18 dag "github.com/ipfs/go-ipfs/merkledag"
19 mfs "github.com/ipfs/go-ipfs/mfs"
20 path "github.com/ipfs/go-ipfs/path"
21 ft "github.com/ipfs/go-ipfs/unixfs"
22 ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
23 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
24 cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
25 )
26
fuse/mount/fuse.go
+1 -1
@@ -12,7 +12,7 @@ import (
12 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
13 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
14
15 - goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
15 + goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
16 )
17
18 var ErrNotMounted = errors.New("not mounted")
fuse/mount/mount.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 "runtime"
9 "time"
10
11 - goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
11 + goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
12 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
13 )
14
importer/chunk/rabin_test.go
+1 -1
@@ -4,8 +4,8 @@ import (
4 "bytes"
5 "fmt"
6 "github.com/ipfs/go-ipfs/blocks"
7 - "github.com/ipfs/go-ipfs/blocks/key"
7 "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
8 + "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
9 "io"
10 "testing"
11 )
merkledag/merkledag.go
+1 -1
@@ -6,8 +6,8 @@ import (
6 "strings"
7 "sync"
8
9 - key "github.com/ipfs/go-ipfs/blocks/key"
9 bserv "github.com/ipfs/go-ipfs/blockservice"
10 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
11
12 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
13 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
merkledag/merkledag_test.go
+1 -1
@@ -10,7 +10,6 @@ import (
10 "sync"
11 "testing"
12
13 - key "github.com/ipfs/go-ipfs/blocks/key"
13 bserv "github.com/ipfs/go-ipfs/blockservice"
14 bstest "github.com/ipfs/go-ipfs/blockservice/test"
15 offline "github.com/ipfs/go-ipfs/exchange/offline"
@@ -20,6 +19,7 @@ import (
19 mdpb "github.com/ipfs/go-ipfs/merkledag/pb"
20 dstest "github.com/ipfs/go-ipfs/merkledag/test"
21 uio "github.com/ipfs/go-ipfs/unixfs/io"
22 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
23
24 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
25 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
merkledag/node.go
+1 -1
@@ -5,8 +5,8 @@ import (
5
6 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7
8 - key "github.com/ipfs/go-ipfs/blocks/key"
8 mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
9 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
10 cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
11 )
12
merkledag/test/utils.go
+2 -2
@@ -5,8 +5,8 @@ import (
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/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
9 - dssync "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
8 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
9 + dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
10 )
11
12 func Mock() dag.DAGService {
merkledag/utils/utils.go
+2 -2
@@ -3,9 +3,9 @@ package dagutils
3 import (
4 "errors"
5
6 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
7 - syncds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
6 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
8 + syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
9
10 bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
11 bserv "github.com/ipfs/go-ipfs/blockservice"
mfs/mfs_test.go
+2 -2
@@ -23,10 +23,10 @@ import (
23 ft "github.com/ipfs/go-ipfs/unixfs"
24 uio "github.com/ipfs/go-ipfs/unixfs/io"
25
26 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
27 - dssync "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
26 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
27 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
28 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
29 + dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
30 cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
31 )
32
namesys/namesys.go
+1 -1
@@ -6,9 +6,9 @@ import (
6
7 path "github.com/ipfs/go-ipfs/path"
8 routing "github.com/ipfs/go-ipfs/routing"
9 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
9 ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
10 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
12 )
13
14 // mpns (a multi-protocol NameSystem) implements generic IPFS naming.
namesys/publisher.go
+2 -2
@@ -6,11 +6,10 @@ import (
6 "fmt"
7 "time"
8
9 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
9 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
10 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
12
13 - key "github.com/ipfs/go-ipfs/blocks/key"
13 dag "github.com/ipfs/go-ipfs/merkledag"
14 pb "github.com/ipfs/go-ipfs/namesys/pb"
15 path "github.com/ipfs/go-ipfs/path"
@@ -22,6 +21,7 @@ import (
21 ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
22 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
23 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
24 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
25 )
26
27 // ErrExpiredRecord should be returned when an ipns record is
namesys/republisher/repub.go
+4 -4
@@ -5,21 +5,21 @@ import (
5 "sync"
6 "time"
7
8 - key "github.com/ipfs/go-ipfs/blocks/key"
8 namesys "github.com/ipfs/go-ipfs/namesys"
9 pb "github.com/ipfs/go-ipfs/namesys/pb"
10 path "github.com/ipfs/go-ipfs/path"
11 "github.com/ipfs/go-ipfs/routing"
12 dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
13 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
14
15 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
16 - goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
17 - gpctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
15 + goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
16 + gpctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
17 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
18 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
19 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
20 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
21 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
22 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
23 )
24
25 var errNoEntry = errors.New("no previous entry")
namesys/republisher/repub_test.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "testing"
6 "time"
7
8 - goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
8 + goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
9 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
11 "github.com/ipfs/go-ipfs/core"
namesys/resolve_test.go
+3 -3
@@ -5,15 +5,15 @@ import (
5 "testing"
6 "time"
7
8 - key "github.com/ipfs/go-ipfs/blocks/key"
8 path "github.com/ipfs/go-ipfs/path"
9 mockrouting "github.com/ipfs/go-ipfs/routing/mock"
10 testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
12 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
13 - dssync "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
11 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
12 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
13 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
15 + dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
16 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
17 )
18
19 func TestRoutingResolve(t *testing.T) {
namesys/routing.go
+1 -1
@@ -10,10 +10,10 @@ import (
10 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
11 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
13 - key "github.com/ipfs/go-ipfs/blocks/key"
13 pb "github.com/ipfs/go-ipfs/namesys/pb"
14 path "github.com/ipfs/go-ipfs/path"
15 routing "github.com/ipfs/go-ipfs/routing"
16 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
17
18 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
19 ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
package.json
+32 -8
@@ -134,9 +134,9 @@
134 },
135 {
136 "author": "jbenet",
137 - "hash": "QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp",
137 + "hash": "QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU",
138 "name": "go-datastore",
139 - "version": "0.2.1"
139 + "version": "1.0.0"
140 },
141 {
142 "author": "codahale",
@@ -176,9 +176,9 @@
176 },
177 {
178 "author": "whyrusleeping",
179 - "hash": "QmcRHLm2aqDabkpcto1NzLad7YQhH99MGDHSWWvwMxKiZw",
179 + "hash": "QmSp3diFRRv4zR25nHU4MWNCdhT4R6cxrTPLx12MCi1TZb",
180 "name": "autobatch",
181 - "version": "0.2.1"
181 + "version": "0.2.2"
182 },
183 {
184 "author": "jbenet",
@@ -188,15 +188,15 @@
188 },
189 {
190 "author": "whyrusleeping",
191 - "hash": "QmV71dCdjYivZwta22a7YvNmeS86r1EpnBjq9XAD21rBV9",
191 + "hash": "QmPF5kxTYFkzhaY5LmkExood7aTTZBHWQC6cjdDQBuGrjp",
192 "name": "retry-datastore",
193 - "version": "1.1.1"
193 + "version": "1.1.2"
194 },
195 {
196 "author": "whyrusleeping",
197 - "hash": "QmQzoB7kvw15FiCBpsYhu96wyweGTwCSNXcaNtwUefy9kE",
197 + "hash": "QmUtQ7vagCwHfEaCssxWzSShgrk6uA3Rx5t2E4R5aoLckg",
198 "name": "failstore",
199 - "version": "1.0.1"
199 + "version": "1.0.2"
200 },
201 {
202 "author": "whyrusleeping",
@@ -209,6 +209,30 @@
209 "hash": "QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp",
210 "name": "go-cid",
211 "version": "0.1.0"
212 + },
213 + {
214 + "author": "whyrusleeping",
215 + "hash": "Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew",
216 + "name": "go-key",
217 + "version": "1.0.2"
218 + },
219 + {
220 + "author": "whyrusleeping",
221 + "hash": "QmU4VzzKNLJXJ72SedXBQKyf5Jo8W89iWpbWQjHn9qef8N",
222 + "name": "go-ds-flatfs",
223 + "version": "1.0.0"
224 + },
225 + {
226 + "author": "whyrusleeping",
227 + "hash": "QmeqtHtxGfcsfXiou7wqHJARWPKUTUcPdtSfSYYHp48dtQ",
228 + "name": "go-ds-measure",
229 + "version": "1.0.1"
230 + },
231 + {
232 + "author": "whyrusleeping",
233 + "hash": "QmUHmMGmcwCrjHQHcYhBnqGCSWs5pBSMbGZmfwavETR1gg",
234 + "name": "go-ds-leveldb",
235 + "version": "1.0.0"
236 }
237 ],
238 "gxVersion": "0.4.0",
path/resolver_test.go
+1 -1
@@ -6,11 +6,11 @@ import (
6
7 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
8
9 - key "github.com/ipfs/go-ipfs/blocks/key"
9 merkledag "github.com/ipfs/go-ipfs/merkledag"
10 dagmock "github.com/ipfs/go-ipfs/merkledag/test"
11 path "github.com/ipfs/go-ipfs/path"
12 util "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
13 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
14 )
15
16 func randNode() (*merkledag.Node, key.Key) {
pin/gc/gc.go
+1 -1
@@ -2,11 +2,11 @@ package gc
2
3 import (
4 bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
5 - key "github.com/ipfs/go-ipfs/blocks/key"
5 bserv "github.com/ipfs/go-ipfs/blockservice"
6 offline "github.com/ipfs/go-ipfs/exchange/offline"
7 dag "github.com/ipfs/go-ipfs/merkledag"
8 pin "github.com/ipfs/go-ipfs/pin"
9 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
10
11 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
12 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
pin/indirect.go
+1 -1
@@ -1,7 +1,7 @@
1 package pin
2
3 import (
4 - key "github.com/ipfs/go-ipfs/blocks/key"
4 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
5 )
6
7 type indirectPin struct {
pin/pin.go
+2 -2
@@ -8,12 +8,12 @@ import (
8 "sync"
9 "time"
10
11 - key "github.com/ipfs/go-ipfs/blocks/key"
11 mdag "github.com/ipfs/go-ipfs/merkledag"
12 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
13
14 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
14 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
15 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
17 cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
18 )
19
pin/pin_test.go
+2 -2
@@ -9,10 +9,10 @@ import (
9 "github.com/ipfs/go-ipfs/exchange/offline"
10 mdag "github.com/ipfs/go-ipfs/merkledag"
11
12 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
13 - dssync "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
12 "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
13 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
15 + dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
16 cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
17 )
18
pin/set.go
+1 -1
@@ -10,11 +10,11 @@ import (
10 "sort"
11 "unsafe"
12
13 - "github.com/ipfs/go-ipfs/blocks/key"
13 "github.com/ipfs/go-ipfs/merkledag"
14 "github.com/ipfs/go-ipfs/pin/internal/pb"
15 "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
16 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17 + "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
18 cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
19 )
20
pin/set_test.go
+1 -1
@@ -1,6 +1,6 @@
1 package pin
2
3 -import "github.com/ipfs/go-ipfs/blocks/key"
3 +import "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
4
5 func ignoreKeys(key.Key) {}
6
repo/fsrepo/defaultds.go
+5 -5
@@ -7,12 +7,12 @@ import (
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/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
11 - "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/flatfs"
12 - levelds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/leveldb"
13 - "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/measure"
14 - mount "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/syncmount"
10 + "gx/ipfs/QmU4VzzKNLJXJ72SedXBQKyf5Jo8W89iWpbWQjHn9qef8N/go-ds-flatfs"
11 + levelds "gx/ipfs/QmUHmMGmcwCrjHQHcYhBnqGCSWs5pBSMbGZmfwavETR1gg/go-ds-leveldb"
12 ldbopts "gx/ipfs/QmbBhyDKsY4mbY6xsKt3qu9Y7FPvMJ6qbD8AMjYYvPRw1g/goleveldb/leveldb/opt"
13 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
14 + mount "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/syncmount"
15 + "gx/ipfs/QmeqtHtxGfcsfXiou7wqHJARWPKUTUcPdtSfSYYHp48dtQ/go-ds-measure"
16 )
17
18 const (
repo/fsrepo/fsrepo.go
+1 -1
@@ -18,9 +18,9 @@ import (
18 mfsr "github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
19 serialize "github.com/ipfs/go-ipfs/repo/fsrepo/serialize"
20 dir "github.com/ipfs/go-ipfs/thirdparty/dir"
21 - "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/measure"
21 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
22 util "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
23 + "gx/ipfs/QmeqtHtxGfcsfXiou7wqHJARWPKUTUcPdtSfSYYHp48dtQ/go-ds-measure"
24 )
25
26 var log = logging.Logger("fsrepo")
repo/fsrepo/fsrepo_test.go
+1 -1
@@ -9,7 +9,7 @@ import (
9
10 "github.com/ipfs/go-ipfs/repo/config"
11 "github.com/ipfs/go-ipfs/thirdparty/assert"
12 - datastore "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
12 + datastore "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
13 )
14
15 // swap arg order
repo/repo.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "io"
6
7 config "github.com/ipfs/go-ipfs/repo/config"
8 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
8 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
9 )
10
11 var (
routing/dht/dht.go
+4 -4
@@ -9,22 +9,22 @@ import (
9 "sync"
10 "time"
11
12 - key "github.com/ipfs/go-ipfs/blocks/key"
12 routing "github.com/ipfs/go-ipfs/routing"
13 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
14 providers "github.com/ipfs/go-ipfs/routing/dht/providers"
15 kb "github.com/ipfs/go-ipfs/routing/kbucket"
16 record "github.com/ipfs/go-ipfs/routing/record"
17 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
18
19 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
20 - goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
21 - goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
19 + goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
20 + goprocessctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
21 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
22 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
23 ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
24 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
25 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
26 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
27 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
28 host "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/host"
29 protocol "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/protocol"
30 )
routing/dht/dht_bootstrap.go
+2 -2
@@ -12,8 +12,8 @@ import (
12 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
13 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
14
15 - goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
16 - periodicproc "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/periodic"
15 + goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
16 + periodicproc "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/periodic"
17 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
18 )
19
routing/dht/dht_test.go
+3 -3
@@ -9,13 +9,13 @@ import (
9 "testing"
10 "time"
11
12 - key "github.com/ipfs/go-ipfs/blocks/key"
12 routing "github.com/ipfs/go-ipfs/routing"
13 record "github.com/ipfs/go-ipfs/routing/record"
14 ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci"
15 travisci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci/travis"
17 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
18 - dssync "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
16 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
17 + dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
18 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
19
20 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
21 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
routing/dht/ext_test.go
+3 -3
@@ -6,12 +6,12 @@ import (
6 "testing"
7 "time"
8
9 - key "github.com/ipfs/go-ipfs/blocks/key"
9 routing "github.com/ipfs/go-ipfs/routing"
10 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
11 record "github.com/ipfs/go-ipfs/routing/record"
13 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
14 - dssync "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
12 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
13 + dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
14 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
15
16 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
17 ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
routing/dht/handlers.go
+2 -2
@@ -5,10 +5,10 @@ import (
5 "fmt"
6 "time"
7
8 - key "github.com/ipfs/go-ipfs/blocks/key"
8 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
9 lgbl "github.com/ipfs/go-ipfs/thirdparty/loggables"
11 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
10 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
11 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12
13 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
14 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
routing/dht/lookup.go
+1 -1
@@ -1,10 +1,10 @@
1 package dht
2
3 import (
4 - key "github.com/ipfs/go-ipfs/blocks/key"
4 notif "github.com/ipfs/go-ipfs/notifications"
5 kb "github.com/ipfs/go-ipfs/routing/kbucket"
6 pset "github.com/ipfs/go-ipfs/thirdparty/peerset"
7 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
8
9 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
10 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
routing/dht/pb/message.go
+1 -1
@@ -3,10 +3,10 @@ package dht_pb
3 import (
4 ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
5
6 - key "github.com/ipfs/go-ipfs/blocks/key"
6 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
7 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
8 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
9 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
10 inet "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/net"
11 )
12
routing/dht/providers/providers.go
+6 -6
@@ -6,18 +6,18 @@ import (
6 "strings"
7 "time"
8
9 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
10 - dsq "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/query"
11 - goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
12 - goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
9 + goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
10 + goprocessctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
11 + autobatch "gx/ipfs/QmSp3diFRRv4zR25nHU4MWNCdhT4R6cxrTPLx12MCi1TZb/autobatch"
12 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
13 lru "gx/ipfs/QmVYxfoJQiZijTgPNHCHgHELvQpbsJNTg6Crmc3dQkj3yy/golang-lru"
14 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
15 base32 "gx/ipfs/Qmb1DA2A9LS2wR4FFweB4uEDomFsdmnw1VLawLE1yQzudj/base32"
17 - autobatch "gx/ipfs/QmcRHLm2aqDabkpcto1NzLad7YQhH99MGDHSWWvwMxKiZw/autobatch"
16 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
17 + dsq "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/query"
18
19 - key "github.com/ipfs/go-ipfs/blocks/key"
19 flags "github.com/ipfs/go-ipfs/flags"
20 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
21
22 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
23 )
routing/dht/providers/providers_test.go
+2 -2
@@ -5,9 +5,9 @@ import (
5 "testing"
6 "time"
7
8 - key "github.com/ipfs/go-ipfs/blocks/key"
9 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
8 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
9 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
10 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
11
12 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13 )
routing/dht/query.go
+3 -3
@@ -3,14 +3,14 @@ package dht
3 import (
4 "sync"
5
6 - key "github.com/ipfs/go-ipfs/blocks/key"
6 notif "github.com/ipfs/go-ipfs/notifications"
7 "github.com/ipfs/go-ipfs/routing"
8 pset "github.com/ipfs/go-ipfs/thirdparty/peerset"
9 todoctr "github.com/ipfs/go-ipfs/thirdparty/todocounter"
10 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
11
12 - process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
13 - ctxproc "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
12 + process "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
13 + ctxproc "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
14 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
15 queue "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore/queue"
16 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
routing/dht/routing.go
+1 -1
@@ -7,13 +7,13 @@ import (
7 "sync"
8 "time"
9
10 - key "github.com/ipfs/go-ipfs/blocks/key"
10 notif "github.com/ipfs/go-ipfs/notifications"
11 "github.com/ipfs/go-ipfs/routing"
12 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
13 kb "github.com/ipfs/go-ipfs/routing/kbucket"
14 record "github.com/ipfs/go-ipfs/routing/record"
15 pset "github.com/ipfs/go-ipfs/thirdparty/peerset"
16 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
17
18 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
19 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
routing/kbucket/util.go
+1 -1
@@ -5,10 +5,10 @@ import (
5 "crypto/sha256"
6 "errors"
7
8 - key "github.com/ipfs/go-ipfs/blocks/key"
8 ks "github.com/ipfs/go-ipfs/routing/keyspace"
9 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
10 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
11 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12 )
13
14 // Returned if a routing table query returns no results. This is NOT expected
routing/mock/centralized_client.go
+2 -2
@@ -4,11 +4,11 @@ import (
4 "errors"
5 "time"
6
7 - key "github.com/ipfs/go-ipfs/blocks/key"
7 routing "github.com/ipfs/go-ipfs/routing"
8 dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
9 "github.com/ipfs/go-ipfs/thirdparty/testutil"
11 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
10 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
11 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12
13 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
14 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
routing/mock/centralized_server.go
+3 -3
@@ -5,10 +5,10 @@ import (
5 "sync"
6 "time"
7
8 - key "github.com/ipfs/go-ipfs/blocks/key"
8 "github.com/ipfs/go-ipfs/thirdparty/testutil"
10 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
11 - dssync "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
9 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
10 + dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
11 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12
13 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
14 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
routing/mock/centralized_test.go
+1 -1
@@ -4,9 +4,9 @@ import (
4 "testing"
5 "time"
6
7 - key "github.com/ipfs/go-ipfs/blocks/key"
7 delay "github.com/ipfs/go-ipfs/thirdparty/delay"
8 "github.com/ipfs/go-ipfs/thirdparty/testutil"
9 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
10
11 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
12 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
routing/mock/dht.go
+2 -2
@@ -3,9 +3,9 @@ package mockrouting
3 import (
4 dht "github.com/ipfs/go-ipfs/routing/dht"
5 "github.com/ipfs/go-ipfs/thirdparty/testutil"
6 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
7 - sync "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
6 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
8 + sync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
9 mocknet "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/net/mock"
10 )
11
routing/mock/interface.go
+2 -2
@@ -5,14 +5,14 @@
5 package mockrouting
6
7 import (
8 - key "github.com/ipfs/go-ipfs/blocks/key"
8 routing "github.com/ipfs/go-ipfs/routing"
9 delay "github.com/ipfs/go-ipfs/thirdparty/delay"
10 "github.com/ipfs/go-ipfs/thirdparty/testutil"
12 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
11 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
12 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
13 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
15 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
16 )
17
18 // Server provides mockrouting Clients
routing/none/none_client.go
+1 -1
@@ -3,13 +3,13 @@ package nilrouting
3 import (
4 "errors"
5
6 - key "github.com/ipfs/go-ipfs/blocks/key"
6 repo "github.com/ipfs/go-ipfs/repo"
7 routing "github.com/ipfs/go-ipfs/routing"
8 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
9 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
10 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
11 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
13 p2phost "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/host"
14 )
15
routing/offline/offline.go
+2 -2
@@ -4,11 +4,11 @@ import (
4 "errors"
5 "time"
6
7 - key "github.com/ipfs/go-ipfs/blocks/key"
7 routing "github.com/ipfs/go-ipfs/routing"
8 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
9 record "github.com/ipfs/go-ipfs/routing/record"
11 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
10 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
11 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12
13 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
14 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
routing/record/record.go
+1 -1
@@ -5,10 +5,10 @@ import (
5
6 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
7
8 - key "github.com/ipfs/go-ipfs/blocks/key"
8 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
9 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
10 ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
11 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12 )
13
14 var log = logging.Logger("routing/record")
routing/record/selection.go
+1 -1
@@ -3,8 +3,8 @@ package record
3 import (
4 "errors"
5
6 - key "github.com/ipfs/go-ipfs/blocks/key"
6 path "github.com/ipfs/go-ipfs/path"
7 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
8 )
9
10 // A SelectorFunc selects the best value for the given key from
routing/record/validation.go
+1 -1
@@ -5,12 +5,12 @@ import (
5 "errors"
6 "fmt"
7
8 - key "github.com/ipfs/go-ipfs/blocks/key"
8 path "github.com/ipfs/go-ipfs/path"
9 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
10 ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
11 mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
12 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
13 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
14 )
15
16 // ValidatorFunc is a function that is called to validate a given
routing/record/validation_test.go
+1 -1
@@ -4,8 +4,8 @@ import (
4 "encoding/base64"
5 "testing"
6
7 - key "github.com/ipfs/go-ipfs/blocks/key"
7 ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
8 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
9 )
10
11 var OffensiveKey = "CAASXjBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDjXAQQMal4SB2tSnX6NJIPmC69/BT8A8jc7/gDUZNkEhdhYHvc7k7S4vntV/c92nJGxNdop9fKJyevuNMuXhhHAgMBAAE="
routing/routing.go
+1 -1
@@ -4,11 +4,11 @@ package routing
4 import (
5 "errors"
6
7 - key "github.com/ipfs/go-ipfs/blocks/key"
7 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
8 ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
9 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
10 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12 )
13
14 // ErrNotFound is returned when a search fails to find anything
routing/supernode/client.go
+1 -1
@@ -5,11 +5,11 @@ import (
5 "errors"
6 "time"
7
8 - 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 proxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
11 loggables "github.com/ipfs/go-ipfs/thirdparty/loggables"
12 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
13
14 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
15 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
routing/supernode/proxy/standard.go
+1 -1
@@ -12,10 +12,10 @@ import (
12 host "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/host"
13 inet "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/net"
14
15 - key "github.com/ipfs/go-ipfs/blocks/key"
15 dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
16 kbucket "github.com/ipfs/go-ipfs/routing/kbucket"
17 loggables "github.com/ipfs/go-ipfs/thirdparty/loggables"
18 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
19 )
20
21 const ProtocolSNR = "/ipfs/supernoderouting"
routing/supernode/server.go
+2 -2
@@ -4,11 +4,11 @@ import (
4 "errors"
5 "fmt"
6
7 - key "github.com/ipfs/go-ipfs/blocks/key"
7 dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
8 record "github.com/ipfs/go-ipfs/routing/record"
9 proxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
11 - datastore "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
10 + datastore "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
11 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12
13 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
14 peer "gx/ipfs/QmWtbQU15LaB5B1JC2F7TV9P4K88vD3PpA4AJrwfCjhML8/go-libp2p-peer"
routing/supernode/server_test.go
+2 -2
@@ -3,9 +3,9 @@ package supernode
3 import (
4 "testing"
5
6 - key "github.com/ipfs/go-ipfs/blocks/key"
6 dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
8 - datastore "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
7 + datastore "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
8 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
9 )
10
11 func TestPutProviderDoesntResultInDuplicates(t *testing.T) {
test/integration/grandcentral_test.go
+3 -3
@@ -8,11 +8,10 @@ import (
8 "math"
9 "testing"
10
11 - "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
12 - syncds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
11 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12 + "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
13 + syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
14
15 - key "github.com/ipfs/go-ipfs/blocks/key"
15 core "github.com/ipfs/go-ipfs/core"
16 "github.com/ipfs/go-ipfs/core/corerouting"
17 "github.com/ipfs/go-ipfs/core/coreunix"
@@ -21,6 +20,7 @@ import (
20 testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
21 "github.com/ipfs/go-ipfs/thirdparty/unit"
22 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
23 + key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
24 mocknet "gx/ipfs/Qmf4ETeAWXuThBfWwonVyFqGFSgTWepUDEr1txcctvpTXS/go-libp2p/p2p/net/mock"
25 )
26
test/supernode_client/main.go
+2 -2
@@ -24,8 +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/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
28 - syncds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
27 + "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
28 + syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
29
30 pstore "gx/ipfs/QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d/go-libp2p-peerstore"
31 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
thirdparty/datastore2/datastore_closer.go
+1 -1
@@ -3,7 +3,7 @@ package datastore2
3 import (
4 "io"
5
6 - "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
6 + "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/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 "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
5 - dsq "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/query"
4 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
5 + dsq "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/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 - "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
6 + "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
7 )
8
9 // ClaimThreadSafe claims that a Datastore is threadsafe, even when
thirdparty/notifier/notifier.go
+2 -2
@@ -6,8 +6,8 @@ package notifier
6 import (
7 "sync"
8
9 - process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
10 - ratelimit "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/ratelimit"
9 + process "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
10 + ratelimit "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/ratelimit"
11 )
12
13 // Notifiee is a generic interface. Clients implement
thirdparty/testutil/datastore.go
+2 -2
@@ -2,8 +2,8 @@ package testutil
2
3 import (
4 ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
5 - "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
6 - syncds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
5 + "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
6 + syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
7 )
8
9 func ThreadSafeCloserMapDatastore() ds2.ThreadSafeDatastoreCloser {
unixfs/mod/dagmodifier_test.go
+2 -2
@@ -18,10 +18,10 @@ import (
18 ft "github.com/ipfs/go-ipfs/unixfs"
19 uio "github.com/ipfs/go-ipfs/unixfs/io"
20
21 - ds "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore"
22 - "gx/ipfs/QmNgqJarToRiq2GBaPJhkmW4B5BxS5B74E1rkGvv2JoaTp/go-datastore/sync"
21 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
22 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
23 + ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
24 + "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
25 )
26
27 func getMockDagServ(t testing.TB) mdag.DAGService {