@cryptotaxi247 / kubo / commits / f4d7369c4

bitswap: protocol extension to handle cids

This change adds the /ipfs/bitswap/1.1.0 protocol. The new protocol adds a 'payload' field to the protobuf message and deprecates the existing 'blocks' field. The 'payload' field is an array of pairs of cid prefixes and block data. The cid prefixes are used to ensure the correct codecs and hash functions are used to handle the block on the receiving end. License: MIT Signed-off-by: Jeromy <why@ipfs.io>

Jeromy committed Oct 8, 2016 at 17:59 UTC f4d7369c4a0eda7adf6fa0277a48db057e6c8ca2
91 files changed +248 -155
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/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
14 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
15 )
16
17 // initDocPaths lists the paths for the docs we want to seed during --init
blocks/blocks.go
+1 -1
@@ -6,8 +6,8 @@ import (
6 "errors"
7 "fmt"
8
9 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
10 mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash"
10 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
11 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
12 )
13
blocks/blocks_test.go
+1 -1
@@ -4,8 +4,8 @@ import (
4 "bytes"
5 "testing"
6
7 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
8 mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash"
8 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
9 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
10 )
11
blocks/blockstore/arc_cache.go
+1 -1
@@ -7,7 +7,7 @@ import (
7
8 "gx/ipfs/QmRg1gKTHzc3CZXSKzem8aR4E3TubFhbgXwfVuWnSK5CC5/go-metrics-interface"
9 lru "gx/ipfs/QmVYxfoJQiZijTgPNHCHgHELvQpbsJNTg6Crmc3dQkj3yy/golang-lru"
10 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
10 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
11 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
12 )
13
blocks/blockstore/arc_cache_test.go
+1 -1
@@ -6,7 +6,7 @@ import (
6
7 "github.com/ipfs/go-ipfs/blocks"
8
9 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
9 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
10 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
11 syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
12 )
blocks/blockstore/blockstore.go
+1 -1
@@ -12,7 +12,7 @@ import (
12 dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
13
14 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
15 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
15 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
16 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
17 dsns "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/namespace"
18 dsq "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/query"
blocks/blockstore/blockstore_test.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 blocks "github.com/ipfs/go-ipfs/blocks"
10 dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
11
12 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
12 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
13 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
14 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
15 dsq "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/query"
blocks/blockstore/bloom_cache.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 "github.com/ipfs/go-ipfs/blocks"
9
10 "gx/ipfs/QmRg1gKTHzc3CZXSKzem8aR4E3TubFhbgXwfVuWnSK5CC5/go-metrics-interface"
11 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
11 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
12 bloom "gx/ipfs/QmeiMCBkYHxkDkDfnDadzz4YxY5ruL5Pj499essE4vRsGM/bbloom"
13 )
14
blocks/blockstore/util/remove.go
+1 -1
@@ -6,7 +6,7 @@ import (
6
7 bs "github.com/ipfs/go-ipfs/blocks/blockstore"
8 "github.com/ipfs/go-ipfs/pin"
9 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
9 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
10 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
11 )
12
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 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
7 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
8 )
9
10 var log = logging.Logger("blockset")
blocks/set/set_test.go
+1 -1
@@ -5,7 +5,7 @@ import (
5
6 bu "github.com/ipfs/go-ipfs/blocks/blocksutil"
7
8 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
8 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
9 )
10
11 const (
blockservice/blockservice.go
+1 -1
@@ -13,7 +13,7 @@ import (
13
14 context "context"
15 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
16 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
16 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
17 )
18
19 var log = logging.Logger("blockservice")
blockservice/test/blocks_test.go
+1 -1
@@ -12,7 +12,7 @@ import (
12 . "github.com/ipfs/go-ipfs/blockservice"
13 offline "github.com/ipfs/go-ipfs/exchange/offline"
14
15 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
15 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
16 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
17 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
18 dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
core/commands/bitswap.go
+1 -1
@@ -10,7 +10,7 @@ import (
10 decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision"
11
12 "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
13 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
13 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
14 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
15 peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
16 )
core/commands/block.go
+1 -1
@@ -11,7 +11,7 @@ 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 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
14 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
15 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
16 )
17
core/commands/dht.go
+4 -4
@@ -12,12 +12,12 @@ import (
12 dag "github.com/ipfs/go-ipfs/merkledag"
13 path "github.com/ipfs/go-ipfs/path"
14
15 - ipdht "gx/ipfs/QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo/go-libp2p-kad-dht"
15 + routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing"
16 + notif "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing/notifications"
17 b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58"
17 - routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
18 - notif "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing/notifications"
18 + ipdht "gx/ipfs/QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn/go-libp2p-kad-dht"
19 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
20 pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
20 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
21 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
22 peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
23 )
core/commands/ls.go
+1 -1
@@ -13,7 +13,7 @@ import (
13 unixfs "github.com/ipfs/go-ipfs/unixfs"
14 unixfspb "github.com/ipfs/go-ipfs/unixfs/pb"
15
16 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
16 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
17 )
18
19 type LsLink struct {
core/commands/pin.go
+1 -1
@@ -13,7 +13,7 @@ import (
13 pin "github.com/ipfs/go-ipfs/pin"
14
15 context "context"
16 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
16 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
17 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
18 )
19
core/commands/pubsub.go
+1 -1
@@ -14,8 +14,8 @@ import (
14 core "github.com/ipfs/go-ipfs/core"
15
16 floodsub "gx/ipfs/QmTgcWwxttM74AY7UYA6qMP9WpzfBEjbZntx7ZWLttRMJJ/floodsub"
17 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
18 pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
18 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
19 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
20 )
21
core/commands/refs.go
+1 -1
@@ -12,7 +12,7 @@ import (
12 dag "github.com/ipfs/go-ipfs/merkledag"
13 path "github.com/ipfs/go-ipfs/path"
14
15 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
15 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
16 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
17 )
18
core/core.go
+3 -3
@@ -27,8 +27,8 @@ import (
27 ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
28 addrutil "gx/ipfs/QmVDnc2zvyQm8LhT72n22THcshvH7j3qPMnhvjerQER62T/go-addr-util"
29 metrics "gx/ipfs/QmWpTXhTkpoCDEm9twJd5Rc9jFwy61emzxneeJzrVMfjGF/go-libp2p-metrics"
30 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
31 pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
31 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
32 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
33 discovery "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/discovery"
34 p2pbhost "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/host/basic"
@@ -41,8 +41,8 @@ import (
41
42 nilrouting "github.com/ipfs/go-ipfs/routing/none"
43 offroute "github.com/ipfs/go-ipfs/routing/offline"
44 - dht "gx/ipfs/QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo/go-libp2p-kad-dht"
45 - routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
44 + routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing"
45 + dht "gx/ipfs/QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn/go-libp2p-kad-dht"
46
47 bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
48 bserv "github.com/ipfs/go-ipfs/blockservice"
core/corehttp/gateway_handler.go
+2 -2
@@ -19,9 +19,9 @@ import (
19 uio "github.com/ipfs/go-ipfs/unixfs/io"
20
21 "context"
22 + routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing"
23 humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
23 - routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
24 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
24 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
25 )
26
27 const (
core/corerepo/gc.go
+1 -1
@@ -12,7 +12,7 @@ import (
12
13 humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
14 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
15 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
15 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
16 )
17
18 var log = logging.Logger("corerepo")
core/corerepo/pinning.go
+1 -1
@@ -21,7 +21,7 @@ import (
21 path "github.com/ipfs/go-ipfs/path"
22
23 context "context"
24 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
24 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
25 )
26
27 func Pin(n *core.IpfsNode, ctx context.Context, paths []string, recursive bool) ([]*cid.Cid, error) {
core/corerouting/core.go
+1 -1
@@ -8,7 +8,7 @@ import (
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"
11 - routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
11 + routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing"
12 pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
13 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
14 "gx/ipfs/QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki/go-libp2p-host"
core/coreunix/add.go
+1 -1
@@ -22,7 +22,7 @@ import (
22
23 context "context"
24 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
25 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
25 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
26 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
27 syncds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
28 )
core/coreunix/add_test.go
+1 -1
@@ -16,7 +16,7 @@ import (
16 "github.com/ipfs/go-ipfs/thirdparty/testutil"
17
18 "context"
19 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
19 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
20 )
21
22 func TestAddRecursive(t *testing.T) {
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/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
7 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
8 )
9
10 func AddMetadataTo(n *core.IpfsNode, skey string, m *ft.Metadata) (string, error) {
core/coreunix/metadata_test.go
+1 -1
@@ -16,7 +16,7 @@ import (
16 uio "github.com/ipfs/go-ipfs/unixfs/io"
17
18 context "context"
19 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
19 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/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"
core/pathresolver.go
+1 -1
@@ -8,7 +8,7 @@ import (
8
9 merkledag "github.com/ipfs/go-ipfs/merkledag"
10 path "github.com/ipfs/go-ipfs/path"
11 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
11 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
12 )
13
14 // ErrNoNamesys is an explicit error for when an IPFS node doesn't
exchange/bitswap/bitswap.go
+1 -1
@@ -23,7 +23,7 @@ import (
23 procctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
24 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
25 loggables "gx/ipfs/QmTMy4hVSY28DdwJ9kBz6y7q6MuioFzPcpM3Ma3aPjo1i3/go-libp2p-loggables"
26 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
26 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
27 peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
28 )
29
exchange/bitswap/bitswap_test.go
+1 -1
@@ -16,7 +16,7 @@ import (
16 travis "github.com/ipfs/go-ipfs/thirdparty/testutil/ci/travis"
17
18 detectrace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race"
19 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
19 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
20 p2ptestutil "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/test/util"
21 )
22
exchange/bitswap/decision/bench_test.go
+1 -1
@@ -7,7 +7,7 @@ import (
7
8 "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
9 "github.com/ipfs/go-ipfs/thirdparty/testutil"
10 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
10 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
11 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
12 "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
13 )
exchange/bitswap/decision/ledger.go
+1 -1
@@ -6,7 +6,7 @@ import (
6
7 wl "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
8
9 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
9 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
10 peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
11 )
12
exchange/bitswap/decision/peer_request_queue.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
8 pq "github.com/ipfs/go-ipfs/thirdparty/pq"
9
10 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
10 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
11 peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
12 )
13
exchange/bitswap/decision/peer_request_queue_test.go
+1 -1
@@ -10,7 +10,7 @@ import (
10
11 "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
12 "github.com/ipfs/go-ipfs/thirdparty/testutil"
13 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
13 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
14 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
15 )
16
exchange/bitswap/message/message.go
+61 -6
@@ -8,9 +8,9 @@ import (
8 pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/pb"
9 wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
10
11 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
12 ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
13 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
13 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
14 inet "gx/ipfs/QmdXimY9QHaasZmw6hWojWnCJvfgxETjZQfg9g6ZrA9wMX/go-libp2p-net"
15 )
16
@@ -42,8 +42,10 @@ type BitSwapMessage interface {
42 }
43
44 type Exportable interface {
45 - ToProto() *pb.Message
46 - ToNet(w io.Writer) error
45 + ToProtoV0() *pb.Message
46 + ToProtoV1() *pb.Message
47 + ToNetV0(w io.Writer) error
48 + ToNetV1(w io.Writer) error
49 }
50
51 type impl struct {
@@ -78,10 +80,34 @@ func newMessageFromProto(pbm pb.Message) (BitSwapMessage, error) {
80 }
81 m.addEntry(c, int(e.GetPriority()), e.GetCancel())
82 }
83 +
84 + // deprecated
85 for _, d := range pbm.GetBlocks() {
86 + // CIDv0, sha256, protobuf only
87 b := blocks.NewBlock(d)
88 m.AddBlock(b)
89 }
90 + //
91 +
92 + for _, b := range pbm.GetPayload() {
93 + pref, err := cid.PrefixFromBytes(b.GetPrefix())
94 + if err != nil {
95 + return nil, err
96 + }
97 +
98 + c, err := pref.Sum(b.GetData())
99 + if err != nil {
100 + return nil, err
101 + }
102 +
103 + blk, err := blocks.NewBlockWithCid(b.GetData(), c)
104 + if err != nil {
105 + return nil, err
106 + }
107 +
108 + m.AddBlock(blk)
109 + }
110 +
111 return m, nil
112 }
113
@@ -153,7 +179,7 @@ func FromPBReader(pbr ggio.Reader) (BitSwapMessage, error) {
179 return newMessageFromProto(*pb)
180 }
181
156 -func (m *impl) ToProto() *pb.Message {
182 +func (m *impl) ToProtoV0() *pb.Message {
183 pbm := new(pb.Message)
184 pbm.Wantlist = new(pb.Message_Wantlist)
185 for _, e := range m.wantlist {
@@ -169,10 +195,39 @@ func (m *impl) ToProto() *pb.Message {
195 return pbm
196 }
197
172 -func (m *impl) ToNet(w io.Writer) error {
198 +func (m *impl) ToProtoV1() *pb.Message {
199 + pbm := new(pb.Message)
200 + pbm.Wantlist = new(pb.Message_Wantlist)
201 + for _, e := range m.wantlist {
202 + pbm.Wantlist.Entries = append(pbm.Wantlist.Entries, &pb.Message_Wantlist_Entry{
203 + Block: proto.String(e.Cid.KeyString()),
204 + Priority: proto.Int32(int32(e.Priority)),
205 + Cancel: proto.Bool(e.Cancel),
206 + })
207 + }
208 + for _, b := range m.Blocks() {
209 + blk := &pb.Message_Block{
210 + Data: b.RawData(),
211 + Prefix: b.Cid().Prefix().Bytes(),
212 + }
213 + pbm.Payload = append(pbm.Payload, blk)
214 + }
215 + return pbm
216 +}
217 +
218 +func (m *impl) ToNetV0(w io.Writer) error {
219 + pbw := ggio.NewDelimitedWriter(w)
220 +
221 + if err := pbw.WriteMsg(m.ToProtoV0()); err != nil {
222 + return err
223 + }
224 + return nil
225 +}
226 +
227 +func (m *impl) ToNetV1(w io.Writer) error {
228 pbw := ggio.NewDelimitedWriter(w)
229
175 - if err := pbw.WriteMsg(m.ToProto()); err != nil {
230 + if err := pbw.WriteMsg(m.ToProtoV1()); err != nil {
231 return err
232 }
233 return nil
exchange/bitswap/message/message_test.go
+7 -8
@@ -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 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
11 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
12 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
13 )
14
@@ -21,10 +21,9 @@ func TestAppendWanted(t *testing.T) {
21 m := New(true)
22 m.AddEntry(str, 1)
23
24 - if !wantlistContains(m.ToProto().GetWantlist(), str) {
24 + if !wantlistContains(m.ToProtoV0().GetWantlist(), str) {
25 t.Fail()
26 }
27 - m.ToProto().GetWantlist().GetEntries()
27 }
28
29 func TestNewMessageFromProto(t *testing.T) {
@@ -42,7 +41,7 @@ func TestNewMessageFromProto(t *testing.T) {
41 t.Fatal(err)
42 }
43
45 - if !wantlistContains(m.ToProto().GetWantlist(), str) {
44 + if !wantlistContains(m.ToProtoV0().GetWantlist(), str) {
45 t.Fail()
46 }
47 }
@@ -60,7 +59,7 @@ func TestAppendBlock(t *testing.T) {
59 }
60
61 // assert strings are in proto message
63 - for _, blockbytes := range m.ToProto().GetBlocks() {
62 + for _, blockbytes := range m.ToProtoV0().GetBlocks() {
63 s := bytes.NewBuffer(blockbytes).String()
64 if !contains(strs, s) {
65 t.Fail()
@@ -94,7 +93,7 @@ func TestWantlist(t *testing.T) {
93 func TestCopyProtoByValue(t *testing.T) {
94 str := mkFakeCid("foo")
95 m := New(true)
97 - protoBeforeAppend := m.ToProto()
96 + protoBeforeAppend := m.ToProtoV0()
97 m.AddEntry(str, 1)
98 if wantlistContains(protoBeforeAppend.GetWantlist(), str) {
99 t.Fail()
@@ -110,7 +109,7 @@ func TestToNetFromNetPreservesWantList(t *testing.T) {
109 original.AddEntry(mkFakeCid("F"), 1)
110
111 buf := new(bytes.Buffer)
113 - if err := original.ToNet(buf); err != nil {
112 + if err := original.ToNetV1(buf); err != nil {
113 t.Fatal(err)
114 }
115
@@ -140,7 +139,7 @@ func TestToAndFromNetMessage(t *testing.T) {
139 original.AddBlock(blocks.NewBlock([]byte("M")))
140
141 buf := new(bytes.Buffer)
143 - if err := original.ToNet(buf); err != nil {
142 + if err := original.ToNetV1(buf); err != nil {
143 t.Fatal(err)
144 }
145
exchange/bitswap/message/pb/message.pb.go
+38
@@ -14,15 +14,18 @@ It has these top-level messages:
14 package bitswap_message_pb
15
16 import proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
17 +import fmt "fmt"
18 import math "math"
19
20 // Reference imports to suppress errors if they are not otherwise used.
21 var _ = proto.Marshal
22 +var _ = fmt.Errorf
23 var _ = math.Inf
24
25 type Message struct {
26 Wantlist *Message_Wantlist `protobuf:"bytes,1,opt,name=wantlist" json:"wantlist,omitempty"`
27 Blocks [][]byte `protobuf:"bytes,2,rep,name=blocks" json:"blocks,omitempty"`
28 + Payload []*Message_Block `protobuf:"bytes,3,rep,name=payload" json:"payload,omitempty"`
29 XXX_unrecognized []byte `json:"-"`
30 }
31
@@ -44,6 +47,13 @@ func (m *Message) GetBlocks() [][]byte {
47 return nil
48 }
49
50 +func (m *Message) GetPayload() []*Message_Block {
51 + if m != nil {
52 + return m.Payload
53 + }
54 + return nil
55 +}
56 +
57 type Message_Wantlist struct {
58 Entries []*Message_Wantlist_Entry `protobuf:"bytes,1,rep,name=entries" json:"entries,omitempty"`
59 Full *bool `protobuf:"varint,2,opt,name=full" json:"full,omitempty"`
@@ -100,5 +110,33 @@ func (m *Message_Wantlist_Entry) GetCancel() bool {
110 return false
111 }
112
113 +type Message_Block struct {
114 + Prefix []byte `protobuf:"bytes,1,opt,name=prefix" json:"prefix,omitempty"`
115 + Data []byte `protobuf:"bytes,2,opt,name=data" json:"data,omitempty"`
116 + XXX_unrecognized []byte `json:"-"`
117 +}
118 +
119 +func (m *Message_Block) Reset() { *m = Message_Block{} }
120 +func (m *Message_Block) String() string { return proto.CompactTextString(m) }
121 +func (*Message_Block) ProtoMessage() {}
122 +
123 +func (m *Message_Block) GetPrefix() []byte {
124 + if m != nil {
125 + return m.Prefix
126 + }
127 + return nil
128 +}
129 +
130 +func (m *Message_Block) GetData() []byte {
131 + if m != nil {
132 + return m.Data
133 + }
134 + return nil
135 +}
136 +
137 func init() {
138 + proto.RegisterType((*Message)(nil), "bitswap.message.pb.Message")
139 + proto.RegisterType((*Message_Wantlist)(nil), "bitswap.message.pb.Message.Wantlist")
140 + proto.RegisterType((*Message_Wantlist_Entry)(nil), "bitswap.message.pb.Message.Wantlist.Entry")
141 + proto.RegisterType((*Message_Block)(nil), "bitswap.message.pb.Message.Block")
142 }
exchange/bitswap/message/pb/message.proto
+6
@@ -14,6 +14,12 @@ message Message {
14 optional bool full = 2; // whether this is the full wantlist. default to false
15 }
16
17 + message Block {
18 + optional bytes prefix = 1;
19 + optional bytes data = 2;
20 + }
21 +
22 optional Wantlist wantlist = 1;
23 repeated bytes blocks = 2;
24 + repeated Block payload = 3;
25 }
exchange/bitswap/network/interface.go
+8 -3
@@ -4,13 +4,18 @@ import (
4 "context"
5
6 bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
7 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
8 protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
8 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
9 peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
10 )
11
12 -var ProtocolBitswap protocol.ID = "/ipfs/bitswap/1.0.0"
13 -var ProtocolBitswapOld protocol.ID = "/ipfs/bitswap"
12 +var (
13 + // These two are equivalent, legacy
14 + ProtocolBitswapOne protocol.ID = "/ipfs/bitswap/1.0.0"
15 + ProtocolBitswapNoVers protocol.ID = "/ipfs/bitswap"
16 +
17 + ProtocolBitswap protocol.ID = "/ipfs/bitswap/1.1.0"
18 +)
19
20 // BitSwapNetwork provides network connectivity for BitSwap sessions
21 type BitSwapNetwork interface {
exchange/bitswap/network/ipfs_impl.go
+26 -36
@@ -2,16 +2,17 @@ package network
2
3 import (
4 "context"
5 + "fmt"
6 "io"
7
8 bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
9
10 + routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing"
11 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
12 ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
11 - routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
13 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
14 pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
15 ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
14 - 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"
@@ -26,7 +27,8 @@ func NewFromIpfsHost(host host.Host, r routing.ContentRouting) BitSwapNetwork {
27 routing: r,
28 }
29 host.SetStreamHandler(ProtocolBitswap, bitswapNetwork.handleNewStream)
29 - host.SetStreamHandler(ProtocolBitswapOld, bitswapNetwork.handleNewStream)
30 + host.SetStreamHandler(ProtocolBitswapOne, bitswapNetwork.handleNewStream)
31 + host.SetStreamHandler(ProtocolBitswapNoVers, bitswapNetwork.handleNewStream)
32 host.Network().Notify((*netNotifiee)(&bitswapNetwork))
33 // TODO: StopNotify.
34
@@ -52,7 +54,25 @@ func (s *streamMessageSender) Close() error {
54 }
55
56 func (s *streamMessageSender) SendMsg(msg bsmsg.BitSwapMessage) error {
55 - return msg.ToNet(s.s)
57 + return msgToStream(s.s, msg)
58 +}
59 +
60 +func msgToStream(s inet.Stream, msg bsmsg.BitSwapMessage) error {
61 + switch s.Protocol() {
62 + case ProtocolBitswap:
63 + if err := msg.ToNetV1(s); err != nil {
64 + log.Debugf("error: %s", err)
65 + return err
66 + }
67 + case ProtocolBitswapOne, ProtocolBitswapNoVers:
68 + if err := msg.ToNetV0(s); err != nil {
69 + log.Debugf("error: %s", err)
70 + return err
71 + }
72 + default:
73 + return fmt.Errorf("unrecognized protocol on remote: %s", s.Protocol())
74 + }
75 + return nil
76 }
77
78 func (bsnet *impl) NewMessageSender(ctx context.Context, p peer.ID) (MessageSender, error) {
@@ -73,7 +93,7 @@ func (bsnet *impl) newStreamToPeer(ctx context.Context, p peer.ID) (inet.Stream,
93 return nil, err
94 }
95
76 - return bsnet.host.NewStream(ctx, p, ProtocolBitswap, ProtocolBitswapOld)
96 + return bsnet.host.NewStream(ctx, p, ProtocolBitswap, ProtocolBitswapOne, ProtocolBitswapNoVers)
97 }
98
99 func (bsnet *impl) SendMessage(
@@ -87,37 +107,7 @@ func (bsnet *impl) SendMessage(
107 }
108 defer s.Close()
109
90 - if err := outgoing.ToNet(s); err != nil {
91 - log.Debugf("error: %s", err)
92 - return err
93 - }
94 -
95 - return err
96 -}
97 -
98 -func (bsnet *impl) SendRequest(
99 - ctx context.Context,
100 - p peer.ID,
101 - outgoing bsmsg.BitSwapMessage) (bsmsg.BitSwapMessage, error) {
102 -
103 - s, err := bsnet.newStreamToPeer(ctx, p)
104 - if err != nil {
105 - return nil, err
106 - }
107 - defer s.Close()
108 -
109 - if err := outgoing.ToNet(s); err != nil {
110 - log.Debugf("error: %s", err)
111 - return nil, err
112 - }
113 -
114 - incoming, err := bsmsg.FromNet(s)
115 - if err != nil {
116 - log.Debugf("error: %s", err)
117 - return incoming, err
118 - }
119 -
120 - return incoming, nil
110 + return msgToStream(s, outgoing)
111 }
112
113 func (bsnet *impl) SetDelegate(r Receiver) {
exchange/bitswap/notifications/notifications.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 blocks "github.com/ipfs/go-ipfs/blocks"
7
8 pubsub "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/briantigerchow/pubsub"
9 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
9 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
10 )
11
12 const bufferSize = 16
exchange/bitswap/notifications/notifications_test.go
+1 -1
@@ -8,7 +8,7 @@ import (
8
9 blocks "github.com/ipfs/go-ipfs/blocks"
10 blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
11 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
11 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
12 )
13
14 func TestDuplicates(t *testing.T) {
exchange/bitswap/stat.go
+1 -1
@@ -3,7 +3,7 @@ package bitswap
3 import (
4 "sort"
5
6 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
6 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
7 )
8
9 type Stat struct {
exchange/bitswap/testnet/virtual.go
+2 -2
@@ -9,8 +9,8 @@ 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"
12 - routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
13 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
12 + routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing"
13 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
14 peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
15 )
16
exchange/bitswap/wantlist/wantlist.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "sort"
7 "sync"
8
9 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
9 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
10 )
11
12 type ThreadSafe struct {
exchange/bitswap/wantmanager.go
+1 -1
@@ -9,7 +9,7 @@ import (
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"
12 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
12 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
13 peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
14 )
15
exchange/bitswap/workers.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 process "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
10 procctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
11 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
12 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
12 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
13 peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
14 )
15
exchange/interface.go
+1 -1
@@ -7,7 +7,7 @@ import (
7
8 blocks "github.com/ipfs/go-ipfs/blocks"
9
10 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
10 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
11 )
12
13 // Any type that implements exchange.Interface may be used as an IPFS block
exchange/offline/offline.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 "github.com/ipfs/go-ipfs/blocks/blockstore"
10 exchange "github.com/ipfs/go-ipfs/exchange"
11
12 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
12 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
13 )
14
15 func Exchange(bs blockstore.Blockstore) exchange.Interface {
exchange/offline/offline_test.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 "github.com/ipfs/go-ipfs/blocks/blockstore"
9 "github.com/ipfs/go-ipfs/blocks/blocksutil"
10
11 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
11 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
12 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
13 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
14 ds_sync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
exchange/reprovide/reprovide.go
+1 -1
@@ -6,9 +6,9 @@ import (
6 "time"
7
8 blocks "github.com/ipfs/go-ipfs/blocks/blockstore"
9 + routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing"
10 backoff "gx/ipfs/QmPJUtEJsm5YLUWhF6imvyCH8KZXRJa9Wup7FDMwTy5Ufz/backoff"
11 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
11 - routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
12 )
13
14 var log = logging.Logger("reprovider")
fuse/ipns/ipns_unix.go
+1 -1
@@ -19,8 +19,8 @@ import (
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 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
23 key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
23 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
24 ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
25 )
26
fuse/readonly/ipfs_test.go
+1 -1
@@ -23,7 +23,7 @@ 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 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
26 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
27 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
28 )
29
merkledag/coding.go
+1 -1
@@ -6,8 +6,8 @@ import (
6
7 pb "github.com/ipfs/go-ipfs/merkledag/pb"
8
9 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
10 mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash"
10 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
11 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
12 )
13
merkledag/merkledag.go
+1 -1
@@ -12,7 +12,7 @@ import (
12 offline "github.com/ipfs/go-ipfs/exchange/offline"
13
14 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
15 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
15 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
16 )
17
18 var log = logging.Logger("merkledag")
merkledag/merkledag_test.go
+1 -1
@@ -22,7 +22,7 @@ import (
22 key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
23
24 "context"
25 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
25 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
26 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
27 )
28
merkledag/node.go
+1 -1
@@ -5,9 +5,9 @@ import (
5
6 "context"
7
8 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
9 mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash"
10 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/utils/diff.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 dag "github.com/ipfs/go-ipfs/merkledag"
9
10 context "context"
11 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
11 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
12 )
13
14 const (
merkledag/utils/utils_test.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 path "github.com/ipfs/go-ipfs/path"
9
10 context "context"
11 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
11 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
12 )
13
14 func TestAddLink(t *testing.T) {
mfs/mfs_test.go
+1 -1
@@ -24,7 +24,7 @@ import (
24 uio "github.com/ipfs/go-ipfs/unixfs/io"
25
26 "context"
27 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
27 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/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"
mfs/repub_test.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci"
8
9 "context"
10 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
10 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
11 )
12
13 func TestRepublisher(t *testing.T) {
mfs/system.go
+1 -1
@@ -19,7 +19,7 @@ import (
19
20 context "context"
21 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
22 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
22 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
23 )
24
25 var ErrNotExist = errors.New("no such rootfs")
namesys/namesys.go
+1 -1
@@ -6,7 +6,7 @@ import (
6
7 context "context"
8 path "github.com/ipfs/go-ipfs/path"
9 - routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
9 + routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing"
10 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
11 ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
12 )
namesys/publisher.go
+1 -1
@@ -14,7 +14,7 @@ import (
14 dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
15 ft "github.com/ipfs/go-ipfs/unixfs"
16
17 - routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
17 + routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing"
18 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
19 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
20 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
namesys/republisher/repub.go
+1 -1
@@ -11,10 +11,10 @@ import (
11 path "github.com/ipfs/go-ipfs/path"
12 dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
13
14 + routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing"
15 goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
16 gpctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
17 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
17 - routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
18 pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
19 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
20 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
namesys/routing.go
+2 -2
@@ -12,11 +12,11 @@ import (
12
13 pb "github.com/ipfs/go-ipfs/namesys/pb"
14 path "github.com/ipfs/go-ipfs/path"
15 - routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
15 + routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing"
16 key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
17
18 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
19 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
19 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
20 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
21 ci "gx/ipfs/QmfWDLQjGjVe4fr5CoztYW2DYYjRysMJrFe1RCsXLPTf46/go-libp2p-crypto"
22 )
package.json
+4 -4
@@ -207,9 +207,9 @@
207 },
208 {
209 "author": "whyrusleeping",
210 - "hash": "QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro",
210 + "hash": "QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z",
211 "name": "go-cid",
212 - "version": "0.5.2"
212 + "version": "0.6.0"
213 },
214 {
215 "author": "whyrusleeping",
@@ -254,9 +254,9 @@
254 "version": "0.1.2"
255 },
256 {
257 - "hash": "QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo",
257 + "hash": "QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn",
258 "name": "go-libp2p-kad-dht",
259 - "version": "2.1.0"
259 + "version": "2.2.0"
260 },
261 {
262 "author": "whyrusleeping",
path/path.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "path"
6 "strings"
7
8 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
8 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
9 )
10
11 // ErrBadPath is returned when a given path is incorrectly formatted
path/resolver.go
+1 -1
@@ -11,7 +11,7 @@ import (
11
12 merkledag "github.com/ipfs/go-ipfs/merkledag"
13 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
14 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
14 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
15 )
16
17 var log = logging.Logger("path")
pin/gc/gc.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 pin "github.com/ipfs/go-ipfs/pin"
9
10 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
11 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
11 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
12 )
13
14 var log = logging.Logger("gc")
pin/pin.go
+1 -1
@@ -13,7 +13,7 @@ import (
13
14 context "context"
15 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
16 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
16 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
17 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
18 )
19
pin/pin_test.go
+1 -1
@@ -10,7 +10,7 @@ import (
10 mdag "github.com/ipfs/go-ipfs/merkledag"
11
12 context "context"
13 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
13 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
14 "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
15 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
16 dssync "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore/sync"
pin/set.go
+1 -1
@@ -12,9 +12,9 @@ import (
12
13 "github.com/ipfs/go-ipfs/merkledag"
14 "github.com/ipfs/go-ipfs/pin/internal/pb"
15 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
16 "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
17 "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
17 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
18 )
19
20 const (
pin/set_test.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 dag "github.com/ipfs/go-ipfs/merkledag"
10 mdtest "github.com/ipfs/go-ipfs/merkledag/test"
11
12 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
12 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
13 )
14
15 func ignoreCids(_ *cid.Cid) {}
routing/mock/centralized_client.go
+2 -2
@@ -8,12 +8,12 @@ import (
8 dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
9 "github.com/ipfs/go-ipfs/thirdparty/testutil"
10
11 + routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing"
12 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
13 ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
13 - routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
14 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
15 pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
16 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
16 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
17 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
18 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
19 dhtpb "gx/ipfs/QmdM4ohF7cr4MvAECVeD3hRA3HtZrk1ngaek4n8ojVT87h/go-libp2p-record/pb"
routing/mock/centralized_server.go
+1 -1
@@ -8,8 +8,8 @@ import (
8
9 "github.com/ipfs/go-ipfs/thirdparty/testutil"
10
11 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
12 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"
15 peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
routing/mock/centralized_test.go
+1 -1
@@ -8,8 +8,8 @@ import (
8 delay "github.com/ipfs/go-ipfs/thirdparty/delay"
9 "github.com/ipfs/go-ipfs/thirdparty/testutil"
10
11 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
12 pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
12 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
13 u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
14 )
15
routing/mock/dht.go
+1 -1
@@ -3,7 +3,7 @@ package mockrouting
3 import (
4 context "context"
5 "github.com/ipfs/go-ipfs/thirdparty/testutil"
6 - dht "gx/ipfs/QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo/go-libp2p-kad-dht"
6 + dht "gx/ipfs/QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn/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"
routing/mock/interface.go
+2 -2
@@ -10,9 +10,9 @@ import (
10 delay "github.com/ipfs/go-ipfs/thirdparty/delay"
11 "github.com/ipfs/go-ipfs/thirdparty/testutil"
12
13 - routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
13 + routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing"
14 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
15 pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
15 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
16 ds "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
17 peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
18 )
routing/none/none_client.go
+2 -2
@@ -6,10 +6,10 @@ import (
6
7 repo "github.com/ipfs/go-ipfs/repo"
8
9 + routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing"
10 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
10 - routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
11 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
12 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 )
routing/offline/offline.go
+2 -2
@@ -7,11 +7,11 @@ import (
7
8 dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
9
10 + routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing"
11 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
11 - routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
12 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
13 pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
14 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
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"
routing/supernode/client.go
+3 -3
@@ -8,13 +8,13 @@ import (
8
9 proxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
10
11 - dhtpb "gx/ipfs/QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo/go-libp2p-kad-dht/pb"
11 + routing "gx/ipfs/QmNUgVQTYnXQVrGT2rajZYsuKV8GYdiL91cdZSQDKNPNgE/go-libp2p-routing"
12 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
13 loggables "gx/ipfs/QmTMy4hVSY28DdwJ9kBz6y7q6MuioFzPcpM3Ma3aPjo1i3/go-libp2p-loggables"
14 - routing "gx/ipfs/QmXKuGUzLcgoQvp8M6ZEJzupWUNmx8NoqXEbYLMDjL4rjj/go-libp2p-routing"
14 + dhtpb "gx/ipfs/QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn/go-libp2p-kad-dht/pb"
15 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
16 pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
17 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
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"
routing/supernode/proxy/loopback.go
+1 -1
@@ -2,7 +2,7 @@ package proxy
2
3 import (
4 context "context"
5 - dhtpb "gx/ipfs/QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo/go-libp2p-kad-dht/pb"
5 + dhtpb "gx/ipfs/QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn/go-libp2p-kad-dht/pb"
6 ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
7 inet "gx/ipfs/QmdXimY9QHaasZmw6hWojWnCJvfgxETjZQfg9g6ZrA9wMX/go-libp2p-net"
8 peer "gx/ipfs/QmfMmLGoKzCHDN7cGgk64PJr4iipzidDRME8HABSJqvmhC/go-libp2p-peer"
routing/supernode/proxy/standard.go
+1 -1
@@ -4,10 +4,10 @@ import (
4 "context"
5 "errors"
6
7 - dhtpb "gx/ipfs/QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo/go-libp2p-kad-dht/pb"
7 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
8 loggables "gx/ipfs/QmTMy4hVSY28DdwJ9kBz6y7q6MuioFzPcpM3Ma3aPjo1i3/go-libp2p-loggables"
9 kbucket "gx/ipfs/QmUKePKcUEXwdvJENZJ6z8mJjPaxLsDZ3V9CZjPPtyawPm/go-libp2p-kbucket"
10 + dhtpb "gx/ipfs/QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn/go-libp2p-kad-dht/pb"
11 pstore "gx/ipfs/QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo/go-libp2p-peerstore"
12 ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
13 host "gx/ipfs/QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki/go-libp2p-host"
routing/supernode/server.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 proxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
8
9 context "context"
10 - dhtpb "gx/ipfs/QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo/go-libp2p-kad-dht/pb"
10 + dhtpb "gx/ipfs/QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn/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"
routing/supernode/server_test.go
+1 -1
@@ -3,7 +3,7 @@ package supernode
3 import (
4 "testing"
5
6 - dhtpb "gx/ipfs/QmRDMP3Y9E6hZtJwcFii8F6RTUSDn67Hi2o5VFTBXNRioo/go-libp2p-kad-dht/pb"
6 + dhtpb "gx/ipfs/QmWHiyk5y2EKgxHogFJ4Zt1xTqKeVsBc4zcBke8ie9C2Bn/go-libp2p-kad-dht/pb"
7 key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
8 datastore "gx/ipfs/QmbzuUusHqaLLoNTDEVLcSF6vZDHZDLPC7p4bztRvvkXxU/go-datastore"
9 )
test/integration/bitswap_wo_routing_test.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 "github.com/ipfs/go-ipfs/core/mock"
10
11 context "context"
12 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
12 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
13 mocknet "gx/ipfs/QmcRa2qn6iCmap9bjp8jAwkvYAq13AUfxdY3rrYiaJbLum/go-libp2p/p2p/net/mock"
14 )
15
unixfs/io/dirbuilder.go
+1 -1
@@ -5,7 +5,7 @@ import (
5
6 mdag "github.com/ipfs/go-ipfs/merkledag"
7 format "github.com/ipfs/go-ipfs/unixfs"
8 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
8 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
9 )
10
11 type directoryBuilder struct {
unixfs/mod/dagmodifier.go
+1 -1
@@ -15,8 +15,8 @@ import (
15
16 context "context"
17 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
18 + cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
19 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
19 - cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
20 )
21
22 var ErrSeekFail = errors.New("failed to seek properly")