From aaea36ca257e7e766767756793a48b38f2571945 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Fri, 3 Feb 2017 13:05:16 -0800 Subject: [PATCH] gx publish 1.6.9 --- .gx/lastpubver | 2 +- dial_sync.go | 2 +- dial_sync_test.go | 2 +- dial_test.go | 14 +++++++------- limiter.go | 8 ++++---- limiter_test.go | 8 ++++---- package.json | 14 +++++++------- peers_test.go | 6 +++--- simul_test.go | 8 ++++---- swarm.go | 46 ++++++++++++++++++++++----------------------- swarm_addr.go | 6 +++--- swarm_addr_test.go | 10 +++++----- swarm_conn.go | 12 ++++++------ swarm_dial.go | 10 +++++----- swarm_listen.go | 16 ++++++++-------- swarm_net.go | 14 +++++++------- swarm_net_test.go | 8 ++++---- swarm_notif_test.go | 6 +++--- swarm_stream.go | 6 +++--- swarm_test.go | 12 ++++++------ 20 files changed, 105 insertions(+), 105 deletions(-) diff --git a/.gx/lastpubver b/.gx/lastpubver index e41d60d..fe8f121 100644 --- a/.gx/lastpubver +++ b/.gx/lastpubver @@ -1 +1 @@ -1.6.8: QmULAo6HNy44a42EFu4XAYGijM8LXoKu44FKxWvCgTJvhG +1.6.9: QmaFqAnaS7FrvKL6XVyRAcRdagP5PS3t2F9uXjxoMUSzxt diff --git a/dial_sync.go b/dial_sync.go index d22acb6..69739e5 100644 --- a/dial_sync.go +++ b/dial_sync.go @@ -4,7 +4,7 @@ import ( "context" "sync" - peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer" + peer "github.com/libp2p/go-libp2p-peer" ) type DialFunc func(context.Context, peer.ID) (*Conn, error) diff --git a/dial_sync_test.go b/dial_sync_test.go index bb189d2..0d70e22 100644 --- a/dial_sync_test.go +++ b/dial_sync_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer" + peer "github.com/libp2p/go-libp2p-peer" ) func getMockDialFunc() (DialFunc, func(), context.Context, <-chan struct{}) { diff --git a/dial_test.go b/dial_test.go index 84df140..dabb0bd 100644 --- a/dial_test.go +++ b/dial_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr" - manet "gx/ipfs/QmVCNGTyD4EkvNYaAp253uMQ9Rjsjy2oGMvcdJJUoVRfja/go-multiaddr-net" - addrutil "gx/ipfs/Qmb86KiitngVm5AGQ18viwCBwwcTvULAtz3X74YWKAevnc/go-addr-util" - peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer" - testutil "gx/ipfs/QmbN6CcaGuVSWwhYq5nDQs98hWHgu5PTBgVjnGV28YeGRk/go-testutil" - ci "gx/ipfs/QmbN6CcaGuVSWwhYq5nDQs98hWHgu5PTBgVjnGV28YeGRk/go-testutil/ci" - pstore "gx/ipfs/QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf/go-libp2p-peerstore" + addrutil "github.com/libp2p/go-addr-util" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" + testutil "github.com/libp2p/go-testutil" + ci "github.com/libp2p/go-testutil/ci" + ma "github.com/multiformats/go-multiaddr" + manet "github.com/multiformats/go-multiaddr-net" ) func closeSwarms(swarms []*Swarm) { diff --git a/limiter.go b/limiter.go index db29b87..67c6af4 100644 --- a/limiter.go +++ b/limiter.go @@ -4,10 +4,10 @@ import ( "context" "sync" - iconn "gx/ipfs/QmNmKcQiJB5cUTXXXS1o44s4PdeYevmH8aHhQJCGYjwBj3/go-libp2p-interface-conn" - ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr" - addrutil "gx/ipfs/Qmb86KiitngVm5AGQ18viwCBwwcTvULAtz3X74YWKAevnc/go-addr-util" - peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer" + addrutil "github.com/libp2p/go-addr-util" + iconn "github.com/libp2p/go-libp2p-interface-conn" + peer "github.com/libp2p/go-libp2p-peer" + ma "github.com/multiformats/go-multiaddr" ) type dialResult struct { diff --git a/limiter_test.go b/limiter_test.go index 948e7f1..cbb6afd 100644 --- a/limiter_test.go +++ b/limiter_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - iconn "gx/ipfs/QmNmKcQiJB5cUTXXXS1o44s4PdeYevmH8aHhQJCGYjwBj3/go-libp2p-interface-conn" - ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr" - mafmt "gx/ipfs/QmYjJnSTfXWhYL2cV1xFphPqjqowJqH7ZKLA1As8QrPHbn/mafmt" - peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer" + iconn "github.com/libp2p/go-libp2p-interface-conn" + peer "github.com/libp2p/go-libp2p-peer" + ma "github.com/multiformats/go-multiaddr" + mafmt "github.com/whyrusleeping/mafmt" ) func mustAddr(t *testing.T, s string) ma.Multiaddr { diff --git a/package.json b/package.json index c23a560..5485ecf 100644 --- a/package.json +++ b/package.json @@ -9,19 +9,19 @@ "gxDependencies": [ { "author": "whyrusleeping", - "hash": "QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR", + "hash": "Qmcu7ebuPAPnCqJy29WJrpEFQaFWpW2krmrPtYqbQ2BPti", "name": "go-libp2p-net", "version": "1.6.1" }, { "author": "whyrusleeping", - "hash": "QmTuX6VtWTbWgPwd5PMXHyp411RKsW5nBqLKVVRfJMNneb", + "hash": "QmNiCwBNA8MWDADTFVq1BonUEJbS2SvjAoNkZZrhEwcuUi", "name": "go-libp2p-crypto", "version": "1.3.1" }, { "author": "whyrusleeping", - "hash": "QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf", + "hash": "QmQMQ2RUjnaEEX8ybmrhuFFGhAwPjyL1Eo6ZoJGD7aAccM", "name": "go-libp2p-peerstore", "version": "1.4.0" }, @@ -75,19 +75,19 @@ }, { "author": "whyrusleeping", - "hash": "QmPfeoLzBPsiwbHLwev8ecgjd1RPCYfsAHhdFA8avEnXQm", + "hash": "QmS8W8Jyk63qtvqhdZzSi7GvaTZ2SnZ31gkKyGYU6kRa6Z", "name": "go-libp2p-metrics", "version": "1.6.1" }, { "author": "whyrusleeping", - "hash": "Qmf8Br5gq5XgMrSA6Y6dzY3kaBWwJu6aqXJxxuxCCKsbyD", + "hash": "QmX11nfjBjzgHSWPxeyzbRzbhxKpvrtsfRWPGtjCR6toJb", "name": "go-libp2p-conn", "version": "1.5.6" }, { "author": "whyrusleeping", - "hash": "QmXJfmGL3GycHcuqft7vvhf6Xhzad6nuTiEnoEWwAv3zcd", + "hash": "QmUE7L9KeQswGjZi1vgyFMEyXWgZeo6HWiyNzMxzeNM4o1", "name": "go-tcp-transport", "version": "1.1.0" } @@ -97,6 +97,6 @@ "license": "", "name": "go-libp2p-swarm", "releaseCmd": "git commit -a -m \"gx publish $VERSION\"", - "version": "1.6.8" + "version": "1.6.9" } diff --git a/peers_test.go b/peers_test.go index 28d6d14..3259264 100644 --- a/peers_test.go +++ b/peers_test.go @@ -4,9 +4,9 @@ import ( "testing" "context" - ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr" - peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer" - pstore "gx/ipfs/QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf/go-libp2p-peerstore" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" + ma "github.com/multiformats/go-multiaddr" ) func TestPeers(t *testing.T) { diff --git a/simul_test.go b/simul_test.go index c6d1195..8935773 100644 --- a/simul_test.go +++ b/simul_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr" - peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer" - ci "gx/ipfs/QmbN6CcaGuVSWwhYq5nDQs98hWHgu5PTBgVjnGV28YeGRk/go-testutil/ci" - pstore "gx/ipfs/QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf/go-libp2p-peerstore" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" + ci "github.com/libp2p/go-testutil/ci" + ma "github.com/multiformats/go-multiaddr" ) func TestSimultOpen(t *testing.T) { diff --git a/swarm.go b/swarm.go index 90ec067..6eba8f8 100644 --- a/swarm.go +++ b/swarm.go @@ -11,29 +11,29 @@ import ( "sync" "time" - metrics "gx/ipfs/QmPfeoLzBPsiwbHLwev8ecgjd1RPCYfsAHhdFA8avEnXQm/go-libp2p-metrics" - mconn "gx/ipfs/QmPfeoLzBPsiwbHLwev8ecgjd1RPCYfsAHhdFA8avEnXQm/go-libp2p-metrics/conn" - transport "gx/ipfs/QmR4YrM1DdvYmox249o8aday8oiotkcsT1Qzv42ujPEQDb/go-libp2p-transport" - psmss "gx/ipfs/QmRVYfZ7tWNHPBzWiG6KWGzvT2hcGems8srihsQE29x1U5/go-smux-multistream" - "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess" - goprocessctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context" - mafilter "gx/ipfs/QmSMZwvs3n4GBikZ7hKzT17c3bk65FmyZo2JqtJ16swqCv/multiaddr-filter" - ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr" - logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - ps "gx/ipfs/QmSxPTJ2Jb3nekq3AGMgDyXZR3dhPrSPVSggT3FqJWw4Sa/go-peerstream" - inet "gx/ipfs/QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR/go-libp2p-net" - ci "gx/ipfs/QmTuX6VtWTbWgPwd5PMXHyp411RKsW5nBqLKVVRfJMNneb/go-libp2p-crypto" - filter "gx/ipfs/QmUuCcuet4eneEzto6PxvoC1MrHcxszy7MALrWSKH9inLy/go-maddr-filter" - ipnet "gx/ipfs/QmWNwP8oYzPUK6LqYEH1hoTMuVmQUUbhKQgHeT1AENGkEm/go-libp2p-interface-pnet" - spdy "gx/ipfs/QmWUNsat6Jb19nC5CiJCDXepTkxjdxi3eZqeoB6mrmmaGu/go-smux-spdystream" - tcpt "gx/ipfs/QmXJfmGL3GycHcuqft7vvhf6Xhzad6nuTiEnoEWwAv3zcd/go-tcp-transport" - addrutil "gx/ipfs/Qmb86KiitngVm5AGQ18viwCBwwcTvULAtz3X74YWKAevnc/go-addr-util" - peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer" - yamux "gx/ipfs/Qmbn7RYyWzBVXiUp9jZ1dA4VADHy9DtS7iZLwfhEUQvm3U/go-smux-yamux" - ws "gx/ipfs/QmeHbitozRtLYuPrtpcAoJFJixZzTctPtkSsBQGSQuz8pG/ws-transport" - pst "gx/ipfs/QmeZBgYBHvxMukGK5ojg28BCNLB9SeXqT7XXg6o7r2GbJy/go-stream-muxer" - pstore "gx/ipfs/QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf/go-libp2p-peerstore" - conn "gx/ipfs/Qmf8Br5gq5XgMrSA6Y6dzY3kaBWwJu6aqXJxxuxCCKsbyD/go-libp2p-conn" + logging "github.com/ipfs/go-log" + pst "github.com/jbenet/go-stream-muxer" + "github.com/jbenet/goprocess" + goprocessctx "github.com/jbenet/goprocess/context" + addrutil "github.com/libp2p/go-addr-util" + conn "github.com/libp2p/go-libp2p-conn" + ci "github.com/libp2p/go-libp2p-crypto" + ipnet "github.com/libp2p/go-libp2p-interface-pnet" + metrics "github.com/libp2p/go-libp2p-metrics" + mconn "github.com/libp2p/go-libp2p-metrics/conn" + inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" + transport "github.com/libp2p/go-libp2p-transport" + filter "github.com/libp2p/go-maddr-filter" + ps "github.com/libp2p/go-peerstream" + tcpt "github.com/libp2p/go-tcp-transport" + ma "github.com/multiformats/go-multiaddr" + psmss "github.com/whyrusleeping/go-smux-multistream" + spdy "github.com/whyrusleeping/go-smux-spdystream" + yamux "github.com/whyrusleeping/go-smux-yamux" + mafilter "github.com/whyrusleeping/multiaddr-filter" + ws "github.com/whyrusleeping/ws-transport" ) var log = logging.Logger("swarm2") diff --git a/swarm_addr.go b/swarm_addr.go index 518138f..78a3f53 100644 --- a/swarm_addr.go +++ b/swarm_addr.go @@ -1,9 +1,9 @@ package swarm import ( - iconn "gx/ipfs/QmNmKcQiJB5cUTXXXS1o44s4PdeYevmH8aHhQJCGYjwBj3/go-libp2p-interface-conn" - ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr" - addrutil "gx/ipfs/Qmb86KiitngVm5AGQ18viwCBwwcTvULAtz3X74YWKAevnc/go-addr-util" + addrutil "github.com/libp2p/go-addr-util" + iconn "github.com/libp2p/go-libp2p-interface-conn" + ma "github.com/multiformats/go-multiaddr" ) // ListenAddresses returns a list of addresses at which this swarm listens. diff --git a/swarm_addr_test.go b/swarm_addr_test.go index e9db369..011b706 100644 --- a/swarm_addr_test.go +++ b/swarm_addr_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - metrics "gx/ipfs/QmPfeoLzBPsiwbHLwev8ecgjd1RPCYfsAHhdFA8avEnXQm/go-libp2p-metrics" - ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr" - addrutil "gx/ipfs/Qmb86KiitngVm5AGQ18viwCBwwcTvULAtz3X74YWKAevnc/go-addr-util" - testutil "gx/ipfs/QmbN6CcaGuVSWwhYq5nDQs98hWHgu5PTBgVjnGV28YeGRk/go-testutil" - pstore "gx/ipfs/QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf/go-libp2p-peerstore" + addrutil "github.com/libp2p/go-addr-util" + metrics "github.com/libp2p/go-libp2p-metrics" + pstore "github.com/libp2p/go-libp2p-peerstore" + testutil "github.com/libp2p/go-testutil" + ma "github.com/multiformats/go-multiaddr" ) func TestFilterAddrs(t *testing.T) { diff --git a/swarm_conn.go b/swarm_conn.go index f40dbdb..0b0c626 100644 --- a/swarm_conn.go +++ b/swarm_conn.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - iconn "gx/ipfs/QmNmKcQiJB5cUTXXXS1o44s4PdeYevmH8aHhQJCGYjwBj3/go-libp2p-interface-conn" - ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr" - ps "gx/ipfs/QmSxPTJ2Jb3nekq3AGMgDyXZR3dhPrSPVSggT3FqJWw4Sa/go-peerstream" - inet "gx/ipfs/QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR/go-libp2p-net" - ic "gx/ipfs/QmTuX6VtWTbWgPwd5PMXHyp411RKsW5nBqLKVVRfJMNneb/go-libp2p-crypto" - peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer" + ic "github.com/libp2p/go-libp2p-crypto" + iconn "github.com/libp2p/go-libp2p-interface-conn" + inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + ps "github.com/libp2p/go-peerstream" + ma "github.com/multiformats/go-multiaddr" ) // Conn is a simple wrapper around a ps.Conn that also exposes diff --git a/swarm_dial.go b/swarm_dial.go index 84da324..c7cfe91 100644 --- a/swarm_dial.go +++ b/swarm_dial.go @@ -7,11 +7,11 @@ import ( "sync" "time" - iconn "gx/ipfs/QmNmKcQiJB5cUTXXXS1o44s4PdeYevmH8aHhQJCGYjwBj3/go-libp2p-interface-conn" - ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr" - lgbl "gx/ipfs/Qma1v2AjS7d2ceYgye4wUVBFFSdB6UPp7jgL8kNtxvFzWu/go-libp2p-loggables" - addrutil "gx/ipfs/Qmb86KiitngVm5AGQ18viwCBwwcTvULAtz3X74YWKAevnc/go-addr-util" - peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer" + addrutil "github.com/libp2p/go-addr-util" + iconn "github.com/libp2p/go-libp2p-interface-conn" + lgbl "github.com/libp2p/go-libp2p-loggables" + peer "github.com/libp2p/go-libp2p-peer" + ma "github.com/multiformats/go-multiaddr" ) // Diagram of dial sync: diff --git a/swarm_listen.go b/swarm_listen.go index 128668b..b04c47f 100644 --- a/swarm_listen.go +++ b/swarm_listen.go @@ -4,14 +4,14 @@ import ( "context" "fmt" - iconn "gx/ipfs/QmNmKcQiJB5cUTXXXS1o44s4PdeYevmH8aHhQJCGYjwBj3/go-libp2p-interface-conn" - mconn "gx/ipfs/QmPfeoLzBPsiwbHLwev8ecgjd1RPCYfsAHhdFA8avEnXQm/go-libp2p-metrics/conn" - transport "gx/ipfs/QmR4YrM1DdvYmox249o8aday8oiotkcsT1Qzv42ujPEQDb/go-libp2p-transport" - ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr" - ps "gx/ipfs/QmSxPTJ2Jb3nekq3AGMgDyXZR3dhPrSPVSggT3FqJWw4Sa/go-peerstream" - inet "gx/ipfs/QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR/go-libp2p-net" - lgbl "gx/ipfs/Qma1v2AjS7d2ceYgye4wUVBFFSdB6UPp7jgL8kNtxvFzWu/go-libp2p-loggables" - conn "gx/ipfs/Qmf8Br5gq5XgMrSA6Y6dzY3kaBWwJu6aqXJxxuxCCKsbyD/go-libp2p-conn" + conn "github.com/libp2p/go-libp2p-conn" + iconn "github.com/libp2p/go-libp2p-interface-conn" + lgbl "github.com/libp2p/go-libp2p-loggables" + mconn "github.com/libp2p/go-libp2p-metrics/conn" + inet "github.com/libp2p/go-libp2p-net" + transport "github.com/libp2p/go-libp2p-transport" + ps "github.com/libp2p/go-peerstream" + ma "github.com/multiformats/go-multiaddr" ) func (s *Swarm) AddListenAddr(a ma.Multiaddr) error { diff --git a/swarm_net.go b/swarm_net.go index 2b3ba02..eb11ecb 100644 --- a/swarm_net.go +++ b/swarm_net.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - metrics "gx/ipfs/QmPfeoLzBPsiwbHLwev8ecgjd1RPCYfsAHhdFA8avEnXQm/go-libp2p-metrics" - "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess" - ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr" - inet "gx/ipfs/QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR/go-libp2p-net" - ipnet "gx/ipfs/QmWNwP8oYzPUK6LqYEH1hoTMuVmQUUbhKQgHeT1AENGkEm/go-libp2p-interface-pnet" - peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer" - pstore "gx/ipfs/QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf/go-libp2p-peerstore" + "github.com/jbenet/goprocess" + ipnet "github.com/libp2p/go-libp2p-interface-pnet" + metrics "github.com/libp2p/go-libp2p-metrics" + inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" + ma "github.com/multiformats/go-multiaddr" ) // Network implements the inet.Network interface. diff --git a/swarm_net_test.go b/swarm_net_test.go index 9130c8a..95bc268 100644 --- a/swarm_net_test.go +++ b/swarm_net_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr" - inet "gx/ipfs/QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR/go-libp2p-net" - tu "gx/ipfs/QmbN6CcaGuVSWwhYq5nDQs98hWHgu5PTBgVjnGV28YeGRk/go-testutil" - pstore "gx/ipfs/QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf/go-libp2p-peerstore" + inet "github.com/libp2p/go-libp2p-net" + pstore "github.com/libp2p/go-libp2p-peerstore" + tu "github.com/libp2p/go-testutil" + ma "github.com/multiformats/go-multiaddr" ) func GenSwarmNetwork(t *testing.T, ctx context.Context) *Network { diff --git a/swarm_notif_test.go b/swarm_notif_test.go index 18eef7c..d9e9df6 100644 --- a/swarm_notif_test.go +++ b/swarm_notif_test.go @@ -5,9 +5,9 @@ import ( "time" "context" - ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr" - inet "gx/ipfs/QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR/go-libp2p-net" - peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer" + inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + ma "github.com/multiformats/go-multiaddr" ) func streamsSame(a, b inet.Stream) bool { diff --git a/swarm_stream.go b/swarm_stream.go index cf59b16..adadca7 100644 --- a/swarm_stream.go +++ b/swarm_stream.go @@ -3,9 +3,9 @@ package swarm import ( "time" - ps "gx/ipfs/QmSxPTJ2Jb3nekq3AGMgDyXZR3dhPrSPVSggT3FqJWw4Sa/go-peerstream" - inet "gx/ipfs/QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR/go-libp2p-net" - protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" + inet "github.com/libp2p/go-libp2p-net" + protocol "github.com/libp2p/go-libp2p-protocol" + ps "github.com/libp2p/go-peerstream" ) // Stream is a wrapper around a ps.Stream that exposes a way to get diff --git a/swarm_test.go b/swarm_test.go index 0b5ab4b..9deb918 100644 --- a/swarm_test.go +++ b/swarm_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - metrics "gx/ipfs/QmPfeoLzBPsiwbHLwev8ecgjd1RPCYfsAHhdFA8avEnXQm/go-libp2p-metrics" - ma "gx/ipfs/QmSWLfmj5frN9xVLMMN846dMDriy5wN5jeghUm7aTW3DAG/go-multiaddr" - inet "gx/ipfs/QmTWdBq4ZaLGbXcMiNasSR5ywomkgQiJDqQknEU16z3pZR/go-libp2p-net" - peer "gx/ipfs/QmbKtZxyDqUJp7Ad8tGr5nrLqoi9nfgqFxcNbmLJbfaHPe/go-libp2p-peer" - testutil "gx/ipfs/QmbN6CcaGuVSWwhYq5nDQs98hWHgu5PTBgVjnGV28YeGRk/go-testutil" - pstore "gx/ipfs/QmekwEJM81TqzKzupMvK68hVNfBNvBengWkpc8nAw2bjBf/go-libp2p-peerstore" + metrics "github.com/libp2p/go-libp2p-metrics" + inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" + testutil "github.com/libp2p/go-testutil" + ma "github.com/multiformats/go-multiaddr" ) func EchoStreamHandler(stream inet.Stream) { -- GitLab