diff --git a/addr/sorting.go b/addr/sorting.go index afeab08..f66dc6c 100644 --- a/addr/sorting.go +++ b/addr/sorting.go @@ -3,8 +3,8 @@ package addr import ( "bytes" - mafmt "gx/ipfs/QmQscWDtDBDsWAM58aY6gU2KtxyFFmvvZgdfJExYPLgtXA/mafmt" - manet "gx/ipfs/QmV6FjemM1K8oXjrvuq3wuVWWoU2TLDPmNnKrxHzY3v6Ai/go-multiaddr-net" + "gx/ipfs/QmQscWDtDBDsWAM58aY6gU2KtxyFFmvvZgdfJExYPLgtXA/mafmt" + "gx/ipfs/QmV6FjemM1K8oXjrvuq3wuVWWoU2TLDPmNnKrxHzY3v6Ai/go-multiaddr-net" ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr" ) diff --git a/ds/addr_manager.go b/ds/addr_manager.go index 2bf8c28..2b0fb55 100644 --- a/ds/addr_manager.go +++ b/ds/addr_manager.go @@ -5,8 +5,6 @@ import ( "sync" "time" - pstore "github.com/libp2p/go-libp2p-peerstore" - "github.com/libp2p/go-libp2p-peerstore/mem" mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash" "gx/ipfs/QmQjMHF8ptRgx4E57UFMiT4YM6kqaJeYxZ1MCDX23aw4rK/golang-lru" "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" @@ -14,6 +12,9 @@ import ( ds "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore/query" ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr" + + pstore "github.com/libp2p/go-libp2p-peerstore" + "github.com/libp2p/go-libp2p-peerstore/mem" ) var log = logging.Logger("peerstore/ds") diff --git a/ds/ds_test.go b/ds/ds_test.go index b2f70c0..7e1d608 100644 --- a/ds/ds_test.go +++ b/ds/ds_test.go @@ -7,10 +7,11 @@ import ( "testing" "time" - "github.com/libp2p/go-libp2p-peerstore" - "github.com/libp2p/go-libp2p-peerstore/test" "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" "gx/ipfs/QmUCfrikzKVGAfpE31RPwPd32fu1DYxSG7HTGCadba5Wza/go-ds-badger" + + "github.com/libp2p/go-libp2p-peerstore" + "github.com/libp2p/go-libp2p-peerstore/test" ) func setupBadgerDatastore(t testing.TB) (datastore.Batching, func()) { diff --git a/ds/peerstore.go b/ds/peerstore.go index 8e2070a..cb96fec 100644 --- a/ds/peerstore.go +++ b/ds/peerstore.go @@ -4,9 +4,10 @@ import ( "context" "time" + "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" + pstore "github.com/libp2p/go-libp2p-peerstore" "github.com/libp2p/go-libp2p-peerstore/mem" - "gx/ipfs/QmSpg1CvpXQQow5ernt1gNBXaXV6yxyNqi7XoeerWfzB5w/go-datastore" ) // NewPeerstore creates a peerstore backed by the provided persistent datastore. diff --git a/mem/addr_manager.go b/mem/addr_manager.go index 210b0e2..8a7c3c6 100644 --- a/mem/addr_manager.go +++ b/mem/addr_manager.go @@ -6,11 +6,12 @@ import ( "sync" "time" - pstore "github.com/libp2p/go-libp2p-peerstore" - "github.com/libp2p/go-libp2p-peerstore/addr" "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log" ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr" + + pstore "github.com/libp2p/go-libp2p-peerstore" + "github.com/libp2p/go-libp2p-peerstore/addr" ) var log = logging.Logger("peerstore") diff --git a/mem/keybook.go b/mem/keybook.go index 6d9b012..ddfe1e0 100644 --- a/mem/keybook.go +++ b/mem/keybook.go @@ -4,9 +4,10 @@ import ( "errors" "sync" - pstore "github.com/libp2p/go-libp2p-peerstore" ic "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" + + pstore "github.com/libp2p/go-libp2p-peerstore" ) type memoryKeyBook struct { diff --git a/mem/metadata.go b/mem/metadata.go index 0908fb5..4a56035 100644 --- a/mem/metadata.go +++ b/mem/metadata.go @@ -3,8 +3,9 @@ package mem import ( "sync" - pstore "github.com/libp2p/go-libp2p-peerstore" "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" + + pstore "github.com/libp2p/go-libp2p-peerstore" ) type memoryPeerMetadata struct { diff --git a/metrics_test.go b/metrics_test.go index 63aef40..a69e2fb 100644 --- a/metrics_test.go +++ b/metrics_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - testutil "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer/test" + "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer/test" ) func TestLatencyEWMAFun(t *testing.T) { diff --git a/peerinfo_test.go b/peerinfo_test.go index ae80f0c..eaff197 100644 --- a/peerinfo_test.go +++ b/peerinfo_test.go @@ -3,7 +3,7 @@ package peerstore import ( "testing" - peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" + "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr" ) diff --git a/queue/distance.go b/queue/distance.go index ca67ea8..b33363d 100644 --- a/queue/distance.go +++ b/queue/distance.go @@ -5,7 +5,7 @@ import ( "math/big" "sync" - peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" + "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" ks "gx/ipfs/QmUusaX99BZoELh7dmPgirqRQ1FAmMnmnBn3oiqDFGBUSc/go-keyspace" ) diff --git a/queue/interface.go b/queue/interface.go index 44ba1ca..321f5f3 100644 --- a/queue/interface.go +++ b/queue/interface.go @@ -1,6 +1,6 @@ package queue -import peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" +import "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" // PeerQueue maintains a set of peers ordered according to a metric. // Implementations of PeerQueue could order peers based on distances along diff --git a/queue/queue_test.go b/queue/queue_test.go index cc91118..15a6e00 100644 --- a/queue/queue_test.go +++ b/queue/queue_test.go @@ -8,7 +8,7 @@ import ( "time" mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash" - peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" + "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" ) func TestQueue(t *testing.T) { diff --git a/queue/sync.go b/queue/sync.go index 12bc24a..830fdeb 100644 --- a/queue/sync.go +++ b/queue/sync.go @@ -3,7 +3,7 @@ package queue import ( "context" - peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" + "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log" ) diff --git a/test/addr_manager_suite.go b/test/addr_manager_suite.go index 4b29efa..a66918c 100644 --- a/test/addr_manager_suite.go +++ b/test/addr_manager_suite.go @@ -4,9 +4,10 @@ import ( "testing" "time" - pstore "github.com/libp2p/go-libp2p-peerstore" "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr" + + pstore "github.com/libp2p/go-libp2p-peerstore" ) var addressBookSuite = map[string]func(book pstore.AddrBook) func(*testing.T){ diff --git a/test/peerstore_suite.go b/test/peerstore_suite.go index 5d1a81b..fdecd20 100644 --- a/test/peerstore_suite.go +++ b/test/peerstore_suite.go @@ -8,10 +8,11 @@ import ( "testing" "time" - pstore "github.com/libp2p/go-libp2p-peerstore" "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr" + + pstore "github.com/libp2p/go-libp2p-peerstore" ) var peerstoreSuite = map[string]func(book pstore.Peerstore) func(*testing.T){ diff --git a/test/test_utils.go b/test/test_utils.go index 26ab537..4d0b90a 100644 --- a/test/test_utils.go +++ b/test/test_utils.go @@ -7,7 +7,7 @@ import ( mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash" ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto" - peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" + "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer" ) func timeSeededRand() io.Reader {