update to libp2p 4.0.1 and propogate other changes
License: MIT Signed-off-by: Jeromy <why@ipfs.io>
Jeromy committed
Oct 5, 2016 at 15:49 UTC
1f9ec4e3ed1334ad4aa66a82391d1bc57cd03cf6
204 files changed
+691
-661
Godeps/_workspace/src/bazil.org/fuse/fs/bench/bench_test.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
11
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
12
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
13
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
+ "context"
14
)
15
16
type benchConfig struct {
Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/record.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
7
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
8
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
9
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9
+ "context"
10
)
11
12
// Writes gathers data from FUSE Write calls.
Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/wait.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
7
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
8
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
9
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9
+ "context"
10
)
11
12
type nothing struct{}
Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/testfs.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
6
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
7
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
8
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
8
+ "context"
9
)
10
11
// SimpleFS is a trivial FS that just implements the Root method.
Godeps/_workspace/src/bazil.org/fuse/fs/serve.go
+1
-1
@@ -14,7 +14,7 @@ import (
14
"sync"
15
"time"
16
17
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
+ "context"
18
)
19
20
import (
Godeps/_workspace/src/bazil.org/fuse/fs/serve_test.go
+1
-1
@@ -21,7 +21,7 @@ import (
21
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record"
22
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fuseutil"
23
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/syscallx"
24
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
24
+ "context"
25
)
26
27
// TO TEST:
Godeps/_workspace/src/bazil.org/fuse/fs/tree.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
pathpkg "path"
8
"strings"
9
10
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
+ "context"
11
)
12
13
import (
Godeps/_workspace/src/bazil.org/fuse/hellofs/hello.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
11
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
12
_ "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
13
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
+ "context"
14
)
15
16
var Usage = func() {
Godeps/_workspace/src/bazil.org/fuse/options_test.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
10
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
11
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
12
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
+ "context"
13
)
14
15
func init() {
assets/assets.go
+1
-1
@@ -11,7 +11,7 @@ import (
11
"github.com/ipfs/go-ipfs/core"
12
"github.com/ipfs/go-ipfs/core/coreunix"
13
uio "github.com/ipfs/go-ipfs/unixfs/io"
14
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
14
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
15
)
16
17
// initDocPaths lists the paths for the docs we want to seed during --init
blocks/blocks.go
+4
-4
@@ -6,11 +6,11 @@ import (
6
"errors"
7
"fmt"
8
9
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
9
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
10
11
- mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
12
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
13
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
11
+ mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash"
12
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
13
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
14
)
15
16
var ErrWrongHash = errors.New("data did not match given hash!")
blocks/blocks_test.go
+2
-2
@@ -4,8 +4,8 @@ import (
4
"bytes"
5
"testing"
6
7
- mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
8
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
7
+ mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash"
8
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
9
)
10
11
func TestBlocksBasic(t *testing.T) {
blocks/blockstore/arc_cache.go
+2
-2
@@ -1,13 +1,13 @@
1
package blockstore
2
3
import (
4
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
4
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
5
6
"github.com/ipfs/go-ipfs/blocks"
7
8
+ context "context"
9
"gx/ipfs/QmRg1gKTHzc3CZXSKzem8aR4E3TubFhbgXwfVuWnSK5CC5/go-metrics-interface"
10
lru "gx/ipfs/QmVYxfoJQiZijTgPNHCHgHELvQpbsJNTg6Crmc3dQkj3yy/golang-lru"
10
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
12
)
13
blocks/blockstore/arc_cache_test.go
+2
-2
@@ -4,9 +4,9 @@ import (
4
"testing"
5
6
"github.com/ipfs/go-ipfs/blocks"
7
- "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
7
+ "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
8
9
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9
+ context "context"
10
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
11
syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
12
)
blocks/blockstore/blockstore.go
+3
-3
@@ -7,14 +7,14 @@ import (
7
"sync"
8
"sync/atomic"
9
10
+ context "context"
11
blocks "github.com/ipfs/go-ipfs/blocks"
12
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
12
- mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
13
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
+ mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash"
14
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
15
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
16
dsns "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/namespace"
17
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
+3
-3
@@ -5,14 +5,14 @@ import (
5
"fmt"
6
"testing"
7
8
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
9
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
8
+ context "context"
9
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
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 "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
15
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
16
)
17
18
func TestGetWhenKeyNotPresent(t *testing.T) {
blocks/blockstore/bloom_cache.go
+2
-2
@@ -5,10 +5,10 @@ import (
5
"time"
6
7
"github.com/ipfs/go-ipfs/blocks"
8
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
8
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
9
10
+ context "context"
11
"gx/ipfs/QmRg1gKTHzc3CZXSKzem8aR4E3TubFhbgXwfVuWnSK5CC5/go-metrics-interface"
11
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
bloom "gx/ipfs/QmeiMCBkYHxkDkDfnDadzz4YxY5ruL5Pj499essE4vRsGM/bbloom"
13
)
14
blocks/blockstore/bloom_cache_test.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
9
"github.com/ipfs/go-ipfs/blocks"
10
11
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
+ context "context"
12
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
13
dsq "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/query"
14
syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
blocks/blockstore/caching.go
+1
-1
@@ -3,8 +3,8 @@ package blockstore
3
import (
4
"errors"
5
6
+ context "context"
7
"gx/ipfs/QmRg1gKTHzc3CZXSKzem8aR4E3TubFhbgXwfVuWnSK5CC5/go-metrics-interface"
7
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
8
)
9
10
// Next to each option is it aproximate memory usage per unit
blocks/blockstore/util/remove.go
+2
-2
@@ -6,9 +6,9 @@ import (
6
7
bs "github.com/ipfs/go-ipfs/blocks/blockstore"
8
"github.com/ipfs/go-ipfs/pin"
9
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
10
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
11
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
10
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
11
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
12
)
13
14
// RemovedBlock is used to respresent the result of removing a block.
blocks/set/set.go
+1
-1
@@ -4,7 +4,7 @@ package set
4
import (
5
"github.com/ipfs/go-ipfs/blocks/bloom"
6
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
7
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
7
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/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 "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
7
+ k "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
8
)
9
10
const (
blockservice/blockservice.go
+3
-3
@@ -10,11 +10,11 @@ import (
10
blocks "github.com/ipfs/go-ipfs/blocks"
11
"github.com/ipfs/go-ipfs/blocks/blockstore"
12
exchange "github.com/ipfs/go-ipfs/exchange"
13
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
13
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
14
15
+ context "context"
16
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
16
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
17
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
18
)
19
20
var log = logging.Logger("blockservice")
blockservice/test/blocks_test.go
+4
-4
@@ -10,13 +10,13 @@ import (
10
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
11
. "github.com/ipfs/go-ipfs/blockservice"
12
offline "github.com/ipfs/go-ipfs/exchange/offline"
13
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
13
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
14
15
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15
+ "context"
16
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
17
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
18
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
19
dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
19
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
20
)
21
22
func newObject(data []byte) *testObject {
cmd/ipfs/daemon.go
+6
-6
@@ -21,13 +21,13 @@ import (
21
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
22
migrate "github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
23
24
+ iconn "gx/ipfs/QmNxScD426NivSWRNJdLVfXLrzVdtNWxW74EnXAWJvgGwh/go-libp2p-interface-conn"
25
"gx/ipfs/QmR3KwhXCRLTNZB59vELb2HhEWrGy9nuychepxFtj3wWYa/client_golang/prometheus"
26
+ "gx/ipfs/QmT6Cp31887FpAc25z25YHgpFJohZedrYLWPPspRtj1Brp/go-multiaddr-net"
27
+ ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
28
mprome "gx/ipfs/QmXWro6iddJRbGWUoZDpTu6tjo5EXX4xJHHR9VczeoGZbw/go-metrics-prometheus"
26
- "gx/ipfs/QmY83KqqnQ286ZWbV2x7ixpeemH3cBpk8R54egS619WYff/go-multiaddr-net"
27
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
28
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
29
- util "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
30
- conn "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net/conn"
29
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
30
+ util "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
31
32
_ "gx/ipfs/QmV3NSS3A1kX5s28r7yLczhDsXzkgo65cqRgKFXYunWZmD/metrics/runtime"
33
)
@@ -206,7 +206,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
206
if unencrypted {
207
log.Warningf(`Running with --%s: All connections are UNENCRYPTED.
208
You will not be able to connect to regular encrypted networks.`, unencryptTransportKwd)
209
- conn.EncryptConnections = false
209
+ iconn.EncryptConnections = false
210
}
211
212
// first, whether user has provided the initialization flag. we may be
cmd/ipfs/init.go
+1
-1
@@ -14,7 +14,7 @@ import (
14
namesys "github.com/ipfs/go-ipfs/namesys"
15
config "github.com/ipfs/go-ipfs/repo/config"
16
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
17
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
+ context "context"
18
)
19
20
const (
cmd/ipfs/main.go
+5
-5
@@ -17,12 +17,12 @@ import (
17
"syscall"
18
"time"
19
20
- manet "gx/ipfs/QmY83KqqnQ286ZWbV2x7ixpeemH3cBpk8R54egS619WYff/go-multiaddr-net"
21
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
20
+ manet "gx/ipfs/QmT6Cp31887FpAc25z25YHgpFJohZedrYLWPPspRtj1Brp/go-multiaddr-net"
21
+ ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
22
23
+ context "context"
24
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
24
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
25
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
25
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
26
27
cmds "github.com/ipfs/go-ipfs/commands"
28
cmdsCli "github.com/ipfs/go-ipfs/commands/cli"
@@ -32,7 +32,7 @@ import (
32
repo "github.com/ipfs/go-ipfs/repo"
33
config "github.com/ipfs/go-ipfs/repo/config"
34
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
35
- loggables "gx/ipfs/QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7/go-libp2p-loggables"
35
+ loggables "gx/ipfs/QmTMy4hVSY28DdwJ9kBz6y7q6MuioFzPcpM3Ma3aPjo1i3/go-libp2p-loggables"
36
)
37
38
// log is the command logger
cmd/ipfswatch/main.go
+2
-2
@@ -7,6 +7,7 @@ import (
7
"os/signal"
8
"path/filepath"
9
10
+ context "context"
11
homedir "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir"
12
commands "github.com/ipfs/go-ipfs/commands"
13
core "github.com/ipfs/go-ipfs/core"
@@ -14,8 +15,7 @@ import (
15
coreunix "github.com/ipfs/go-ipfs/core/coreunix"
16
config "github.com/ipfs/go-ipfs/repo/config"
17
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
17
- process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
18
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
18
+ process "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
19
fsnotify "gx/ipfs/QmczzCMvJ3HV57WBKDy8b4ucp7quT325JjDbixYRS5Pwvv/fsnotify.v1"
20
)
21
cmd/seccat/seccat.go
+5
-5
@@ -18,12 +18,12 @@ import (
18
"os/signal"
19
"syscall"
20
21
+ context "context"
22
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
22
- ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
23
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
24
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
25
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
26
- secio "gx/ipfs/QmbnPJidHfeekkdLkoboBooA56KB92cT8csDmJwCc2bQJ1/go-libp2p-secio"
23
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
24
+ secio "gx/ipfs/QmfDU2uJQkxXP6nDTfSPSx4rQt4S4fU4XMRoQA5DzYGWfe/go-libp2p-secio"
25
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
26
+ ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
27
)
28
29
var verbose = false
commands/cli/parse.go
+1
-1
@@ -13,7 +13,7 @@ import (
13
cmds "github.com/ipfs/go-ipfs/commands"
14
files "github.com/ipfs/go-ipfs/commands/files"
15
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
16
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
17
)
18
19
var log = logging.Logger("commands/cli")
commands/http/client.go
+2
-2
@@ -15,7 +15,7 @@ import (
15
cmds "github.com/ipfs/go-ipfs/commands"
16
config "github.com/ipfs/go-ipfs/repo/config"
17
18
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
18
+ context "context"
19
)
20
21
const (
@@ -245,7 +245,7 @@ func readStreamedJson(req cmds.Request, rr io.Reader, out chan<- interface{}, re
245
if err != nil {
246
if err != io.EOF {
247
log.Error(err)
248
- resp.SetError(err, cmds.ErrNormal)
248
+ resp.SetError(err, cmds.ErrNormal)
249
}
250
return
251
}
commands/http/handler.go
+1
-1
@@ -11,9 +11,9 @@ import (
11
"strings"
12
"sync"
13
14
+ context "context"
15
"github.com/ipfs/go-ipfs/repo/config"
16
cors "gx/ipfs/QmQzTLDsi3a37CJyMDBXnjiHKQpth3AGS1yqwU57FfLwfG/cors"
16
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
18
cmds "github.com/ipfs/go-ipfs/commands"
19
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
commands/option.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"reflect"
6
"strings"
7
8
- "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
8
+ "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
9
)
10
11
// Types of Command options
commands/request.go
+2
-2
@@ -10,11 +10,11 @@ import (
10
"strconv"
11
"time"
12
13
+ context "context"
14
"github.com/ipfs/go-ipfs/commands/files"
15
"github.com/ipfs/go-ipfs/core"
16
"github.com/ipfs/go-ipfs/repo/config"
16
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
17
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
18
)
19
20
type OptMap map[string]interface{}
core/bootstrap.go
+10
-10
@@ -10,16 +10,16 @@ import (
10
11
config "github.com/ipfs/go-ipfs/repo/config"
12
math2 "github.com/ipfs/go-ipfs/thirdparty/math2"
13
- lgbl "gx/ipfs/QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7/go-libp2p-loggables"
14
-
15
- goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
16
- procctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
17
- periodicproc "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/periodic"
18
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
19
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
20
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
21
- host "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/host"
22
- inet "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net"
13
+ lgbl "gx/ipfs/QmTMy4hVSY28DdwJ9kBz6y7q6MuioFzPcpM3Ma3aPjo1i3/go-libp2p-loggables"
14
+
15
+ context "context"
16
+ goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
17
+ procctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
18
+ periodicproc "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/periodic"
19
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
20
+ host "gx/ipfs/QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki/go-libp2p-host"
21
+ inet "gx/ipfs/QmdXimY9QHaasZmw6hWojWnCJvfgxETjZQfg9g6ZrA9wMX/go-libp2p-net"
22
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
23
)
24
25
// ErrNotEnoughBootstrapPeers signals that we do not have enough bootstrap
core/bootstrap_test.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
7
config "github.com/ipfs/go-ipfs/repo/config"
8
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
9
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
9
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
10
)
11
12
func TestSubsetWhenMaxIsGreaterThanLengthOfSlice(t *testing.T) {
core/builder.go
+5
-5
@@ -17,15 +17,15 @@ import (
17
repo "github.com/ipfs/go-ipfs/repo"
18
cfg "github.com/ipfs/go-ipfs/repo/config"
19
20
+ context "context"
21
retry "gx/ipfs/QmPF5kxTYFkzhaY5LmkExood7aTTZBHWQC6cjdDQBuGrjp/retry-datastore"
21
- goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
22
metrics "gx/ipfs/QmRg1gKTHzc3CZXSKzem8aR4E3TubFhbgXwfVuWnSK5CC5/go-metrics-interface"
23
- ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
24
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
25
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
23
+ goprocessctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
24
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
25
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
26
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
27
dsync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
28
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
28
+ ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
29
)
30
31
type BuildCfg struct {
core/commands/add.go
+1
-1
@@ -16,7 +16,7 @@ import (
16
dagtest "github.com/ipfs/go-ipfs/merkledag/test"
17
mfs "github.com/ipfs/go-ipfs/mfs"
18
ft "github.com/ipfs/go-ipfs/unixfs"
19
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
19
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
20
)
21
22
// Error indicating the max depth has been exceded.
core/commands/bitswap.go
+4
-4
@@ -8,12 +8,12 @@ import (
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"
11
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
12
13
"gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
14
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
15
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
14
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
15
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
16
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
17
)
18
19
var BitswapCmd = &cmds.Command{
core/commands/block.go
+2
-2
@@ -11,8 +11,8 @@ import (
11
"github.com/ipfs/go-ipfs/blocks"
12
util "github.com/ipfs/go-ipfs/blocks/blockstore/util"
13
cmds "github.com/ipfs/go-ipfs/commands"
14
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
15
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
14
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
15
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
16
)
17
18
type BlockStat struct {
core/commands/bootstrap.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
repo "github.com/ipfs/go-ipfs/repo"
11
config "github.com/ipfs/go-ipfs/repo/config"
12
"github.com/ipfs/go-ipfs/repo/fsrepo"
13
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
13
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
14
)
15
16
type BootstrapOutput struct {
core/commands/cat.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
core "github.com/ipfs/go-ipfs/core"
8
coreunix "github.com/ipfs/go-ipfs/core/coreunix"
9
10
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
+ context "context"
11
)
12
13
const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB
core/commands/config.go
+1
-1
@@ -16,7 +16,7 @@ import (
16
config "github.com/ipfs/go-ipfs/repo/config"
17
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
18
19
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
19
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
20
)
21
22
type ConfigField struct {
core/commands/dht.go
+30
-28
@@ -2,6 +2,7 @@ package commands
2
3
import (
4
"bytes"
5
+ "context"
6
"errors"
7
"fmt"
8
"io"
@@ -11,15 +12,15 @@ import (
12
dag "github.com/ipfs/go-ipfs/merkledag"
13
path "github.com/ipfs/go-ipfs/path"
14
14
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
15
- ipdht "gx/ipfs/QmXVWh4XWRaRGdcGeFtBp3hx7H3mzYgVRpVN7LwtTaYv2E/go-libp2p-kad-dht"
16
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
17
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
18
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
20
- routing "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing"
21
- notif "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing/notifications"
22
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
15
+ ipdht "gx/ipfs/QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo/go-libp2p-kad-dht"
16
+ b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58"
17
+ routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
18
+ notif "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing/notifications"
19
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
20
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
21
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
22
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
23
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
24
)
25
26
var ErrNotDHT = errors.New("routing service is not a DHT")
@@ -68,7 +69,9 @@ var queryDhtCmd = &cmds.Command{
69
events := make(chan *notif.QueryEvent)
70
ctx := notif.RegisterForQueryEvents(req.Context(), events)
71
71
- closestPeers, err := dht.GetClosestPeers(ctx, key.Key(req.Arguments()[0]))
72
+ k := string(b58.Decode(req.Arguments()[0]))
73
+
74
+ closestPeers, err := dht.GetClosestPeers(ctx, k)
75
if err != nil {
76
res.SetError(err, cmds.ErrNormal)
77
return
@@ -165,7 +168,13 @@ var findProvidersDhtCmd = &cmds.Command{
168
events := make(chan *notif.QueryEvent)
169
ctx := notif.RegisterForQueryEvents(req.Context(), events)
170
168
- pchan := dht.FindProvidersAsync(ctx, key.B58KeyDecode(req.Arguments()[0]), numProviders)
171
+ c, err := cid.Decode(req.Arguments()[0])
172
+ if err != nil {
173
+ res.SetError(err, cmds.ErrNormal)
174
+ return
175
+ }
176
+
177
+ pchan := dht.FindProvidersAsync(ctx, c, numProviders)
178
go func() {
179
defer close(outChan)
180
for e := range events {
@@ -349,7 +358,7 @@ var provideRefDhtCmd = &cmds.Command{
358
359
func provideKeys(ctx context.Context, r routing.IpfsRouting, cids []*cid.Cid) error {
360
for _, c := range cids {
352
- err := r.Provide(ctx, key.Key(c.Hash()))
361
+ err := r.Provide(ctx, c)
362
if err != nil {
363
return err
364
}
@@ -358,28 +367,21 @@ func provideKeys(ctx context.Context, r routing.IpfsRouting, cids []*cid.Cid) er
367
}
368
369
func provideKeysRec(ctx context.Context, r routing.IpfsRouting, dserv dag.DAGService, cids []*cid.Cid) error {
361
- provided := make(map[key.Key]struct{})
370
+ provided := cid.NewSet()
371
for _, c := range cids {
363
- kset := key.NewKeySet()
372
+ kset := cid.NewSet()
373
node, err := dserv.Get(ctx, c)
374
if err != nil {
375
return err
376
}
377
369
- err = dag.EnumerateChildrenAsync(ctx, dserv, node, func(c *cid.Cid) bool {
370
- k := key.Key(c.Hash())
371
- if kset.Has(k) {
372
- kset.Add(k)
373
- return true
374
- }
375
- return false
376
- })
378
+ err = dag.EnumerateChildrenAsync(ctx, dserv, node, kset.Visit)
379
if err != nil {
380
return err
381
}
382
383
for _, k := range kset.Keys() {
382
- if _, ok := provided[k]; ok {
384
+ if provided.Has(k) {
385
continue
386
}
387
@@ -387,7 +389,7 @@ func provideKeysRec(ctx context.Context, r routing.IpfsRouting, dserv dag.DAGSer
389
if err != nil {
390
return err
391
}
390
- provided[k] = struct{}{}
392
+ provided.Add(k)
393
}
394
}
395
@@ -771,14 +773,14 @@ func printEvent(obj *notif.QueryEvent, out io.Writer, verbose bool, override pfu
773
}
774
}
775
774
-func escapeDhtKey(s string) (key.Key, error) {
776
+func escapeDhtKey(s string) (string, error) {
777
parts := path.SplitList(s)
778
switch len(parts) {
779
case 1:
778
- return key.B58KeyDecode(s), nil
780
+ return string(b58.Decode(s)), nil
781
case 3:
780
- k := key.B58KeyDecode(parts[2])
781
- return key.Key(path.Join(append(parts[:2], string(k)))), nil
782
+ k := b58.Decode(parts[2])
783
+ return path.Join(append(parts[:2], string(k))), nil
784
default:
785
return "", errors.New("invalid key")
786
}
core/commands/dns.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
7
cmds "github.com/ipfs/go-ipfs/commands"
8
namesys "github.com/ipfs/go-ipfs/namesys"
9
- util "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
9
+ util "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
10
)
11
12
var DNSCmd = &cmds.Command{
core/commands/files/files.go
+1
-1
@@ -16,8 +16,8 @@ import (
16
path "github.com/ipfs/go-ipfs/path"
17
ft "github.com/ipfs/go-ipfs/unixfs"
18
19
+ context "context"
20
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
20
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
21
)
22
23
var log = logging.Logger("cmds/files")
core/commands/id.go
+6
-6
@@ -12,13 +12,13 @@ import (
12
13
cmds "github.com/ipfs/go-ipfs/commands"
14
core "github.com/ipfs/go-ipfs/core"
15
- kb "gx/ipfs/QmVsCNFD32GzZ6Q5XD1TVGPRviNYqDdoNvgq853TU9hhzP/go-libp2p-kbucket"
15
+ kb "gx/ipfs/QmUKePKcUEXwdvJENZJ6z8mJjPaxLsDZ3V9CZjPPtyawPm/go-libp2p-kbucket"
16
17
- ic "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
18
- "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
19
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
20
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
21
- identify "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/protocol/identify"
17
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
18
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
19
+ identify "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/protocol/identify"
20
+ "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
21
+ ic "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
22
)
23
24
const offlineIdErrorMessage = `'ipfs id' currently cannot query information on remote
core/commands/ipns.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
cmds "github.com/ipfs/go-ipfs/commands"
9
namesys "github.com/ipfs/go-ipfs/namesys"
10
offline "github.com/ipfs/go-ipfs/routing/offline"
11
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
11
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
12
)
13
14
var IpnsCmd = &cmds.Command{
core/commands/ls.go
+1
-1
@@ -12,7 +12,7 @@ import (
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"
15
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
16
)
17
18
type LsLink struct {
core/commands/object/object.go
+1
-1
@@ -12,7 +12,7 @@ import (
12
"strings"
13
"text/tabwriter"
14
15
- mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
15
+ mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash"
16
17
cmds "github.com/ipfs/go-ipfs/commands"
18
core "github.com/ipfs/go-ipfs/core"
core/commands/object/patch.go
+1
-1
@@ -11,7 +11,7 @@ import (
11
dagutils "github.com/ipfs/go-ipfs/merkledag/utils"
12
path "github.com/ipfs/go-ipfs/path"
13
ft "github.com/ipfs/go-ipfs/unixfs"
14
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
14
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
15
)
16
17
var ObjectPatchCmd = &cmds.Command{
core/commands/pin.go
+3
-3
@@ -12,9 +12,9 @@ import (
12
path "github.com/ipfs/go-ipfs/path"
13
pin "github.com/ipfs/go-ipfs/pin"
14
15
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
15
+ context "context"
16
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
17
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
18
)
19
20
var PinCmd = &cmds.Command{
core/commands/ping.go
+5
-5
@@ -10,12 +10,12 @@ import (
10
11
cmds "github.com/ipfs/go-ipfs/commands"
12
core "github.com/ipfs/go-ipfs/core"
13
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
14
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
15
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
13
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
14
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
15
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
16
17
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
18
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
+ context "context"
18
+ ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
19
)
20
21
const kPingTimeout = 10 * time.Second
core/commands/publish.go
+3
-3
@@ -7,13 +7,13 @@ import (
7
"strings"
8
"time"
9
10
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
+ context "context"
11
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"
15
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
16
+ crypto "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
17
)
18
19
var errNotOnline = errors.New("This command must be run in online mode. Try running 'ipfs daemon' first.")
core/commands/pubsub.go
+5
-6
@@ -13,11 +13,10 @@ import (
13
cmds "github.com/ipfs/go-ipfs/commands"
14
core "github.com/ipfs/go-ipfs/core"
15
16
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
17
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
18
- floodsub "gx/ipfs/QmaUewj1HPiCX5mjNHmevQiNWr4eeAn7HBfHcGVbRyafdo/floodsub"
19
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
20
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
16
+ floodsub "gx/ipfs/QmTgcWwxttM74AY7UYA6qMP9WpzfBEjbZntx7ZWLttRMJJ/floodsub"
17
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
18
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
19
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
20
)
21
22
var PubsubCmd = &cmds.Command{
@@ -138,7 +137,7 @@ func connectToPubSubPeers(ctx context.Context, n *core.IpfsNode, cid *cid.Cid) {
137
ctx, cancel := context.WithCancel(ctx)
138
defer cancel()
139
141
- provs := n.Routing.FindProvidersAsync(ctx, key.Key(cid.Hash()), 10)
140
+ provs := n.Routing.FindProvidersAsync(ctx, cid, 10)
141
wg := &sync.WaitGroup{}
142
for p := range provs {
143
wg.Add(1)
core/commands/refs.go
+4
-4
@@ -10,11 +10,11 @@ import (
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"
13
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
14
15
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
15
+ context "context"
16
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
17
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
18
)
19
20
// KeyList is a general type for outputting lists of keys
core/commands/repo.go
+1
-1
@@ -15,7 +15,7 @@ import (
15
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
16
lockfile "github.com/ipfs/go-ipfs/repo/fsrepo/lock"
17
18
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
18
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
19
)
20
21
type RepoVersion struct {
core/commands/resolve.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
"github.com/ipfs/go-ipfs/core"
9
ns "github.com/ipfs/go-ipfs/namesys"
10
path "github.com/ipfs/go-ipfs/path"
11
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
11
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
12
)
13
14
type ResolvedPath struct {
core/commands/stat.go
+4
-4
@@ -10,10 +10,10 @@ import (
10
humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
11
12
cmds "github.com/ipfs/go-ipfs/commands"
13
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
14
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
15
- metrics "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/metrics"
16
- protocol "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/protocol"
13
+ metrics "gx/ipfs/QmWpTXhTkpoCDEm9twJd5Rc9jFwy61emzxneeJzrVMfjGF/go-libp2p-metrics"
14
+ protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
15
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
16
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
17
)
18
19
var StatsCmd = &cmds.Command{
core/commands/swarm.go
+3
-3
@@ -13,11 +13,11 @@ import (
13
config "github.com/ipfs/go-ipfs/repo/config"
14
"github.com/ipfs/go-ipfs/repo/fsrepo"
15
iaddr "github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
16
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
17
- swarm "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net/swarm"
16
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
17
+ swarm "gx/ipfs/QmeAfPWBWDQq9qjQ5oiWhaFs7oEsfB6FyEj5VxNdc2r34q/go-libp2p-swarm"
18
19
mafilter "gx/ipfs/QmSMZwvs3n4GBikZ7hKzT17c3bk65FmyZo2JqtJ16swqCv/multiaddr-filter"
20
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
20
+ ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
21
)
22
23
type stringList struct {
core/commands/sysdiag.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
cmds "github.com/ipfs/go-ipfs/commands"
9
config "github.com/ipfs/go-ipfs/repo/config"
10
11
- manet "gx/ipfs/QmY83KqqnQ286ZWbV2x7ixpeemH3cBpk8R54egS619WYff/go-multiaddr-net"
11
+ manet "gx/ipfs/QmT6Cp31887FpAc25z25YHgpFJohZedrYLWPPspRtj1Brp/go-multiaddr-net"
12
sysi "gx/ipfs/QmZRjKbHa6DenStpQJFiaPcEwkZqrx7TH6xTf342LDU3qM/go-sysinfo"
13
)
14
core/core.go
+19
-19
@@ -18,31 +18,31 @@ import (
18
19
diag "github.com/ipfs/go-ipfs/diagnostics"
20
21
- goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
21
+ context "context"
22
+ goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
23
mamask "gx/ipfs/QmSMZwvs3n4GBikZ7hKzT17c3bk65FmyZo2JqtJ16swqCv/multiaddr-filter"
24
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
25
b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58"
25
- ic "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
26
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
27
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
28
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
29
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
30
- floodsub "gx/ipfs/QmaUewj1HPiCX5mjNHmevQiNWr4eeAn7HBfHcGVbRyafdo/floodsub"
31
- discovery "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/discovery"
32
- p2phost "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/host"
33
- p2pbhost "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/host/basic"
34
- rhost "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/host/routed"
35
- metrics "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/metrics"
36
- swarm "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net/swarm"
37
- addrutil "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net/swarm/addr"
38
- ping "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/protocol/ping"
26
+ floodsub "gx/ipfs/QmTgcWwxttM74AY7UYA6qMP9WpzfBEjbZntx7ZWLttRMJJ/floodsub"
27
+ ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
28
+ addrutil "gx/ipfs/QmVDnc2zvyQm8LhT72n22THcshvH7j3qPMnhvjerQER62T/go-addr-util"
29
+ metrics "gx/ipfs/QmWpTXhTkpoCDEm9twJd5Rc9jFwy61emzxneeJzrVMfjGF/go-libp2p-metrics"
30
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
31
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
32
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
40
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
33
+ discovery "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/discovery"
34
+ p2pbhost "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/host/basic"
35
+ rhost "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/host/routed"
36
+ ping "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/protocol/ping"
37
+ p2phost "gx/ipfs/QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki/go-libp2p-host"
38
+ swarm "gx/ipfs/QmeAfPWBWDQq9qjQ5oiWhaFs7oEsfB6FyEj5VxNdc2r34q/go-libp2p-swarm"
39
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
40
+ ic "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
41
42
nilrouting "github.com/ipfs/go-ipfs/routing/none"
43
offroute "github.com/ipfs/go-ipfs/routing/offline"
44
- dht "gx/ipfs/QmXVWh4XWRaRGdcGeFtBp3hx7H3mzYgVRpVN7LwtTaYv2E/go-libp2p-kad-dht"
45
- routing "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing"
44
+ dht "gx/ipfs/QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo/go-libp2p-kad-dht"
45
+ routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
46
47
bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
48
bserv "github.com/ipfs/go-ipfs/blockservice"
@@ -61,7 +61,7 @@ import (
61
repo "github.com/ipfs/go-ipfs/repo"
62
config "github.com/ipfs/go-ipfs/repo/config"
63
uio "github.com/ipfs/go-ipfs/unixfs/io"
64
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
64
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
65
)
66
67
const IpnsValidatorTag = "ipns"
core/core_test.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"github.com/ipfs/go-ipfs/repo"
7
config "github.com/ipfs/go-ipfs/repo/config"
8
"github.com/ipfs/go-ipfs/thirdparty/testutil"
9
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9
+ context "context"
10
)
11
12
func TestInitialization(t *testing.T) {
core/corehttp/corehttp.go
+3
-3
@@ -11,10 +11,10 @@ import (
11
"time"
12
13
core "github.com/ipfs/go-ipfs/core"
14
- "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
14
+ "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
15
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
16
- manet "gx/ipfs/QmY83KqqnQ286ZWbV2x7ixpeemH3cBpk8R54egS619WYff/go-multiaddr-net"
17
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
16
+ manet "gx/ipfs/QmT6Cp31887FpAc25z25YHgpFJohZedrYLWPPspRtj1Brp/go-multiaddr-net"
17
+ ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
18
)
19
20
var log = logging.Logger("core/server")
core/corehttp/gateway.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
8
core "github.com/ipfs/go-ipfs/core"
9
config "github.com/ipfs/go-ipfs/repo/config"
10
- id "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/protocol/identify"
10
+ id "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/protocol/identify"
11
)
12
13
type GatewayConfig struct {
core/corehttp/gateway_handler.go
+3
-3
@@ -18,10 +18,10 @@ import (
18
path "github.com/ipfs/go-ipfs/path"
19
uio "github.com/ipfs/go-ipfs/unixfs/io"
20
21
+ "context"
22
humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
22
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
23
- routing "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing"
24
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
23
+ routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
24
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
25
)
26
27
const (
core/corehttp/gateway_test.go
+3
-3
@@ -9,6 +9,7 @@ import (
9
"testing"
10
"time"
11
12
+ context "context"
13
core "github.com/ipfs/go-ipfs/core"
14
coreunix "github.com/ipfs/go-ipfs/core/coreunix"
15
namesys "github.com/ipfs/go-ipfs/namesys"
@@ -16,9 +17,8 @@ import (
17
repo "github.com/ipfs/go-ipfs/repo"
18
config "github.com/ipfs/go-ipfs/repo/config"
19
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
19
- ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
20
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
21
- id "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/protocol/identify"
20
+ id "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/protocol/identify"
21
+ ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
22
)
23
24
type mockNamesys map[string]path.Path
core/corehttp/ipns_hostname.go
+1
-1
@@ -5,8 +5,8 @@ import (
5
"net/http"
6
"strings"
7
8
+ "context"
9
"github.com/ipfs/go-ipfs/core"
9
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
isd "gx/ipfs/QmaeHSCBd9XjXxmgHEiKkHtLcMCb2eZsPLKT7bHgBfBkqw/go-is-domain"
11
)
12
core/corehttp/metrics_test.go
+4
-4
@@ -4,11 +4,11 @@ import (
4
"testing"
5
"time"
6
7
+ context "context"
8
core "github.com/ipfs/go-ipfs/core"
8
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9
- bhost "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/host/basic"
10
- inet "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net"
11
- testutil "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/test/util"
9
+ bhost "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/host/basic"
10
+ testutil "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/test/util"
11
+ inet "gx/ipfs/QmdXimY9QHaasZmw6hWojWnCJvfgxETjZQfg9g6ZrA9wMX/go-libp2p-net"
12
)
13
14
// This test is based on go-libp2p/p2p/net/swarm.TestConnectednessCorrect
core/corenet/net.go
+5
-5
@@ -3,12 +3,12 @@ package corenet
3
import (
4
"time"
5
6
+ context "context"
7
core "github.com/ipfs/go-ipfs/core"
7
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
8
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
9
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
- net "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net"
11
- pro "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/protocol"
8
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
9
+ pro "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
10
+ net "gx/ipfs/QmdXimY9QHaasZmw6hWojWnCJvfgxETjZQfg9g6ZrA9wMX/go-libp2p-net"
11
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
12
)
13
14
type ipfsListener struct {
core/corerepo/gc.go
+3
-3
@@ -8,12 +8,12 @@ import (
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"
11
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
12
13
+ context "context"
14
humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
15
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
15
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
16
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
17
)
18
19
var log = logging.Logger("corerepo")
core/corerepo/pinning.go
+2
-2
@@ -20,8 +20,8 @@ import (
20
"github.com/ipfs/go-ipfs/merkledag"
21
path "github.com/ipfs/go-ipfs/path"
22
23
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
24
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
23
+ context "context"
24
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
25
)
26
27
func Pin(n *core.IpfsNode, ctx context.Context, paths []string, recursive bool) ([]*cid.Cid, error) {
core/corerepo/stat.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
6
"github.com/ipfs/go-ipfs/core"
7
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
8
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
8
+ context "context"
9
)
10
11
type Stat struct {
core/corerouting/core.go
+4
-4
@@ -3,15 +3,15 @@ package corerouting
3
import (
4
"errors"
5
6
+ context "context"
7
core "github.com/ipfs/go-ipfs/core"
8
repo "github.com/ipfs/go-ipfs/repo"
9
supernode "github.com/ipfs/go-ipfs/routing/supernode"
10
gcproxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
10
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
11
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
- "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/host"
11
+ routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
12
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
13
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
14
- routing "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing"
14
+ "gx/ipfs/QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki/go-libp2p-host"
15
)
16
17
// NB: DHT option is included in the core to avoid 1) because it's a sane
core/coreunix/add.go
+2
-2
@@ -20,11 +20,11 @@ import (
20
"github.com/ipfs/go-ipfs/pin"
21
unixfs "github.com/ipfs/go-ipfs/unixfs"
22
23
+ context "context"
24
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
24
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
25
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
26
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
27
syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
27
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
28
)
29
30
var log = logging.Logger("coreunix")
core/coreunix/add_test.go
+3
-3
@@ -14,10 +14,10 @@ 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"
17
+ "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
18
19
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
20
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
19
+ "context"
20
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
21
)
22
23
func TestAddRecursive(t *testing.T) {
core/coreunix/cat.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
core "github.com/ipfs/go-ipfs/core"
5
path "github.com/ipfs/go-ipfs/path"
6
uio "github.com/ipfs/go-ipfs/unixfs/io"
7
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7
+ context "context"
8
)
9
10
func Cat(ctx context.Context, n *core.IpfsNode, pstr string) (*uio.DagReader, error) {
core/coreunix/metadata.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
core "github.com/ipfs/go-ipfs/core"
5
dag "github.com/ipfs/go-ipfs/merkledag"
6
ft "github.com/ipfs/go-ipfs/unixfs"
7
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
7
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
8
)
9
10
func AddMetadataTo(n *core.IpfsNode, skey string, m *ft.Metadata) (string, error) {
core/coreunix/metadata_test.go
+3
-3
@@ -15,11 +15,11 @@ import (
15
ft "github.com/ipfs/go-ipfs/unixfs"
16
uio "github.com/ipfs/go-ipfs/unixfs/io"
17
18
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
19
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
18
+ context "context"
19
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
20
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
21
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
22
dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
22
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
23
)
24
25
func getDagserv(t *testing.T) merkledag.DAGService {
core/mock/mock.go
+6
-6
@@ -3,7 +3,7 @@ package coremock
3
import (
4
"net"
5
6
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
6
+ context "context"
7
"gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
8
syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
9
@@ -13,11 +13,11 @@ import (
13
config "github.com/ipfs/go-ipfs/repo/config"
14
ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
15
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
16
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
17
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
18
- host "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/host"
19
- metrics "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/metrics"
20
- mocknet "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net/mock"
16
+ metrics "gx/ipfs/QmWpTXhTkpoCDEm9twJd5Rc9jFwy61emzxneeJzrVMfjGF/go-libp2p-metrics"
17
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
18
+ mocknet "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/net/mock"
19
+ host "gx/ipfs/QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki/go-libp2p-host"
20
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
21
)
22
23
// NewMockNode constructs an IpfsNode for use in tests.
core/pathresolver.go
+2
-2
@@ -4,11 +4,11 @@ import (
4
"errors"
5
"strings"
6
7
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7
+ context "context"
8
9
merkledag "github.com/ipfs/go-ipfs/merkledag"
10
path "github.com/ipfs/go-ipfs/path"
11
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
11
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
12
)
13
14
// ErrNoNamesys is an explicit error for when an IPFS node doesn't
diagnostics/diag.go
+6
-6
@@ -11,16 +11,16 @@ import (
11
"sync"
12
"time"
13
14
+ context "context"
15
pb "github.com/ipfs/go-ipfs/diagnostics/pb"
16
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
16
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
17
- ctxio "gx/ipfs/QmX6DhWrpBB5NtadXmPSXYNdVvuLfJXoFNMvUMoVvP5UJa/go-context/io"
17
+ ctxio "gx/ipfs/QmTKsRYeY4simJyf37K93juSq75Lo8MVCDJ7owjmf46u8W/go-context/io"
18
ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
19
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
20
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
21
- host "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/host"
22
- inet "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net"
23
- protocol "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/protocol"
20
+ protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
21
+ host "gx/ipfs/QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki/go-libp2p-host"
22
+ inet "gx/ipfs/QmdXimY9QHaasZmw6hWojWnCJvfgxETjZQfg9g6ZrA9wMX/go-libp2p-net"
23
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
24
)
25
26
var log = logging.Logger("diagnostics")
diagnostics/vis.go
+2
-2
@@ -5,8 +5,8 @@ import (
5
"fmt"
6
"io"
7
8
- rtable "gx/ipfs/QmVsCNFD32GzZ6Q5XD1TVGPRviNYqDdoNvgq853TU9hhzP/go-libp2p-kbucket"
9
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
8
+ rtable "gx/ipfs/QmUKePKcUEXwdvJENZJ6z8mJjPaxLsDZ3V9CZjPPtyawPm/go-libp2p-kbucket"
9
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
10
)
11
12
type node struct {
exchange/bitswap/bitswap.go
+6
-6
@@ -8,7 +8,7 @@ import (
8
"sync"
9
"time"
10
11
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
11
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
12
13
blocks "github.com/ipfs/go-ipfs/blocks"
14
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
@@ -19,13 +19,13 @@ import (
19
notifications "github.com/ipfs/go-ipfs/exchange/bitswap/notifications"
20
flags "github.com/ipfs/go-ipfs/flags"
21
"github.com/ipfs/go-ipfs/thirdparty/delay"
22
- loggables "gx/ipfs/QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7/go-libp2p-loggables"
22
+ loggables "gx/ipfs/QmTMy4hVSY28DdwJ9kBz6y7q6MuioFzPcpM3Ma3aPjo1i3/go-libp2p-loggables"
23
24
- process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
25
- procctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
24
+ context "context"
25
+ process "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
26
+ procctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
27
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
27
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
28
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
28
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
29
)
30
31
var log = logging.Logger("bitswap")
exchange/bitswap/bitswap_test.go
+4
-4
@@ -6,9 +6,9 @@ import (
6
"testing"
7
"time"
8
9
+ context "context"
10
detectrace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race"
11
travis "github.com/ipfs/go-ipfs/thirdparty/testutil/ci/travis"
11
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
13
blocks "github.com/ipfs/go-ipfs/blocks"
14
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
@@ -16,8 +16,8 @@ import (
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
- p2ptestutil "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/test/util"
20
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
19
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
20
+ p2ptestutil "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/test/util"
21
)
22
23
// FIXME the tests are really sensitive to the network delay. fix them to work
@@ -50,7 +50,7 @@ func TestProviderForKeyButNetworkCannotFind(t *testing.T) { // TODO revisit this
50
51
block := blocks.NewBlock([]byte("block"))
52
pinfo := p2ptestutil.RandTestBogusIdentityOrFatal(t)
53
- rs.Client(pinfo).Provide(context.Background(), block.Key()) // but not on network
53
+ rs.Client(pinfo).Provide(context.Background(), block.Cid()) // but not on network
54
55
solo := g.Next()
56
defer solo.Exchange.Close()
exchange/bitswap/decision/bench_test.go
+2
-2
@@ -6,8 +6,8 @@ import (
6
7
"github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
8
"github.com/ipfs/go-ipfs/thirdparty/testutil"
9
- "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
10
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
9
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
10
+ "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
11
)
12
13
// FWIW: At the time of this commit, including a timestamp in task increases
exchange/bitswap/decision/engine.go
+2
-2
@@ -5,13 +5,13 @@ import (
5
"sync"
6
"time"
7
8
+ context "context"
9
blocks "github.com/ipfs/go-ipfs/blocks"
10
bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
11
bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
12
wl "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
13
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
13
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
14
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
15
)
16
17
// TODO consider taking responsibility for other types of requests. For
exchange/bitswap/decision/engine_test.go
+2
-2
@@ -8,14 +8,14 @@ import (
8
"sync"
9
"testing"
10
11
+ context "context"
12
blocks "github.com/ipfs/go-ipfs/blocks"
13
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
14
message "github.com/ipfs/go-ipfs/exchange/bitswap/message"
15
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
15
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
16
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
17
dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
18
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
19
)
20
21
type peerAndEngine struct {
exchange/bitswap/decision/ledger.go
+2
-2
@@ -5,8 +5,8 @@ import (
5
"time"
6
7
wl "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
8
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
9
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
8
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
9
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
10
)
11
12
// keySet is just a convenient alias for maps of keys, where we only care
exchange/bitswap/decision/peer_request_queue.go
+2
-2
@@ -6,8 +6,8 @@ import (
6
7
wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
8
pq "github.com/ipfs/go-ipfs/thirdparty/pq"
9
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
10
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
9
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
10
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
11
)
12
13
type peerRequestQueue interface {
exchange/bitswap/decision/peer_request_queue_test.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
10
"github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
11
"github.com/ipfs/go-ipfs/thirdparty/testutil"
12
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
13
)
14
15
func TestPushPop(t *testing.T) {
exchange/bitswap/message/message.go
+2
-2
@@ -6,8 +6,8 @@ import (
6
blocks "github.com/ipfs/go-ipfs/blocks"
7
pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/pb"
8
wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
9
- inet "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net"
10
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
9
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
10
+ inet "gx/ipfs/QmdXimY9QHaasZmw6hWojWnCJvfgxETjZQfg9g6ZrA9wMX/go-libp2p-net"
11
12
ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
13
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
exchange/bitswap/message/message_test.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
9
blocks "github.com/ipfs/go-ipfs/blocks"
10
pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/pb"
11
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
11
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
12
)
13
14
func TestAppendWanted(t *testing.T) {
exchange/bitswap/network/interface.go
+4
-4
@@ -1,11 +1,11 @@
1
package network
2
3
import (
4
+ context "context"
5
bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
5
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
6
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7
- protocol "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/protocol"
8
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
6
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
7
+ protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
8
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
9
)
10
11
var ProtocolBitswap protocol.ID = "/ipfs/bitswap/1.0.0"
exchange/bitswap/network/ipfs_impl.go
+15
-10
@@ -1,20 +1,21 @@
1
package network
2
3
import (
4
+ "context"
5
"io"
6
7
bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
7
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
8
- routing "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing"
8
9
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
11
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
12
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
13
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
10
+ ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
11
+ routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
12
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
13
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
14
ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
15
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16
- host "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/host"
17
- inet "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net"
15
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
16
+ host "gx/ipfs/QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki/go-libp2p-host"
17
+ inet "gx/ipfs/QmdXimY9QHaasZmw6hWojWnCJvfgxETjZQfg9g6ZrA9wMX/go-libp2p-net"
18
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
19
)
20
21
var log = logging.Logger("bitswap_network")
@@ -146,9 +147,12 @@ func (bsnet *impl) FindProvidersAsync(ctx context.Context, k key.Key, max int) <
147
out <- id
148
}
149
150
+ // TEMPORARY SHIM UNTIL CID GETS PROPAGATED
151
+ c := cid.NewCidV0(k.ToMultihash())
152
+
153
go func() {
154
defer close(out)
151
- providers := bsnet.routing.FindProvidersAsync(ctx, k, max)
155
+ providers := bsnet.routing.FindProvidersAsync(ctx, c, max)
156
for info := range providers {
157
if info.ID == bsnet.host.ID() {
158
continue // ignore self as provider
@@ -166,7 +170,8 @@ func (bsnet *impl) FindProvidersAsync(ctx context.Context, k key.Key, max int) <
170
171
// Provide provides the key to the network
172
func (bsnet *impl) Provide(ctx context.Context, k key.Key) error {
169
- return bsnet.routing.Provide(ctx, k)
173
+ c := cid.NewCidV0(k.ToMultihash())
174
+ return bsnet.routing.Provide(ctx, c)
175
}
176
177
// handleNewStream receives a new stream from the network.
exchange/bitswap/notifications/notifications.go
+2
-2
@@ -1,10 +1,10 @@
1
package notifications
2
3
import (
4
+ context "context"
5
pubsub "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/briantigerchow/pubsub"
6
blocks "github.com/ipfs/go-ipfs/blocks"
6
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
7
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
8
)
9
10
const bufferSize = 16
exchange/bitswap/notifications/notifications_test.go
+2
-2
@@ -5,10 +5,10 @@ import (
5
"testing"
6
"time"
7
8
+ context "context"
9
blocks "github.com/ipfs/go-ipfs/blocks"
10
blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
10
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
11
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/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 "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
4
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
5
"sort"
6
)
7
exchange/bitswap/testnet/interface.go
+1
-1
@@ -3,7 +3,7 @@ package bitswap
3
import (
4
bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
5
"github.com/ipfs/go-ipfs/thirdparty/testutil"
6
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
6
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
7
)
8
9
type Network interface {
exchange/bitswap/testnet/network_test.go
+2
-2
@@ -4,14 +4,14 @@ import (
4
"sync"
5
"testing"
6
7
+ context "context"
8
blocks "github.com/ipfs/go-ipfs/blocks"
9
bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
10
bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
11
mockrouting "github.com/ipfs/go-ipfs/routing/mock"
12
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
13
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
13
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
14
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
15
)
16
17
func TestSendMessageAsyncButWaitForResponse(t *testing.T) {
exchange/bitswap/testnet/peernet.go
+3
-3
@@ -1,13 +1,13 @@
1
package bitswap
2
3
import (
4
+ context "context"
5
bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
6
mockrouting "github.com/ipfs/go-ipfs/routing/mock"
7
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
7
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
8
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9
- mockpeernet "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net/mock"
8
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
9
+ mockpeernet "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/net/mock"
10
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
11
)
12
13
type peernet struct {
exchange/bitswap/testnet/virtual.go
+9
-6
@@ -1,6 +1,7 @@
1
package bitswap
2
3
import (
4
+ "context"
5
"errors"
6
7
bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
@@ -8,10 +9,10 @@ import (
9
mockrouting "github.com/ipfs/go-ipfs/routing/mock"
10
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
11
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
11
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
12
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
14
- routing "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing"
12
+ routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
13
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
14
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
15
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
16
)
17
18
func VirtualNetwork(rs mockrouting.Server, d delay.D) Network {
@@ -98,10 +99,11 @@ func (nc *networkClient) FindProvidersAsync(ctx context.Context, k key.Key, max
99
// deprecated once the ipfsnet.Mock is added. The code below is only
100
// temporary.
101
102
+ c := cid.NewCidV0(k.ToMultihash())
103
out := make(chan peer.ID)
104
go func() {
105
defer close(out)
104
- providers := nc.routing.FindProvidersAsync(ctx, k, max)
106
+ providers := nc.routing.FindProvidersAsync(ctx, c, max)
107
for info := range providers {
108
select {
109
case <-ctx.Done():
@@ -138,7 +140,8 @@ func (n *networkClient) NewMessageSender(ctx context.Context, p peer.ID) (bsnet.
140
141
// Provide provides the key to the network
142
func (nc *networkClient) Provide(ctx context.Context, k key.Key) error {
141
- return nc.routing.Provide(ctx, k)
143
+ c := cid.NewCidV0(k.ToMultihash())
144
+ return nc.routing.Provide(ctx, c)
145
}
146
147
func (nc *networkClient) SetDelegate(r bsnet.Receiver) {
exchange/bitswap/testutils.go
+3
-3
@@ -3,16 +3,16 @@ package bitswap
3
import (
4
"time"
5
6
+ context "context"
7
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
8
tn "github.com/ipfs/go-ipfs/exchange/bitswap/testnet"
9
datastore2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
10
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
11
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
11
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
12
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
- p2ptestutil "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/test/util"
12
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
13
ds_sync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
14
+ p2ptestutil "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/test/util"
15
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
16
)
17
18
// WARNING: this uses RandTestBogusIdentity DO NOT USE for NON TESTS!
exchange/bitswap/wantlist/wantlist.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"sort"
7
"sync"
8
9
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
9
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
10
)
11
12
type ThreadSafe struct {
exchange/bitswap/wantmanager.go
+3
-3
@@ -4,13 +4,13 @@ import (
4
"sync"
5
"time"
6
7
+ context "context"
8
engine "github.com/ipfs/go-ipfs/exchange/bitswap/decision"
9
bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
10
bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
11
wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
11
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
12
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
13
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
14
)
15
16
type WantManager struct {
exchange/bitswap/workers.go
+5
-5
@@ -5,12 +5,12 @@ import (
5
"sync"
6
"time"
7
8
- process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
9
- procctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
8
+ context "context"
9
+ process "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
10
+ procctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
11
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
11
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
12
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
13
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
14
)
15
16
var TaskWorkerCount = 8
exchange/interface.go
+2
-2
@@ -5,9 +5,9 @@ import (
5
"io"
6
7
blocks "github.com/ipfs/go-ipfs/blocks"
8
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
8
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
9
10
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
+ context "context"
11
)
12
13
// Any type that implements exchange.Interface may be used as an IPFS block
exchange/offline/offline.go
+2
-2
@@ -6,9 +6,9 @@ import (
6
blocks "github.com/ipfs/go-ipfs/blocks"
7
"github.com/ipfs/go-ipfs/blocks/blockstore"
8
exchange "github.com/ipfs/go-ipfs/exchange"
9
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
9
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
10
11
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
+ context "context"
12
)
13
14
func Exchange(bs blockstore.Blockstore) exchange.Interface {
exchange/offline/offline_test.go
+2
-2
@@ -3,13 +3,13 @@ package offline
3
import (
4
"testing"
5
6
+ context "context"
7
blocks "github.com/ipfs/go-ipfs/blocks"
8
"github.com/ipfs/go-ipfs/blocks/blockstore"
9
"github.com/ipfs/go-ipfs/blocks/blocksutil"
9
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
11
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
12
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.go
+5
-3
@@ -1,14 +1,15 @@
1
package reprovide
2
3
import (
4
+ "context"
5
"fmt"
6
"time"
7
8
blocks "github.com/ipfs/go-ipfs/blocks/blockstore"
9
backoff "gx/ipfs/QmPJUtEJsm5YLUWhF6imvyCH8KZXRJa9Wup7FDMwTy5Ufz/backoff"
10
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
10
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
- routing "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing"
11
+ routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
12
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
13
)
14
15
var log = logging.Logger("reprovider")
@@ -53,8 +54,9 @@ func (rp *Reprovider) Reprovide(ctx context.Context) error {
54
return fmt.Errorf("Failed to get key chan from blockstore: %s", err)
55
}
56
for k := range keychan {
57
+ c := cid.NewCidV0(k.ToMultihash())
58
op := func() error {
57
- err := rp.rsys.Provide(ctx, k)
59
+ err := rp.rsys.Provide(ctx, c)
60
if err != nil {
61
log.Debugf("Failed to provide key: %s", err)
62
}
exchange/reprovide/reprovide_test.go
+2
-2
@@ -3,11 +3,11 @@ package reprovide_test
3
import (
4
"testing"
5
6
+ context "context"
7
blocks "github.com/ipfs/go-ipfs/blocks"
8
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
9
mock "github.com/ipfs/go-ipfs/routing/mock"
10
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
10
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
12
dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
13
@@ -37,7 +37,7 @@ func TestReprovide(t *testing.T) {
37
t.Fatal(err)
38
}
39
40
- provs, err := clB.FindProviders(ctx, blk.Key())
40
+ provs, err := clB.FindProviders(ctx, blk.Cid())
41
if err != nil {
42
t.Fatal(err)
43
}
fuse/ipns/common.go
+2
-2
@@ -1,13 +1,13 @@
1
package ipns
2
3
import (
4
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
4
+ context "context"
5
6
"github.com/ipfs/go-ipfs/core"
7
nsys "github.com/ipfs/go-ipfs/namesys"
8
path "github.com/ipfs/go-ipfs/path"
9
ft "github.com/ipfs/go-ipfs/unixfs"
10
- ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
10
+ ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
11
)
12
13
// InitializeKeyspace sets the ipns record for the given key to
fuse/ipns/ipns_test.go
+2
-2
@@ -14,12 +14,12 @@ import (
14
fstest "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
15
racedet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race"
16
17
+ context "context"
18
core "github.com/ipfs/go-ipfs/core"
19
namesys "github.com/ipfs/go-ipfs/namesys"
20
offroute "github.com/ipfs/go-ipfs/routing/offline"
21
ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci"
21
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
22
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
22
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
23
)
24
25
func maybeSkipFuseTests(t *testing.T) {
fuse/ipns/ipns_unix.go
+4
-4
@@ -9,19 +9,19 @@ import (
9
"fmt"
10
"os"
11
12
+ "context"
13
fuse "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
14
fs "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
15
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
15
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16
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"
22
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
23
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
24
+ ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
25
)
26
27
func init() {
fuse/ipns/link_unix.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
8
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
9
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
10
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
+ "context"
11
)
12
13
type Link struct {
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
fuse/node/mount_test.go
+1
-1
@@ -15,7 +15,7 @@ import (
15
namesys "github.com/ipfs/go-ipfs/namesys"
16
offroute "github.com/ipfs/go-ipfs/routing/offline"
17
ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci"
18
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
18
+ context "context"
19
)
20
21
func maybeSkipFuseTests(t *testing.T) {
fuse/readonly/ipfs_test.go
+2
-2
@@ -23,8 +23,8 @@ import (
23
uio "github.com/ipfs/go-ipfs/unixfs/io"
24
25
fstest "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
26
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
27
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
26
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
27
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
28
)
29
30
func maybeSkipFuseTests(t *testing.T) {
fuse/readonly/readonly_unix.go
+2
-2
@@ -9,9 +9,9 @@ import (
9
"os"
10
"syscall"
11
12
+ "context"
13
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
14
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
14
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15
16
fuse "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
17
fs "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
@@ -20,7 +20,7 @@ import (
20
path "github.com/ipfs/go-ipfs/path"
21
uio "github.com/ipfs/go-ipfs/unixfs/io"
22
ftpb "github.com/ipfs/go-ipfs/unixfs/pb"
23
- lgbl "gx/ipfs/QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7/go-libp2p-loggables"
23
+ lgbl "gx/ipfs/QmTMy4hVSY28DdwJ9kBz6y7q6MuioFzPcpM3Ma3aPjo1i3/go-libp2p-loggables"
24
)
25
26
var log = logging.Logger("fuse/ipfs")
importer/balanced/balanced_test.go
+2
-2
@@ -16,8 +16,8 @@ import (
16
pin "github.com/ipfs/go-ipfs/pin"
17
uio "github.com/ipfs/go-ipfs/unixfs/io"
18
19
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
20
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19
+ "context"
20
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
21
)
22
23
// TODO: extract these tests and more as a generic layout test suite
importer/chunk/rabin_test.go
+2
-2
@@ -4,8 +4,8 @@ import (
4
"bytes"
5
"fmt"
6
"github.com/ipfs/go-ipfs/blocks"
7
- "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
8
- "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
7
+ "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
8
+ "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
9
"io"
10
"testing"
11
)
importer/chunk/splitting_test.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"io"
6
"testing"
7
8
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
8
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
9
)
10
11
func randBuf(t *testing.T, size int) []byte {
importer/helpers/helpers.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
chunk "github.com/ipfs/go-ipfs/importer/chunk"
7
dag "github.com/ipfs/go-ipfs/merkledag"
8
ft "github.com/ipfs/go-ipfs/unixfs"
9
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9
+ "context"
10
)
11
12
// BlockSizeLimit specifies the maximum size an imported block can have.
importer/importer_test.go
+2
-2
@@ -6,12 +6,12 @@ import (
6
"io/ioutil"
7
"testing"
8
9
+ context "context"
10
chunk "github.com/ipfs/go-ipfs/importer/chunk"
11
dag "github.com/ipfs/go-ipfs/merkledag"
12
mdtest "github.com/ipfs/go-ipfs/merkledag/test"
13
uio "github.com/ipfs/go-ipfs/unixfs/io"
13
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
14
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
15
)
16
17
func getBalancedDag(t testing.TB, size int64, blksize int64) (*dag.Node, dag.DAGService) {
importer/trickle/trickle_test.go
+2
-2
@@ -9,6 +9,7 @@ import (
9
"os"
10
"testing"
11
12
+ "context"
13
chunk "github.com/ipfs/go-ipfs/importer/chunk"
14
h "github.com/ipfs/go-ipfs/importer/helpers"
15
merkledag "github.com/ipfs/go-ipfs/merkledag"
@@ -16,8 +17,7 @@ import (
17
pin "github.com/ipfs/go-ipfs/pin"
18
ft "github.com/ipfs/go-ipfs/unixfs"
19
uio "github.com/ipfs/go-ipfs/unixfs/io"
19
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
20
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
20
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
21
)
22
23
func buildTestDag(ds merkledag.DAGService, spl chunk.Splitter) (*merkledag.Node, error) {
importer/trickle/trickledag.go
+1
-1
@@ -3,7 +3,7 @@ package trickle
3
import (
4
"errors"
5
6
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
6
+ context "context"
7
8
h "github.com/ipfs/go-ipfs/importer/helpers"
9
dag "github.com/ipfs/go-ipfs/merkledag"
merkledag/coding.go
+3
-3
@@ -6,9 +6,9 @@ import (
6
7
pb "github.com/ipfs/go-ipfs/merkledag/pb"
8
9
- mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
10
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
11
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
9
+ mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash"
10
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
11
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
12
)
13
14
// for now, we use a PBNode intermediate thing.
merkledag/merkledag.go
+3
-3
@@ -7,11 +7,11 @@ import (
7
"sync"
8
9
bserv "github.com/ipfs/go-ipfs/blockservice"
10
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
10
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
11
12
+ "context"
13
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
13
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
14
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
15
)
16
17
var log = logging.Logger("merkledag")
merkledag/merkledag_test.go
+4
-4
@@ -19,11 +19,11 @@ 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"
22
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
23
24
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
25
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
26
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
24
+ "context"
25
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
26
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
27
)
28
29
func TestNode(t *testing.T) {
merkledag/node.go
+4
-4
@@ -3,11 +3,11 @@ package merkledag
3
import (
4
"fmt"
5
6
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
6
+ "context"
7
8
- mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
9
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
10
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
8
+ mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash"
9
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
10
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
11
)
12
13
var ErrLinkNotFound = fmt.Errorf("no link by that name")
merkledag/node_test.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
. "github.com/ipfs/go-ipfs/merkledag"
7
mdtest "github.com/ipfs/go-ipfs/merkledag/test"
8
9
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9
+ "context"
10
)
11
12
func TestRemoveLink(t *testing.T) {
merkledag/traverse/traverse.go
+1
-1
@@ -4,7 +4,7 @@ package traverse
4
import (
5
"errors"
6
7
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7
+ "context"
8
9
mdag "github.com/ipfs/go-ipfs/merkledag"
10
)
merkledag/utils/diff.go
+2
-2
@@ -7,8 +7,8 @@ import (
7
8
dag "github.com/ipfs/go-ipfs/merkledag"
9
10
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
10
+ context "context"
11
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
12
)
13
14
const (
merkledag/utils/utils.go
+1
-1
@@ -3,7 +3,7 @@ package dagutils
3
import (
4
"errors"
5
6
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
6
+ context "context"
7
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
8
syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
9
merkledag/utils/utils_test.go
+2
-2
@@ -7,8 +7,8 @@ import (
7
mdtest "github.com/ipfs/go-ipfs/merkledag/test"
8
path "github.com/ipfs/go-ipfs/path"
9
10
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
10
+ context "context"
11
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
12
)
13
14
func TestAddLink(t *testing.T) {
mfs/dir.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
"sync"
10
"time"
11
12
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
+ context "context"
13
14
dag "github.com/ipfs/go-ipfs/merkledag"
15
ft "github.com/ipfs/go-ipfs/unixfs"
mfs/fd.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
7
mod "github.com/ipfs/go-ipfs/unixfs/mod"
8
9
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9
+ context "context"
10
)
11
12
type FileDescriptor interface {
mfs/file.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
ft "github.com/ipfs/go-ipfs/unixfs"
10
mod "github.com/ipfs/go-ipfs/unixfs/mod"
11
12
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
+ context "context"
13
)
14
15
type File struct {
mfs/mfs_test.go
+3
-3
@@ -23,11 +23,11 @@ import (
23
ft "github.com/ipfs/go-ipfs/unixfs"
24
uio "github.com/ipfs/go-ipfs/unixfs/io"
25
26
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
27
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
26
+ "context"
27
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
28
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
29
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
30
dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
30
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
31
)
32
33
func emptyDirNode() *dag.Node {
mfs/repub_test.go
+2
-2
@@ -6,8 +6,8 @@ import (
6
7
ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci"
8
9
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
9
+ "context"
10
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
11
)
12
13
func TestRepublisher(t *testing.T) {
mfs/system.go
+2
-2
@@ -17,9 +17,9 @@ import (
17
dag "github.com/ipfs/go-ipfs/merkledag"
18
ft "github.com/ipfs/go-ipfs/unixfs"
19
20
+ context "context"
21
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
21
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
22
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
22
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
23
)
24
25
var ErrNotExist = errors.New("no such rootfs")
namesys/base.go
+1
-1
@@ -3,7 +3,7 @@ package namesys
3
import (
4
"strings"
5
6
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
6
+ context "context"
7
8
path "github.com/ipfs/go-ipfs/path"
9
)
namesys/dns.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"net"
6
"strings"
7
8
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
8
+ context "context"
9
isd "gx/ipfs/QmaeHSCBd9XjXxmgHEiKkHtLcMCb2eZsPLKT7bHgBfBkqw/go-is-domain"
10
11
path "github.com/ipfs/go-ipfs/path"
namesys/interface.go
+2
-2
@@ -33,9 +33,9 @@ import (
33
"errors"
34
"time"
35
36
+ context "context"
37
path "github.com/ipfs/go-ipfs/path"
37
- ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
38
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
38
+ ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
39
)
40
41
const (
namesys/ipns_select_test.go
+2
-2
@@ -10,8 +10,8 @@ import (
10
11
pb "github.com/ipfs/go-ipfs/namesys/pb"
12
path "github.com/ipfs/go-ipfs/path"
13
- ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
14
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
13
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
14
+ ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
15
)
16
17
func shuffle(a []*pb.IpnsEntry) {
namesys/namesys.go
+3
-3
@@ -4,11 +4,11 @@ import (
4
"strings"
5
"time"
6
7
+ context "context"
8
path "github.com/ipfs/go-ipfs/path"
8
- ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
9
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9
+ routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
10
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
11
- routing "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing"
11
+ ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
12
)
13
14
// mpns (a multi-protocol NameSystem) implements generic IPFS naming.
namesys/namesys_test.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"fmt"
5
"testing"
6
7
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7
+ context "context"
8
9
path "github.com/ipfs/go-ipfs/path"
10
)
namesys/proquint.go
+1
-1
@@ -3,9 +3,9 @@ package namesys
3
import (
4
"errors"
5
6
+ context "context"
7
path "github.com/ipfs/go-ipfs/path"
8
proquint "gx/ipfs/QmYnf27kzqR2cxt6LFZdrAFJuQd6785fTkBvMuEj9EeRxM/proquint"
8
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9
)
10
11
type ProquintResolver struct{}
namesys/publisher.go
+17
-17
@@ -2,6 +2,7 @@ package namesys
2
3
import (
4
"bytes"
5
+ "context"
6
"errors"
7
"fmt"
8
"time"
@@ -10,18 +11,17 @@ import (
11
pb "github.com/ipfs/go-ipfs/namesys/pb"
12
path "github.com/ipfs/go-ipfs/path"
13
pin "github.com/ipfs/go-ipfs/pin"
14
+ dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
15
ft "github.com/ipfs/go-ipfs/unixfs"
16
15
- ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
16
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
17
+ routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
18
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
18
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
19
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
20
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
21
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
22
- record "gx/ipfs/Qme7D9iKHYxwq28p6PzCymywsYSRBx9uyGzW7qNB3s9VbC/go-libp2p-record"
23
- dhtpb "gx/ipfs/Qme7D9iKHYxwq28p6PzCymywsYSRBx9uyGzW7qNB3s9VbC/go-libp2p-record/pb"
24
- routing "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing"
21
+ record "gx/ipfs/QmdM4ohF7cr4MvAECVeD3hRA3HtZrk1ngaek4n8ojVT87h/go-libp2p-record"
22
+ dhtpb "gx/ipfs/QmdM4ohF7cr4MvAECVeD3hRA3HtZrk1ngaek4n8ojVT87h/go-libp2p-record/pb"
23
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
24
+ ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
25
)
26
27
// ErrExpiredRecord should be returned when an ipns record is
@@ -79,8 +79,8 @@ func (p *ipnsPublisher) PublishWithEOL(ctx context.Context, k ci.PrivKey, value
79
return PutRecordToRouting(ctx, k, value, seqnum, eol, p.routing, id)
80
}
81
82
-func (p *ipnsPublisher) getPreviousSeqNo(ctx context.Context, ipnskey key.Key) (uint64, error) {
83
- prevrec, err := p.ds.Get(ipnskey.DsKey())
82
+func (p *ipnsPublisher) getPreviousSeqNo(ctx context.Context, ipnskey string) (uint64, error) {
83
+ prevrec, err := p.ds.Get(dshelp.NewKeyFromBinary(ipnskey))
84
if err != nil && err != ds.ErrNotFound {
85
// None found, lets start at zero!
86
return 0, err
@@ -181,7 +181,7 @@ func waitOnErrChan(ctx context.Context, errs chan error) error {
181
}
182
}
183
184
-func PublishPublicKey(ctx context.Context, r routing.ValueStore, k key.Key, pubk ci.PubKey) error {
184
+func PublishPublicKey(ctx context.Context, r routing.ValueStore, k string, pubk ci.PubKey) error {
185
log.Debugf("Storing pubkey at: %s", k)
186
pkbytes, err := pubk.Bytes()
187
if err != nil {
@@ -199,7 +199,7 @@ func PublishPublicKey(ctx context.Context, r routing.ValueStore, k key.Key, pubk
199
return nil
200
}
201
202
-func PublishEntry(ctx context.Context, r routing.ValueStore, ipnskey key.Key, rec *pb.IpnsEntry) error {
202
+func PublishEntry(ctx context.Context, r routing.ValueStore, ipnskey string, rec *pb.IpnsEntry) error {
203
timectx, cancel := context.WithTimeout(ctx, PublishPutValTimeout)
204
defer cancel()
205
@@ -248,7 +248,7 @@ var IpnsRecordValidator = &record.ValidChecker{
248
Sign: true,
249
}
250
251
-func IpnsSelectorFunc(k key.Key, vals [][]byte) (int, error) {
251
+func IpnsSelectorFunc(k string, vals [][]byte) (int, error) {
252
var recs []*pb.IpnsEntry
253
for _, v := range vals {
254
e := new(pb.IpnsEntry)
@@ -304,7 +304,7 @@ func selectRecord(recs []*pb.IpnsEntry, vals [][]byte) (int, error) {
304
305
// ValidateIpnsRecord implements ValidatorFunc and verifies that the
306
// given 'val' is an IpnsEntry and that that entry is valid.
307
-func ValidateIpnsRecord(k key.Key, val []byte) error {
307
+func ValidateIpnsRecord(k string, val []byte) error {
308
entry := new(pb.IpnsEntry)
309
err := proto.Unmarshal(val, entry)
310
if err != nil {
@@ -356,9 +356,9 @@ func InitializeKeyspace(ctx context.Context, ds dag.DAGService, pub Publisher, p
356
return nil
357
}
358
359
-func IpnsKeysForID(id peer.ID) (name, ipns key.Key) {
360
- namekey := key.Key("/pk/" + id)
361
- ipnskey := key.Key("/ipns/" + id)
359
+func IpnsKeysForID(id peer.ID) (name, ipns string) {
360
+ namekey := "/pk/" + string(id)
361
+ ipnskey := "/ipns/" + string(id)
362
363
return namekey, ipnskey
364
}
namesys/republisher/repub.go
+10
-10
@@ -1,6 +1,7 @@
1
package republisher
2
3
import (
4
+ "context"
5
"errors"
6
"sync"
7
"time"
@@ -8,18 +9,17 @@ import (
9
namesys "github.com/ipfs/go-ipfs/namesys"
10
pb "github.com/ipfs/go-ipfs/namesys/pb"
11
path "github.com/ipfs/go-ipfs/path"
12
+ dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
13
12
- goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
13
- gpctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
14
+ goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
15
+ gpctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
16
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
15
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
16
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
17
+ routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
18
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
19
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
18
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
20
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
20
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
21
- recpb "gx/ipfs/Qme7D9iKHYxwq28p6PzCymywsYSRBx9uyGzW7qNB3s9VbC/go-libp2p-record/pb"
22
- routing "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing"
21
+ recpb "gx/ipfs/QmdM4ohF7cr4MvAECVeD3hRA3HtZrk1ngaek4n8ojVT87h/go-libp2p-record/pb"
22
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
23
)
24
25
var errNoEntry = errors.New("no previous entry")
@@ -107,8 +107,8 @@ func (rp *Republisher) republishEntries(p goprocess.Process) error {
107
return nil
108
}
109
110
-func (rp *Republisher) getLastVal(k key.Key) (path.Path, uint64, error) {
111
- ival, err := rp.ds.Get(k.DsKey())
110
+func (rp *Republisher) getLastVal(k string) (path.Path, uint64, error) {
111
+ ival, err := rp.ds.Get(dshelp.NewKeyFromBinary(k))
112
if err != nil {
113
// not found means we dont have a previously published entry
114
return "", 0, errNoEntry
namesys/republisher/repub_test.go
+4
-4
@@ -5,16 +5,16 @@ import (
5
"testing"
6
"time"
7
8
- goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
9
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
8
+ context "context"
9
+ goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
10
11
"github.com/ipfs/go-ipfs/core"
12
mock "github.com/ipfs/go-ipfs/core/mock"
13
namesys "github.com/ipfs/go-ipfs/namesys"
14
. "github.com/ipfs/go-ipfs/namesys/republisher"
15
path "github.com/ipfs/go-ipfs/path"
16
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
17
- mocknet "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net/mock"
16
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
17
+ mocknet "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/net/mock"
18
)
19
20
func TestRepublish(t *testing.T) {
namesys/resolve_test.go
+4
-4
@@ -5,15 +5,15 @@ import (
5
"testing"
6
"time"
7
8
+ context "context"
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"
11
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
12
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
13
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
13
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
14
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
15
dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
16
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
16
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
17
)
18
19
func TestRoutingResolve(t *testing.T) {
namesys/routing.go
+8
-8
@@ -5,20 +5,20 @@ import (
5
"strings"
6
"time"
7
8
+ "context"
9
lru "gx/ipfs/QmVYxfoJQiZijTgPNHCHgHELvQpbsJNTg6Crmc3dQkj3yy/golang-lru"
9
- mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
10
+ mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash"
11
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
11
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
13
pb "github.com/ipfs/go-ipfs/namesys/pb"
14
path "github.com/ipfs/go-ipfs/path"
15
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
16
- routing "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing"
15
+ routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
16
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
17
18
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
19
- ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
20
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
21
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
19
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
20
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
21
+ ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
22
)
23
24
var log = logging.Logger("namesys")
@@ -142,7 +142,7 @@ func (r *routingResolver) resolveOnce(ctx context.Context, name string) (path.Pa
142
143
resp := make(chan error, 2)
144
go func() {
145
- ipnsKey := key.Key(h)
145
+ ipnsKey := string(h)
146
val, err := r.routing.GetValue(ctx, ipnsKey)
147
if err != nil {
148
log.Warning("RoutingResolve get failed.")
package.json
+28
-28
@@ -14,21 +14,21 @@
14
},
15
{
16
"author": "whyrusleeping",
17
- "hash": "QmbnPJidHfeekkdLkoboBooA56KB92cT8csDmJwCc2bQJ1",
17
+ "hash": "QmfDU2uJQkxXP6nDTfSPSx4rQt4S4fU4XMRoQA5DzYGWfe",
18
"name": "go-libp2p-secio",
19
- "version": "1.0.12"
19
+ "version": "1.1.0"
20
},
21
{
22
"author": "whyrusleeping",
23
- "hash": "QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ",
23
+ "hash": "QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46",
24
"name": "go-libp2p-crypto",
25
- "version": "1.0.4"
25
+ "version": "1.3.1"
26
},
27
{
28
"author": "whyrusleeping",
29
- "hash": "QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p",
29
+ "hash": "QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC",
30
"name": "go-libp2p-peer",
31
- "version": "2.0.4"
31
+ "version": "2.1.0"
32
},
33
{
34
"hash": "QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt",
@@ -52,14 +52,14 @@
52
"version": "0.1.0"
53
},
54
{
55
- "hash": "QmPxBCkNrrtx5cmg62TxiE3JUM2zTqTpps3diQ9PgNrcgn",
55
+ "hash": "QmQF3y5N5RcMaGUbSunmbnjhaFHP7uGDismvngkn8HJ1Xa",
56
"name": "iptb",
57
- "version": "1.1.0"
57
+ "version": "1.1.1"
58
},
59
{
60
- "hash": "QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku",
60
+ "hash": "QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J",
61
"name": "go-multihash",
62
- "version": "0.0.0"
62
+ "version": "1.0.0"
63
},
64
{
65
"author": "satori",
@@ -93,9 +93,9 @@
93
},
94
{
95
"author": "jbenet",
96
- "hash": "QmX6DhWrpBB5NtadXmPSXYNdVvuLfJXoFNMvUMoVvP5UJa",
96
+ "hash": "QmTKsRYeY4simJyf37K93juSq75Lo8MVCDJ7owjmf46u8W",
97
"name": "go-context",
98
- "version": "0.0.0"
98
+ "version": "1.0.0"
99
},
100
{
101
"author": "rs",
@@ -159,9 +159,9 @@
159
},
160
{
161
"author": "whyrusleeping",
162
- "hash": "QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD",
162
+ "hash": "QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo",
163
"name": "go-libp2p-peerstore",
164
- "version": "1.2.5"
164
+ "version": "1.3.0"
165
},
166
{
167
"author": "whyrusleeping",
@@ -201,21 +201,21 @@
201
},
202
{
203
"author": "whyrusleeping",
204
- "hash": "QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN",
204
+ "hash": "QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum",
205
"name": "go-libp2p",
206
- "version": "3.5.4"
206
+ "version": "4.0.1"
207
},
208
{
209
"author": "whyrusleeping",
210
- "hash": "QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp",
210
+ "hash": "QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro",
211
"name": "go-cid",
212
- "version": "0.1.0"
212
+ "version": "0.5.2"
213
},
214
{
215
"author": "whyrusleeping",
216
- "hash": "Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew",
216
+ "hash": "QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9",
217
"name": "go-key",
218
- "version": "1.0.2"
218
+ "version": "1.0.3"
219
},
220
{
221
"author": "whyrusleeping",
@@ -237,9 +237,9 @@
237
},
238
{
239
"author": "whyrusleeping",
240
- "hash": "QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7",
240
+ "hash": "QmTMy4hVSY28DdwJ9kBz6y7q6MuioFzPcpM3Ma3aPjo1i3",
241
"name": "go-libp2p-loggables",
242
- "version": "1.0.11"
242
+ "version": "1.1.1"
243
},
244
{
245
"author": "ipfs",
@@ -254,21 +254,21 @@
254
"version": "0.1.2"
255
},
256
{
257
- "hash": "QmXVWh4XWRaRGdcGeFtBp3hx7H3mzYgVRpVN7LwtTaYv2E",
257
+ "hash": "QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo",
258
"name": "go-libp2p-kad-dht",
259
- "version": "1.2.0"
259
+ "version": "2.1.0"
260
},
261
{
262
"author": "whyrusleeping",
263
- "hash": "QmdCL8M8DXJdSRnwhpDhukX5r8ydjxnzPJpaKrFudDA8yn",
263
+ "hash": "QmPRYAPKG9MhfJLrDT659SGhBsY7V7zHq84cngi8EHudHQ",
264
"name": "hang-fds",
265
- "version": "0.0.0"
265
+ "version": "0.0.2"
266
},
267
{
268
"author": "whyrusleeping",
269
- "hash": "QmaUewj1HPiCX5mjNHmevQiNWr4eeAn7HBfHcGVbRyafdo",
269
+ "hash": "QmTgcWwxttM74AY7UYA6qMP9WpzfBEjbZntx7ZWLttRMJJ",
270
"name": "floodsub",
271
- "version": "0.6.2"
271
+ "version": "0.7.0"
272
}
273
],
274
"gxVersion": "0.4.0",
path/path.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"path"
6
"strings"
7
8
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
8
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
9
)
10
11
// ErrBadPath is returned when a given path is incorrectly formatted
path/resolver.go
+3
-3
@@ -6,12 +6,12 @@ import (
6
"fmt"
7
"time"
8
9
- mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
10
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9
+ "context"
10
+ mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash"
11
12
merkledag "github.com/ipfs/go-ipfs/merkledag"
13
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
14
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
14
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
15
)
16
17
var log = logging.Logger("path")
path/resolver_test.go
+3
-3
@@ -4,13 +4,13 @@ import (
4
"fmt"
5
"testing"
6
7
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7
+ context "context"
8
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"
12
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
13
+ util "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
14
)
15
16
func randNode() (*merkledag.Node, key.Key) {
pin/gc/gc.go
+3
-3
@@ -6,11 +6,11 @@ import (
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"
9
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
10
11
+ context "context"
12
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
12
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
13
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
14
)
15
16
var log = logging.Logger("gc")
pin/indirect.go
+1
-1
@@ -1,7 +1,7 @@
1
package pin
2
3
import (
4
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
4
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
5
)
6
7
type indirectPin struct {
pin/pin.go
+3
-3
@@ -9,12 +9,12 @@ import (
9
"time"
10
11
mdag "github.com/ipfs/go-ipfs/merkledag"
12
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
13
14
+ context "context"
15
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
15
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
17
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
17
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
18
)
19
20
var log = logging.Logger("pin")
pin/pin_test.go
+3
-3
@@ -9,11 +9,11 @@ import (
9
"github.com/ipfs/go-ipfs/exchange/offline"
10
mdag "github.com/ipfs/go-ipfs/merkledag"
11
12
- "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
13
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
+ context "context"
13
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
14
+ "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
15
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
16
dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
16
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
17
)
18
19
func randNode() (*mdag.Node, *cid.Cid) {
pin/set.go
+3
-3
@@ -10,12 +10,12 @@ import (
10
"sort"
11
"unsafe"
12
13
+ "context"
14
"github.com/ipfs/go-ipfs/merkledag"
15
"github.com/ipfs/go-ipfs/pin/internal/pb"
16
+ "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
17
"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"
18
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
19
)
20
21
const (
pin/set_test.go
+1
-1
@@ -1,6 +1,6 @@
1
package pin
2
3
-import "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
3
+import "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
4
5
func ignoreKeys(key.Key) {}
6
repo/config/identity.go
+1
-1
@@ -2,7 +2,7 @@ package config
2
3
import (
4
"encoding/base64"
5
- ic "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
5
+ ic "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
6
)
7
8
const IdentityTag = "Identity"
repo/config/init.go
+2
-2
@@ -6,8 +6,8 @@ import (
6
"fmt"
7
"io"
8
9
- ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
10
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
9
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
10
+ ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
11
)
12
13
func Init(out io.Writer, nBitsForKeypair int) (*Config, error) {
repo/fsrepo/fsrepo.go
+1
-1
@@ -19,7 +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/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
22
- util "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
22
+ util "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
23
"gx/ipfs/QmeqtHtxGfcsfXiou7wqHJARWPKUTUcPdtSfSYYHp48dtQ/go-ds-measure"
24
)
25
repo/fsrepo/lock/lock.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
11
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
12
lock "gx/ipfs/QmWi28zbQG6B1xfaaWx5cYoLn3kBFU6pQ6GWQNRV5P6dNe/lock"
13
- "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
13
+ "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
14
)
15
16
// LockFile is the filename of the repo lock, relative to config dir
repo/fsrepo/serialize/serialize.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
11
"github.com/ipfs/go-ipfs/repo/config"
12
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
13
- "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
13
+ "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
14
"gx/ipfs/QmdYwCmx8pZRkzdcd8MhmLJqYVoVTC1aGsy5Q4reMGLNLg/atomicfile"
15
)
16
routing/mock/centralized_client.go
+17
-16
@@ -1,22 +1,23 @@
1
package mockrouting
2
3
import (
4
+ "context"
5
"errors"
6
"time"
7
8
+ dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
9
"github.com/ipfs/go-ipfs/thirdparty/testutil"
10
11
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
10
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
11
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
12
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
12
+ ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
13
+ routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
14
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
15
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
14
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
15
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
17
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
18
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
17
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
18
- dhtpb "gx/ipfs/Qme7D9iKHYxwq28p6PzCymywsYSRBx9uyGzW7qNB3s9VbC/go-libp2p-record/pb"
19
- routing "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing"
19
+ dhtpb "gx/ipfs/QmdM4ohF7cr4MvAECVeD3hRA3HtZrk1ngaek4n8ojVT87h/go-libp2p-record/pb"
20
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
21
)
22
23
var log = logging.Logger("mockrouter")
@@ -28,7 +29,7 @@ type client struct {
29
}
30
31
// FIXME(brian): is this method meant to simulate putting a value into the network?
31
-func (c *client) PutValue(ctx context.Context, key key.Key, val []byte) error {
32
+func (c *client) PutValue(ctx context.Context, key string, val []byte) error {
33
log.Debugf("PutValue: %s", key)
34
rec := new(dhtpb.Record)
35
rec.Value = val
@@ -39,13 +40,13 @@ func (c *client) PutValue(ctx context.Context, key key.Key, val []byte) error {
40
return err
41
}
42
42
- return c.datastore.Put(key.DsKey(), data)
43
+ return c.datastore.Put(dshelp.NewKeyFromBinary(key), data)
44
}
45
46
// FIXME(brian): is this method meant to simulate getting a value from the network?
46
-func (c *client) GetValue(ctx context.Context, key key.Key) ([]byte, error) {
47
+func (c *client) GetValue(ctx context.Context, key string) ([]byte, error) {
48
log.Debugf("GetValue: %s", key)
48
- v, err := c.datastore.Get(key.DsKey())
49
+ v, err := c.datastore.Get(dshelp.NewKeyFromBinary(key))
50
if err != nil {
51
return nil, err
52
}
@@ -64,7 +65,7 @@ func (c *client) GetValue(ctx context.Context, key key.Key) ([]byte, error) {
65
return rec.GetValue(), nil
66
}
67
67
-func (c *client) GetValues(ctx context.Context, key key.Key, count int) ([]routing.RecvdVal, error) {
68
+func (c *client) GetValues(ctx context.Context, key string, count int) ([]routing.RecvdVal, error) {
69
log.Debugf("GetValues: %s", key)
70
data, err := c.GetValue(ctx, key)
71
if err != nil {
@@ -74,7 +75,7 @@ func (c *client) GetValues(ctx context.Context, key key.Key, count int) ([]routi
75
return []routing.RecvdVal{{Val: data, From: c.peer.ID()}}, nil
76
}
77
77
-func (c *client) FindProviders(ctx context.Context, key key.Key) ([]pstore.PeerInfo, error) {
78
+func (c *client) FindProviders(ctx context.Context, key *cid.Cid) ([]pstore.PeerInfo, error) {
79
return c.server.Providers(key), nil
80
}
81
@@ -83,7 +84,7 @@ func (c *client) FindPeer(ctx context.Context, pid peer.ID) (pstore.PeerInfo, er
84
return pstore.PeerInfo{}, nil
85
}
86
86
-func (c *client) FindProvidersAsync(ctx context.Context, k key.Key, max int) <-chan pstore.PeerInfo {
87
+func (c *client) FindProvidersAsync(ctx context.Context, k *cid.Cid, max int) <-chan pstore.PeerInfo {
88
out := make(chan pstore.PeerInfo)
89
go func() {
90
defer close(out)
@@ -103,7 +104,7 @@ func (c *client) FindProvidersAsync(ctx context.Context, k key.Key, max int) <-c
104
105
// Provide returns once the message is on the network. Value is not necessarily
106
// visible yet.
106
-func (c *client) Provide(_ context.Context, key key.Key) error {
107
+func (c *client) Provide(_ context.Context, key *cid.Cid) error {
108
info := pstore.PeerInfo{
109
ID: c.peer.ID(),
110
Addrs: []ma.Multiaddr{c.peer.Address()},
routing/mock/centralized_server.go
+13
-10
@@ -1,24 +1,24 @@
1
package mockrouting
2
3
import (
4
+ "context"
5
"math/rand"
6
"sync"
7
"time"
8
9
"github.com/ipfs/go-ipfs/thirdparty/testutil"
10
+
11
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
12
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
13
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
14
dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
11
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
12
-
13
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
14
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
15
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
16
)
17
18
// server is the mockrouting.Client's private interface to the routing server
19
type server interface {
20
- Announce(pstore.PeerInfo, key.Key) error
21
- Providers(key.Key) []pstore.PeerInfo
20
+ Announce(pstore.PeerInfo, *cid.Cid) error
21
+ Providers(*cid.Cid) []pstore.PeerInfo
22
23
Server
24
}
@@ -28,7 +28,7 @@ type s struct {
28
delayConf DelayConfig
29
30
lock sync.RWMutex
31
- providers map[key.Key]map[peer.ID]providerRecord
31
+ providers map[string]map[peer.ID]providerRecord
32
}
33
34
type providerRecord struct {
@@ -36,10 +36,12 @@ type providerRecord struct {
36
Created time.Time
37
}
38
39
-func (rs *s) Announce(p pstore.PeerInfo, k key.Key) error {
39
+func (rs *s) Announce(p pstore.PeerInfo, c *cid.Cid) error {
40
rs.lock.Lock()
41
defer rs.lock.Unlock()
42
43
+ k := c.KeyString()
44
+
45
_, ok := rs.providers[k]
46
if !ok {
47
rs.providers[k] = make(map[peer.ID]providerRecord)
@@ -51,11 +53,12 @@ func (rs *s) Announce(p pstore.PeerInfo, k key.Key) error {
53
return nil
54
}
55
54
-func (rs *s) Providers(k key.Key) []pstore.PeerInfo {
56
+func (rs *s) Providers(c *cid.Cid) []pstore.PeerInfo {
57
rs.delayConf.Query.Wait() // before locking
58
59
rs.lock.RLock()
60
defer rs.lock.RUnlock()
61
+ k := c.KeyString()
62
63
var ret []pstore.PeerInfo
64
records, ok := rs.providers[k]
routing/mock/centralized_test.go
+12
-10
@@ -1,21 +1,22 @@
1
package mockrouting
2
3
import (
4
+ "context"
5
"testing"
6
"time"
7
8
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
9
"github.com/ipfs/go-ipfs/thirdparty/testutil"
9
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
10
11
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
12
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
12
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
13
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
14
)
15
16
func TestKeyNotFound(t *testing.T) {
17
18
var pi = testutil.RandIdentityOrFatal(t)
18
- var key = key.Key("mock key")
19
+ var key = cid.NewCidV0(u.Hash([]byte("mock key")))
20
var ctx = context.Background()
21
22
rs := NewServer()
@@ -31,7 +32,7 @@ func TestClientFindProviders(t *testing.T) {
32
rs := NewServer()
33
client := rs.Client(pi)
34
34
- k := key.Key("hello")
35
+ k := cid.NewCidV0(u.Hash([]byte("hello")))
36
err := client.Provide(context.Background(), k)
37
if err != nil {
38
t.Fatal(err)
@@ -41,7 +42,7 @@ func TestClientFindProviders(t *testing.T) {
42
time.Sleep(time.Millisecond * 300)
43
max := 100
44
44
- providersFromClient := client.FindProvidersAsync(context.Background(), key.Key("hello"), max)
45
+ providersFromClient := client.FindProvidersAsync(context.Background(), k, max)
46
isInClient := false
47
for pi := range providersFromClient {
48
if pi.ID == pi.ID {
@@ -55,7 +56,7 @@ func TestClientFindProviders(t *testing.T) {
56
57
func TestClientOverMax(t *testing.T) {
58
rs := NewServer()
58
- k := key.Key("hello")
59
+ k := cid.NewCidV0(u.Hash([]byte("hello")))
60
numProvidersForHelloKey := 100
61
for i := 0; i < numProvidersForHelloKey; i++ {
62
pi := testutil.RandIdentityOrFatal(t)
@@ -82,7 +83,7 @@ func TestClientOverMax(t *testing.T) {
83
// TODO does dht ensure won't receive self as a provider? probably not.
84
func TestCanceledContext(t *testing.T) {
85
rs := NewServer()
85
- k := key.Key("hello")
86
+ k := cid.NewCidV0(u.Hash([]byte("hello")))
87
88
// avoid leaking goroutine, without using the context to signal
89
// (we want the goroutine to keep trying to publish on a
@@ -138,10 +139,11 @@ func TestCanceledContext(t *testing.T) {
139
}
140
141
func TestValidAfter(t *testing.T) {
142
+ ctx, cancel := context.WithCancel(context.Background())
143
+ defer cancel()
144
145
pi := testutil.RandIdentityOrFatal(t)
143
- var key = key.Key("mock key")
144
- var ctx = context.Background()
146
+ key := cid.NewCidV0(u.Hash([]byte("mock key")))
147
conf := DelayConfig{
148
ValueVisibility: delay.Fixed(1 * time.Hour),
149
Query: delay.Fixed(0),
routing/mock/dht.go
+3
-3
@@ -1,12 +1,12 @@
1
package mockrouting
2
3
import (
4
+ context "context"
5
"github.com/ipfs/go-ipfs/thirdparty/testutil"
5
- dht "gx/ipfs/QmXVWh4XWRaRGdcGeFtBp3hx7H3mzYgVRpVN7LwtTaYv2E/go-libp2p-kad-dht"
6
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7
- mocknet "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net/mock"
6
+ dht "gx/ipfs/QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo/go-libp2p-kad-dht"
7
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
8
sync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
9
+ mocknet "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/net/mock"
10
)
11
12
type mocknetserver struct {
routing/mock/interface.go
+8
-7
@@ -5,15 +5,16 @@
5
package mockrouting
6
7
import (
8
+ "context"
9
+
10
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
11
"github.com/ipfs/go-ipfs/thirdparty/testutil"
12
11
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
12
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
13
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
+ routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
14
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
15
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
16
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
15
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
16
- routing "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing"
17
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
18
)
19
20
// Server provides mockrouting Clients
@@ -24,7 +25,7 @@ type Server interface {
25
26
// Client implements IpfsRouting
27
type Client interface {
27
- FindProviders(context.Context, key.Key) ([]pstore.PeerInfo, error)
28
+ FindProviders(context.Context, *cid.Cid) ([]pstore.PeerInfo, error)
29
routing.IpfsRouting
30
}
31
@@ -39,7 +40,7 @@ func NewServer() Server {
40
// NewServerWithDelay returns a mockrouting Server with a delay!
41
func NewServerWithDelay(conf DelayConfig) Server {
42
return &s{
42
- providers: make(map[key.Key]map[peer.ID]providerRecord),
43
+ providers: make(map[string]map[peer.ID]providerRecord),
44
delayConf: conf,
45
}
46
}
routing/none/none_client.go
+12
-11
@@ -1,16 +1,17 @@
1
package nilrouting
2
3
import (
4
+ "context"
5
"errors"
6
7
repo "github.com/ipfs/go-ipfs/repo"
8
+
9
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
8
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
9
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
10
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
- p2phost "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/host"
12
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
13
- routing "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing"
10
+ routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
11
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
12
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
13
+ p2phost "gx/ipfs/QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki/go-libp2p-host"
14
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
15
)
16
17
var log = logging.Logger("mockrouter")
@@ -18,15 +19,15 @@ var log = logging.Logger("mockrouter")
19
type nilclient struct {
20
}
21
21
-func (c *nilclient) PutValue(_ context.Context, _ key.Key, _ []byte) error {
22
+func (c *nilclient) PutValue(_ context.Context, _ string, _ []byte) error {
23
return nil
24
}
25
25
-func (c *nilclient) GetValue(_ context.Context, _ key.Key) ([]byte, error) {
26
+func (c *nilclient) GetValue(_ context.Context, _ string) ([]byte, error) {
27
return nil, errors.New("Tried GetValue from nil routing.")
28
}
29
29
-func (c *nilclient) GetValues(_ context.Context, _ key.Key, _ int) ([]routing.RecvdVal, error) {
30
+func (c *nilclient) GetValues(_ context.Context, _ string, _ int) ([]routing.RecvdVal, error) {
31
return nil, errors.New("Tried GetValues from nil routing.")
32
}
33
@@ -34,13 +35,13 @@ func (c *nilclient) FindPeer(_ context.Context, _ peer.ID) (pstore.PeerInfo, err
35
return pstore.PeerInfo{}, nil
36
}
37
37
-func (c *nilclient) FindProvidersAsync(_ context.Context, _ key.Key, _ int) <-chan pstore.PeerInfo {
38
+func (c *nilclient) FindProvidersAsync(_ context.Context, _ *cid.Cid, _ int) <-chan pstore.PeerInfo {
39
out := make(chan pstore.PeerInfo)
40
defer close(out)
41
return out
42
}
43
43
-func (c *nilclient) Provide(_ context.Context, _ key.Key) error {
44
+func (c *nilclient) Provide(_ context.Context, _ *cid.Cid) error {
45
return nil
46
}
47
routing/offline/offline.go
+19
-18
@@ -1,21 +1,22 @@
1
package offline
2
3
import (
4
+ "context"
5
"errors"
6
"time"
7
7
- ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
8
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
9
- record "gx/ipfs/Qme7D9iKHYxwq28p6PzCymywsYSRBx9uyGzW7qNB3s9VbC/go-libp2p-record"
10
- pb "gx/ipfs/Qme7D9iKHYxwq28p6PzCymywsYSRBx9uyGzW7qNB3s9VbC/go-libp2p-record/pb"
11
- routing "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing"
8
+ dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
9
10
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
14
- ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
15
- "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
16
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
11
+ routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
12
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
13
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
18
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
15
+ ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
16
+ record "gx/ipfs/QmdM4ohF7cr4MvAECVeD3hRA3HtZrk1ngaek4n8ojVT87h/go-libp2p-record"
17
+ pb "gx/ipfs/QmdM4ohF7cr4MvAECVeD3hRA3HtZrk1ngaek4n8ojVT87h/go-libp2p-record/pb"
18
+ "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
19
+ ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
20
)
21
22
var log = logging.Logger("offlinerouting")
@@ -37,7 +38,7 @@ type offlineRouting struct {
38
sk ci.PrivKey
39
}
40
40
-func (c *offlineRouting) PutValue(ctx context.Context, key key.Key, val []byte) error {
41
+func (c *offlineRouting) PutValue(ctx context.Context, key string, val []byte) error {
42
rec, err := record.MakePutRecord(c.sk, key, val, false)
43
if err != nil {
44
return err
@@ -47,11 +48,11 @@ func (c *offlineRouting) PutValue(ctx context.Context, key key.Key, val []byte)
48
return err
49
}
50
50
- return c.datastore.Put(key.DsKey(), data)
51
+ return c.datastore.Put(dshelp.NewKeyFromBinary(key), data)
52
}
53
53
-func (c *offlineRouting) GetValue(ctx context.Context, key key.Key) ([]byte, error) {
54
- v, err := c.datastore.Get(key.DsKey())
54
+func (c *offlineRouting) GetValue(ctx context.Context, key string) ([]byte, error) {
55
+ v, err := c.datastore.Get(dshelp.NewKeyFromBinary(key))
56
if err != nil {
57
return nil, err
58
}
@@ -69,8 +70,8 @@ func (c *offlineRouting) GetValue(ctx context.Context, key key.Key) ([]byte, err
70
return rec.GetValue(), nil
71
}
72
72
-func (c *offlineRouting) GetValues(ctx context.Context, key key.Key, _ int) ([]routing.RecvdVal, error) {
73
- v, err := c.datastore.Get(key.DsKey())
73
+func (c *offlineRouting) GetValues(ctx context.Context, key string, _ int) ([]routing.RecvdVal, error) {
74
+ v, err := c.datastore.Get(dshelp.NewKeyFromBinary(key))
75
if err != nil {
76
return nil, err
77
}
@@ -90,7 +91,7 @@ func (c *offlineRouting) GetValues(ctx context.Context, key key.Key, _ int) ([]r
91
}, nil
92
}
93
93
-func (c *offlineRouting) FindProviders(ctx context.Context, key key.Key) ([]pstore.PeerInfo, error) {
94
+func (c *offlineRouting) FindProviders(ctx context.Context, key *cid.Cid) ([]pstore.PeerInfo, error) {
95
return nil, ErrOffline
96
}
97
@@ -98,13 +99,13 @@ func (c *offlineRouting) FindPeer(ctx context.Context, pid peer.ID) (pstore.Peer
99
return pstore.PeerInfo{}, ErrOffline
100
}
101
101
-func (c *offlineRouting) FindProvidersAsync(ctx context.Context, k key.Key, max int) <-chan pstore.PeerInfo {
102
+func (c *offlineRouting) FindProvidersAsync(ctx context.Context, k *cid.Cid, max int) <-chan pstore.PeerInfo {
103
out := make(chan pstore.PeerInfo)
104
close(out)
105
return out
106
}
107
107
-func (c *offlineRouting) Provide(_ context.Context, key key.Key) error {
108
+func (c *offlineRouting) Provide(_ context.Context, k *cid.Cid) error {
109
return ErrOffline
110
}
111
routing/supernode/client.go
+22
-22
@@ -2,22 +2,22 @@ package supernode
2
3
import (
4
"bytes"
5
+ "context"
6
"errors"
7
"time"
8
9
proxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
10
11
+ dhtpb "gx/ipfs/QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo/go-libp2p-kad-dht/pb"
12
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
11
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
12
- dhtpb "gx/ipfs/QmXVWh4XWRaRGdcGeFtBp3hx7H3mzYgVRpVN7LwtTaYv2E/go-libp2p-kad-dht/pb"
13
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
14
- loggables "gx/ipfs/QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7/go-libp2p-loggables"
13
+ loggables "gx/ipfs/QmTMy4hVSY28DdwJ9kBz6y7q6MuioFzPcpM3Ma3aPjo1i3/go-libp2p-loggables"
14
+ routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
15
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
16
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
16
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
- "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/host"
18
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
19
- pb "gx/ipfs/Qme7D9iKHYxwq28p6PzCymywsYSRBx9uyGzW7qNB3s9VbC/go-libp2p-record/pb"
20
- routing "gx/ipfs/QmemZcG8WprPbnVX3AM43GhhSUiA3V6NjcTLAguvWzkdpQ/go-libp2p-routing"
17
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
18
+ pb "gx/ipfs/QmdM4ohF7cr4MvAECVeD3hRA3HtZrk1ngaek4n8ojVT87h/go-libp2p-record/pb"
19
+ "gx/ipfs/QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki/go-libp2p-host"
20
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
21
)
22
23
var log = logging.Logger("supernode")
@@ -39,13 +39,13 @@ func NewClient(px proxy.Proxy, h host.Host, ps pstore.Peerstore, local peer.ID)
39
}, nil
40
}
41
42
-func (c *Client) FindProvidersAsync(ctx context.Context, k key.Key, max int) <-chan pstore.PeerInfo {
42
+func (c *Client) FindProvidersAsync(ctx context.Context, k *cid.Cid, max int) <-chan pstore.PeerInfo {
43
logging.ContextWithLoggable(ctx, loggables.Uuid("findProviders"))
44
- defer log.EventBegin(ctx, "findProviders", &k).Done()
44
+ defer log.EventBegin(ctx, "findProviders", k).Done()
45
ch := make(chan pstore.PeerInfo)
46
go func() {
47
defer close(ch)
48
- request := dhtpb.NewMessage(dhtpb.Message_GET_PROVIDERS, string(k), 0)
48
+ request := dhtpb.NewMessage(dhtpb.Message_GET_PROVIDERS, k.KeyString(), 0)
49
response, err := c.proxy.SendRequest(ctx, request)
50
if err != nil {
51
log.Debug(err)
@@ -63,8 +63,8 @@ func (c *Client) FindProvidersAsync(ctx context.Context, k key.Key, max int) <-c
63
return ch
64
}
65
66
-func (c *Client) PutValue(ctx context.Context, k key.Key, v []byte) error {
67
- defer log.EventBegin(ctx, "putValue", &k).Done()
66
+func (c *Client) PutValue(ctx context.Context, k string, v []byte) error {
67
+ defer log.EventBegin(ctx, "putValue").Done()
68
r, err := makeRecord(c.peerstore, c.local, k, v)
69
if err != nil {
70
return err
@@ -74,8 +74,8 @@ func (c *Client) PutValue(ctx context.Context, k key.Key, v []byte) error {
74
return c.proxy.SendMessage(ctx, pmes) // wrap to hide the remote
75
}
76
77
-func (c *Client) GetValue(ctx context.Context, k key.Key) ([]byte, error) {
78
- defer log.EventBegin(ctx, "getValue", &k).Done()
77
+func (c *Client) GetValue(ctx context.Context, k string) ([]byte, error) {
78
+ defer log.EventBegin(ctx, "getValue").Done()
79
msg := dhtpb.NewMessage(dhtpb.Message_GET_VALUE, string(k), 0)
80
response, err := c.proxy.SendRequest(ctx, msg) // TODO wrap to hide the remote
81
if err != nil {
@@ -84,8 +84,8 @@ func (c *Client) GetValue(ctx context.Context, k key.Key) ([]byte, error) {
84
return response.Record.GetValue(), nil
85
}
86
87
-func (c *Client) GetValues(ctx context.Context, k key.Key, _ int) ([]routing.RecvdVal, error) {
88
- defer log.EventBegin(ctx, "getValue", &k).Done()
87
+func (c *Client) GetValues(ctx context.Context, k string, _ int) ([]routing.RecvdVal, error) {
88
+ defer log.EventBegin(ctx, "getValue").Done()
89
msg := dhtpb.NewMessage(dhtpb.Message_GET_VALUE, string(k), 0)
90
response, err := c.proxy.SendRequest(ctx, msg) // TODO wrap to hide the remote
91
if err != nil {
@@ -100,9 +100,9 @@ func (c *Client) GetValues(ctx context.Context, k key.Key, _ int) ([]routing.Rec
100
}, nil
101
}
102
103
-func (c *Client) Provide(ctx context.Context, k key.Key) error {
104
- defer log.EventBegin(ctx, "provide", &k).Done()
105
- msg := dhtpb.NewMessage(dhtpb.Message_ADD_PROVIDER, string(k), 0)
103
+func (c *Client) Provide(ctx context.Context, k *cid.Cid) error {
104
+ defer log.EventBegin(ctx, "provide", k).Done()
105
+ msg := dhtpb.NewMessage(dhtpb.Message_ADD_PROVIDER, k.KeyString(), 0)
106
// FIXME how is connectedness defined for the local node
107
pri := []dhtpb.PeerRoutingInfo{
108
{
@@ -132,7 +132,7 @@ func (c *Client) FindPeer(ctx context.Context, id peer.ID) (pstore.PeerInfo, err
132
}
133
134
// creates and signs a record for the given key/value pair
135
-func makeRecord(ps pstore.Peerstore, p peer.ID, k key.Key, v []byte) (*pb.Record, error) {
135
+func makeRecord(ps pstore.Peerstore, p peer.ID, k string, v []byte) (*pb.Record, error) {
136
blob := bytes.Join([][]byte{[]byte(k), v, []byte(p)}, []byte{})
137
sig, err := ps.PrivKey(p).Sign(blob)
138
if err != nil {
routing/supernode/proxy/loopback.go
+4
-4
@@ -1,11 +1,11 @@
1
package proxy
2
3
import (
4
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
5
- dhtpb "gx/ipfs/QmXVWh4XWRaRGdcGeFtBp3hx7H3mzYgVRpVN7LwtTaYv2E/go-libp2p-kad-dht/pb"
4
+ context "context"
5
+ dhtpb "gx/ipfs/QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo/go-libp2p-kad-dht/pb"
6
ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
7
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
8
- inet "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net"
7
+ inet "gx/ipfs/QmdXimY9QHaasZmw6hWojWnCJvfgxETjZQfg9g6ZrA9wMX/go-libp2p-net"
8
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
9
)
10
11
// RequestHandler handles routing requests locally
routing/supernode/proxy/standard.go
+10
-14
@@ -1,22 +1,18 @@
1
package proxy
2
3
import (
4
+ "context"
5
"errors"
6
6
- ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
7
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
8
-
7
+ dhtpb "gx/ipfs/QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo/go-libp2p-kad-dht/pb"
8
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
10
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
11
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
12
- host "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/host"
13
- inet "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net"
14
-
15
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
16
-
17
- kbucket "gx/ipfs/QmVsCNFD32GzZ6Q5XD1TVGPRviNYqDdoNvgq853TU9hhzP/go-libp2p-kbucket"
18
- dhtpb "gx/ipfs/QmXVWh4XWRaRGdcGeFtBp3hx7H3mzYgVRpVN7LwtTaYv2E/go-libp2p-kad-dht/pb"
19
- loggables "gx/ipfs/QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7/go-libp2p-loggables"
9
+ loggables "gx/ipfs/QmTMy4hVSY28DdwJ9kBz6y7q6MuioFzPcpM3Ma3aPjo1i3/go-libp2p-loggables"
10
+ kbucket "gx/ipfs/QmUKePKcUEXwdvJENZJ6z8mJjPaxLsDZ3V9CZjPPtyawPm/go-libp2p-kbucket"
11
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
12
+ ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
13
+ host "gx/ipfs/QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki/go-libp2p-host"
14
+ inet "gx/ipfs/QmdXimY9QHaasZmw6hWojWnCJvfgxETjZQfg9g6ZrA9wMX/go-libp2p-net"
15
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
16
)
17
18
const ProtocolSNR = "/ipfs/supernoderouting"
@@ -167,6 +163,6 @@ func (px *standard) sendRequest(ctx context.Context, m *dhtpb.Message, remote pe
163
}
164
165
func sortedByKey(peers []peer.ID, skey string) []peer.ID {
170
- target := kbucket.ConvertKey(key.Key(skey))
166
+ target := kbucket.ConvertKey(skey)
167
return kbucket.SortClosestPeers(peers, target)
168
}
routing/supernode/server.go
+7
-7
@@ -6,15 +6,15 @@ import (
6
7
proxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
8
9
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
10
- dhtpb "gx/ipfs/QmXVWh4XWRaRGdcGeFtBp3hx7H3mzYgVRpVN7LwtTaYv2E/go-libp2p-kad-dht/pb"
11
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
9
+ context "context"
10
+ dhtpb "gx/ipfs/QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo/go-libp2p-kad-dht/pb"
11
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
12
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
13
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
13
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14
datastore "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
15
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
16
- record "gx/ipfs/Qme7D9iKHYxwq28p6PzCymywsYSRBx9uyGzW7qNB3s9VbC/go-libp2p-record"
17
- pb "gx/ipfs/Qme7D9iKHYxwq28p6PzCymywsYSRBx9uyGzW7qNB3s9VbC/go-libp2p-record/pb"
15
+ record "gx/ipfs/QmdM4ohF7cr4MvAECVeD3hRA3HtZrk1ngaek4n8ojVT87h/go-libp2p-record"
16
+ pb "gx/ipfs/QmdM4ohF7cr4MvAECVeD3hRA3HtZrk1ngaek4n8ojVT87h/go-libp2p-record/pb"
17
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
18
)
19
20
// Server handles routing queries using a database backend
routing/supernode/server_test.go
+2
-2
@@ -3,9 +3,9 @@ package supernode
3
import (
4
"testing"
5
6
- dhtpb "gx/ipfs/QmXVWh4XWRaRGdcGeFtBp3hx7H3mzYgVRpVN7LwtTaYv2E/go-libp2p-kad-dht/pb"
6
+ dhtpb "gx/ipfs/QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo/go-libp2p-kad-dht/pb"
7
+ key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
8
datastore "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
8
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
9
)
10
11
func TestPutProviderDoesntResultInDuplicates(t *testing.T) {
tar/format.go
+1
-1
@@ -16,7 +16,7 @@ import (
16
uio "github.com/ipfs/go-ipfs/unixfs/io"
17
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
18
19
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19
+ context "context"
20
)
21
22
var log = logging.Logger("tarfmt")
test/integration/addcat_test.go
+3
-3
@@ -10,8 +10,8 @@ import (
10
"testing"
11
"time"
12
13
+ context "context"
14
random "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random"
14
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15
16
"github.com/ipfs/go-ipfs/core"
17
coreunix "github.com/ipfs/go-ipfs/core/coreunix"
@@ -19,8 +19,8 @@ import (
19
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
20
"github.com/ipfs/go-ipfs/thirdparty/unit"
21
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
22
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
23
- mocknet "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net/mock"
22
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
23
+ mocknet "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/net/mock"
24
)
25
26
var log = logging.Logger("epictest")
test/integration/bench_cat_test.go
+3
-3
@@ -7,14 +7,14 @@ import (
7
"math"
8
"testing"
9
10
+ context "context"
11
"github.com/ipfs/go-ipfs/core"
12
coreunix "github.com/ipfs/go-ipfs/core/coreunix"
13
mock "github.com/ipfs/go-ipfs/core/mock"
14
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
15
"github.com/ipfs/go-ipfs/thirdparty/unit"
15
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
16
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
- mocknet "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net/mock"
16
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
17
+ mocknet "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/net/mock"
18
)
19
20
func BenchmarkCat1MB(b *testing.B) { benchmarkVarCat(b, unit.MB*1) }
test/integration/bitswap_wo_routing_test.go
+3
-3
@@ -8,9 +8,9 @@ import (
8
"github.com/ipfs/go-ipfs/core"
9
"github.com/ipfs/go-ipfs/core/mock"
10
11
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
- mocknet "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net/mock"
13
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
11
+ context "context"
12
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
13
+ mocknet "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/net/mock"
14
)
15
16
func TestBitswapWithoutRouting(t *testing.T) {
test/integration/grandcentral_test.go
+4
-5
@@ -8,7 +8,7 @@ import (
8
"math"
9
"testing"
10
11
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
+ context "context"
12
"gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
13
syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
14
@@ -19,9 +19,8 @@ import (
19
ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
20
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
21
"github.com/ipfs/go-ipfs/thirdparty/unit"
22
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
23
- mocknet "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net/mock"
24
- key "gx/ipfs/Qmce4Y4zg3sYr7xKM5UueS67vhNni6EeWgCRnb7MbLJMew/go-key"
22
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
23
+ mocknet "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/net/mock"
24
)
25
26
func TestSupernodeBootstrappedAddCat(t *testing.T) {
@@ -163,7 +162,7 @@ func RunSupernodePutRecordGetRecord(conf testutil.LatencyConfig) error {
162
putter := clients[0]
163
getter := clients[1]
164
166
- k := key.Key("key")
165
+ k := "key"
166
note := []byte("a note from putter")
167
168
if err := putter.Routing.PutValue(ctx, k, note); err != nil {
test/integration/three_legged_cat_test.go
+3
-3
@@ -8,15 +8,15 @@ import (
8
"testing"
9
"time"
10
11
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
+ context "context"
12
13
core "github.com/ipfs/go-ipfs/core"
14
coreunix "github.com/ipfs/go-ipfs/core/coreunix"
15
mock "github.com/ipfs/go-ipfs/core/mock"
16
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
17
"github.com/ipfs/go-ipfs/thirdparty/unit"
18
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
19
- mocknet "gx/ipfs/QmbiRCGZqhfcSjnm9icGz3oNQQdPLAnLWnKHXixaEWXVCN/go-libp2p/p2p/net/mock"
18
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
19
+ mocknet "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/net/mock"
20
)
21
22
func TestThreeLeggedCatTransfer(t *testing.T) {
test/sharness/t0170-dht.sh
+8
-4
@@ -31,12 +31,16 @@ test_expect_success 'put' '
31
test_fsh cat putted
32
'
33
34
+test_expect_success "add a ref so we can find providers for it" '
35
+ echo "some stuff" > afile &&
36
+ HASH=$(ipfsi 3 add -q afile)
37
+'
38
+
39
# ipfs dht findprovs <key>
40
test_expect_success 'findprovs' '
36
- ipfsi 4 dht findprovs planet | sort >provs &&
37
- sort provs putted | uniq -d >actual &&
38
- [ -s actual ] ||
39
- test_fsh cat actual
41
+ ipfsi 4 dht findprovs $HASH > provs &&
42
+ iptb get id 3 > expected &&
43
+ test_cmp provs expected
44
'
45
46
# ipfs dht get <key>
test/supernode_client/main.go
+3
-3
@@ -27,10 +27,10 @@ import (
27
"gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
28
syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
29
30
+ context "context"
31
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
31
- pstore "gx/ipfs/QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD/go-libp2p-peerstore"
32
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
33
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
32
+ ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
33
+ pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
34
)
35
36
var elog = logging.Logger("gc-client")
thirdparty/ds-help/key.go
new
+11
@@ -0,0 +1,11 @@
1
+package dshelp
2
+
3
+import (
4
+ base32 "gx/ipfs/Qmb1DA2A9LS2wR4FFweB4uEDomFsdmnw1VLawLE1yQzudj/base32"
5
+ ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
6
+)
7
+
8
+// TODO: put this code into the go-datastore itself
9
+func NewKeyFromBinary(s string) ds.Key {
10
+ return ds.NewKey(base32.RawStdEncoding.EncodeToString([]byte(s)))
11
+}
thirdparty/ipfsaddr/ipfsaddr.go
+2
-2
@@ -3,11 +3,11 @@ package ipfsaddr
3
import (
4
"errors"
5
6
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
6
+ ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
7
8
path "github.com/ipfs/go-ipfs/path"
9
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
10
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
10
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
11
)
12
13
var log = logging.Logger("ipfsaddr")
thirdparty/ipfsaddr/ipfsaddr_test.go
+2
-2
@@ -4,8 +4,8 @@ import (
4
"testing"
5
6
path "github.com/ipfs/go-ipfs/path"
7
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
8
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
7
+ ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
8
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
9
)
10
11
var good = []string{
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/pollEndpoint/main.go
+2
-2
@@ -11,8 +11,8 @@ import (
11
"time"
12
13
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
14
- manet "gx/ipfs/QmY83KqqnQ286ZWbV2x7ixpeemH3cBpk8R54egS619WYff/go-multiaddr-net"
15
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
14
+ manet "gx/ipfs/QmT6Cp31887FpAc25z25YHgpFJohZedrYLWPPspRtj1Brp/go-multiaddr-net"
15
+ ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
16
)
17
18
var (
thirdparty/testutil/gen.go
+4
-4
@@ -8,11 +8,11 @@ import (
8
"sync"
9
"testing"
10
11
- ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
12
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
13
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
11
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
12
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
13
+ ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
14
15
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
15
+ ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
16
)
17
18
// ZeroLocalTCPAddress is the "zero" tcp local multiaddr. This means:
thirdparty/testutil/identity.go
+3
-3
@@ -3,9 +3,9 @@ package testutil
3
import (
4
"testing"
5
6
- ci "gx/ipfs/QmVoi5es8D5fNHZDqoW6DgDAEPEV5hQp8GBz161vZXiwpQ/go-libp2p-crypto"
7
- peer "gx/ipfs/QmWXjJo15p4pzT7cayEwZi2sWgJqLnGDof6ZGMh9xBgU1p/go-libp2p-peer"
8
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
6
+ ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
7
+ peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
8
+ ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
9
)
10
11
type Identity interface {
unixfs/archive/archive.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"io"
7
"path"
8
9
- cxt "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9
+ cxt "context"
10
11
mdag "github.com/ipfs/go-ipfs/merkledag"
12
tar "github.com/ipfs/go-ipfs/unixfs/archive/tar"
unixfs/archive/tar/writer.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
"path"
7
"time"
8
9
+ cxt "context"
10
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
10
- cxt "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
12
mdag "github.com/ipfs/go-ipfs/merkledag"
13
ft "github.com/ipfs/go-ipfs/unixfs"
unixfs/io/dagreader.go
+1
-1
@@ -7,8 +7,8 @@ import (
7
"io"
8
"os"
9
10
+ "context"
11
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
11
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
13
mdag "github.com/ipfs/go-ipfs/merkledag"
14
ft "github.com/ipfs/go-ipfs/unixfs"
unixfs/io/dagreader_test.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
mdag "github.com/ipfs/go-ipfs/merkledag"
11
"github.com/ipfs/go-ipfs/unixfs"
12
13
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
+ context "context"
14
15
testu "github.com/ipfs/go-ipfs/unixfs/test"
16
)
unixfs/io/dirbuilder.go
+2
-2
@@ -1,11 +1,11 @@
1
package io
2
3
import (
4
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
4
+ "context"
5
6
mdag "github.com/ipfs/go-ipfs/merkledag"
7
format "github.com/ipfs/go-ipfs/unixfs"
8
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
8
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
9
)
10
11
type directoryBuilder struct {
unixfs/mod/dagmodifier.go
+2
-2
@@ -13,10 +13,10 @@ import (
13
ft "github.com/ipfs/go-ipfs/unixfs"
14
uio "github.com/ipfs/go-ipfs/unixfs/io"
15
16
+ context "context"
17
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
18
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
18
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19
- cid "gx/ipfs/QmfSc2xehWmWLnwwYR91Y8QF4xdASypTFVknutoKQS3GHp/go-cid"
19
+ cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
20
)
21
22
var ErrSeekFail = errors.New("failed to seek properly")
unixfs/mod/dagmodifier_test.go
+2
-2
@@ -16,8 +16,8 @@ import (
16
uio "github.com/ipfs/go-ipfs/unixfs/io"
17
testu "github.com/ipfs/go-ipfs/unixfs/test"
18
19
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
20
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19
+ context "context"
20
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
21
ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
22
"gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
23
)
unixfs/test/utils.go
+2
-2
@@ -13,8 +13,8 @@ import (
13
mdagmock "github.com/ipfs/go-ipfs/merkledag/test"
14
ft "github.com/ipfs/go-ipfs/unixfs"
15
16
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
17
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16
+ context "context"
17
+ u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
18
)
19
20
func SizeSplitterGen(size int64) chunk.SplitterGen {