From c1161d225e09bb6c49b9948be8d8d299571ccfe7 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Sun, 6 Dec 2015 23:00:10 -0800 Subject: [PATCH] WIP --- addr/addrsrcs.go | 2 +- addr/addrsrcs_test.go | 2 +- addr_manager.go | 2 +- addr_manager_test.go | 2 +- peer.go | 10 +++++----- peer_test.go | 4 ++-- peerstore.go | 2 +- queue/distance.go | 2 +- queue/queue_test.go | 4 ++-- queue/sync.go | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/addr/addrsrcs.go b/addr/addrsrcs.go index ae9073a..a172373 100644 --- a/addr/addrsrcs.go +++ b/addr/addrsrcs.go @@ -2,7 +2,7 @@ package addr import ( - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" ) // AddrSource is a source of addresses. It allows clients to retrieve diff --git a/addr/addrsrcs_test.go b/addr/addrsrcs_test.go index 173fbca..4614064 100644 --- a/addr/addrsrcs_test.go +++ b/addr/addrsrcs_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" ) func newAddrOrFatal(t *testing.T, s string) ma.Multiaddr { diff --git a/addr_manager.go b/addr_manager.go index 1129b06..87b8206 100644 --- a/addr_manager.go +++ b/addr_manager.go @@ -4,7 +4,7 @@ import ( "sync" "time" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" ) const ( diff --git a/addr_manager_test.go b/addr_manager_test.go index 59bcf19..0de0c6a 100644 --- a/addr_manager_test.go +++ b/addr_manager_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" ) func IDS(t *testing.T, ids string) ID { diff --git a/peer.go b/peer.go index 0e7c009..2f2a486 100644 --- a/peer.go +++ b/peer.go @@ -7,13 +7,13 @@ import ( "fmt" "strings" - b58 "gx/QmNsoHoCVhgXcv1Yg45jtkMgimxorTAN36fV9AQMFXHHAQ/go-base58" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" - mh "gx/Qma7dqy7ZVH4tkNJdC9TRrA82Uz5fQfbbwuvmNVVc17r7a/go-multihash" + b58 "github.com/jbenet/go-base58" + ma "github.com/jbenet/go-multiaddr" + mh "github.com/jbenet/go-multihash" + u "github.com/ipfs/go-ipfs-util" ic "github.com/ipfs/go-libp2p/p2p/crypto" - u "gx/QmQA79FfVsUnGkH3TgKDqcDkupfjqLSJ6EYwDuDDZK8nhD/go-ipfs-util" - logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log" + logging "github.com/ipfs/go-log" ) var log = logging.Logger("peer") diff --git a/peer_test.go b/peer_test.go index 3ad9c23..93cbfc8 100644 --- a/peer_test.go +++ b/peer_test.go @@ -6,12 +6,12 @@ import ( "strings" "testing" + u "github.com/ipfs/go-ipfs-util" ic "github.com/ipfs/go-libp2p/p2p/crypto" . "github.com/ipfs/go-libp2p/p2p/peer" tu "github.com/ipfs/go-libp2p/testutil" - u "gx/QmQA79FfVsUnGkH3TgKDqcDkupfjqLSJ6EYwDuDDZK8nhD/go-ipfs-util" - b58 "gx/QmNsoHoCVhgXcv1Yg45jtkMgimxorTAN36fV9AQMFXHHAQ/go-base58" + b58 "github.com/jbenet/go-base58" ) var gen1 keyset // generated diff --git a/peerstore.go b/peerstore.go index ef86182..f8e8875 100644 --- a/peerstore.go +++ b/peerstore.go @@ -9,7 +9,7 @@ import ( //ds "github.com/jbenet/go-datastore" //dssync "github.com/jbenet/go-datastore/sync" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" ) const ( diff --git a/queue/distance.go b/queue/distance.go index beb7605..09da0cb 100644 --- a/queue/distance.go +++ b/queue/distance.go @@ -6,7 +6,7 @@ import ( "sync" peer "github.com/ipfs/go-libp2p/p2p/peer" - ks "gx/QmThbzo9oBE7FAVmgjp3xYv5Yra81uB7KXbrTei47gWT6o/go-keyspace" + ks "github.com/whyrusleeping/go-keyspace" ) // peerMetric tracks a peer and its distance to something else. diff --git a/queue/queue_test.go b/queue/queue_test.go index ca449fe..8d43bb6 100644 --- a/queue/queue_test.go +++ b/queue/queue_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" + u "github.com/ipfs/go-ipfs-util" peer "github.com/ipfs/go-libp2p/p2p/peer" - u "gx/QmQA79FfVsUnGkH3TgKDqcDkupfjqLSJ6EYwDuDDZK8nhD/go-ipfs-util" - context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" + context "golang.org/x/net/context" ) func TestQueue(t *testing.T) { diff --git a/queue/sync.go b/queue/sync.go index ccece46..fd49e00 100644 --- a/queue/sync.go +++ b/queue/sync.go @@ -2,8 +2,8 @@ package queue import ( peer "github.com/ipfs/go-libp2p/p2p/peer" - context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" - logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log" + logging "github.com/ipfs/go-log" + context "golang.org/x/net/context" ) var log = logging.Logger("peerqueue")