Merge pull request #3297 from ipfs/feat/bitswap-cid

bitswap: protocol extension to handle cids

Merge pull request #3297 from ipfs/feat/bitswap-cid
bitswap: protocol extension to handle cids
7d6ffbdf · Jeromy Johnson · GitHub · b7b352fe · a3c90040 · 7d6ffbdf
Commit 7d6ffbdf authored Oct 12, 2016 by Jeromy Johnson Committed by GitHub Oct 12, 2016
Showing with 6 additions and 6 deletions

coding.go coding.go +1 -1

merkledag.go merkledag.go +1 -1

merkledag_test.go merkledag_test.go +1 -1

node.go node.go +1 -1

utils/diff.go utils/diff.go +1 -1

utils/utils_test.go utils/utils_test.go +1 -1

No files found.
--- a/coding.go
+++ b/coding.go
@@ -6,8 +6,8 @@ import (

 	pb "github.com/ipfs/go-ipfs/merkledag/pb"

+	cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
 	mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash"
-	cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
 	u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
 )


--- a/merkledag.go
+++ b/merkledag.go
@@ -12,7 +12,7 @@ import (
 	offline "github.com/ipfs/go-ipfs/exchange/offline"

 	logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
-	cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
+	cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
 )

 var log = logging.Logger("merkledag")

--- a/merkledag_test.go
+++ b/merkledag_test.go
@@ -22,7 +22,7 @@ import (
 	key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"

 	"context"
-	cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
+	cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
 	u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
 )


--- a/node.go
+++ b/node.go
@@ -5,9 +5,9 @@ import (

 	"context"

+	cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
 	mh "gx/ipfs/QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J/go-multihash"
 	key "gx/ipfs/QmYEoKZXHoAToWfhGF3vryhMn3WWhE1o2MasQ8uzY5iDi9/go-key"
-	cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
 )

 var ErrLinkNotFound = fmt.Errorf("no link by that name")

--- a/utils/diff.go
+++ b/utils/diff.go
@@ -8,7 +8,7 @@ import (
 	dag "github.com/ipfs/go-ipfs/merkledag"

 	context "context"
-	cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
+	cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
 )

 const (

--- a/utils/utils_test.go
+++ b/utils/utils_test.go
@@ -8,7 +8,7 @@ import (
 	path "github.com/ipfs/go-ipfs/path"

 	context "context"
-	cid "gx/ipfs/QmakyCk6Vnn16WEKjbkxieZmM2YLTzkFWizbmGowoYPjro/go-cid"
+	cid "gx/ipfs/QmXUuRadqDq5BuFWzVU6VuKaSjTcNm1gNCtLvvP1TJCW4z/go-cid"
 )

 func TestAddLink(t *testing.T) {