From 0f020c3c69d3e9addf4a627f23933d331670e1cf Mon Sep 17 00:00:00 2001 From: Jeromy Date: Sun, 6 Dec 2015 23:00:10 -0800 Subject: [PATCH] WIP --- addr/addr.go | 8 ++++---- addr/addr_test.go | 4 ++-- dial_test.go | 6 +++--- peers_test.go | 4 ++-- simul_test.go | 4 ++-- swarm.go | 20 ++++++++++---------- swarm_addr.go | 2 +- swarm_addr_test.go | 4 ++-- swarm_conn.go | 6 +++--- swarm_dial.go | 6 +++--- swarm_listen.go | 6 +++--- swarm_net.go | 6 +++--- swarm_net_test.go | 2 +- swarm_notif_test.go | 4 ++-- swarm_stream.go | 2 +- swarm_test.go | 4 ++-- 16 files changed, 44 insertions(+), 44 deletions(-) diff --git a/addr/addr.go b/addr/addr.go index c741475..39f00db 100644 --- a/addr/addr.go +++ b/addr/addr.go @@ -3,11 +3,11 @@ package addrutil import ( "fmt" - logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log" + logging "github.com/ipfs/go-log" - manet "gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2/go-multiaddr-net" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" - context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" + ma "github.com/jbenet/go-multiaddr" + manet "github.com/jbenet/go-multiaddr-net" + context "golang.org/x/net/context" ) var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/net/swarm/addr") diff --git a/addr/addr_test.go b/addr/addr_test.go index 120195a..49eec13 100644 --- a/addr/addr_test.go +++ b/addr/addr_test.go @@ -3,8 +3,8 @@ package addrutil import ( "testing" - manet "gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2/go-multiaddr-net" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + manet "github.com/jbenet/go-multiaddr-net" ) func newMultiaddr(t *testing.T, s string) ma.Multiaddr { diff --git a/dial_test.go b/dial_test.go index 0df87fd..57a4d7f 100644 --- a/dial_test.go +++ b/dial_test.go @@ -13,9 +13,9 @@ import ( testutil "github.com/ipfs/go-libp2p/testutil" ci "github.com/ipfs/go-libp2p/testutil/ci" - manet "gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2/go-multiaddr-net" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" - context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" + ma "github.com/jbenet/go-multiaddr" + manet "github.com/jbenet/go-multiaddr-net" + context "golang.org/x/net/context" ) func acceptAndHang(l net.Listener) { diff --git a/peers_test.go b/peers_test.go index ef9c22f..b107fbf 100644 --- a/peers_test.go +++ b/peers_test.go @@ -5,8 +5,8 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" - context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" + ma "github.com/jbenet/go-multiaddr" + context "golang.org/x/net/context" ) func TestPeers(t *testing.T) { diff --git a/simul_test.go b/simul_test.go index 408b39b..bd753e7 100644 --- a/simul_test.go +++ b/simul_test.go @@ -9,8 +9,8 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" ci "github.com/ipfs/go-libp2p/testutil/ci" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" - context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" + ma "github.com/jbenet/go-multiaddr" + context "golang.org/x/net/context" ) func TestSimultOpen(t *testing.T) { diff --git a/swarm.go b/swarm.go index 41c2ca9..c71ef35 100644 --- a/swarm.go +++ b/swarm.go @@ -16,16 +16,16 @@ import ( transport "github.com/ipfs/go-libp2p/p2p/net/transport" peer "github.com/ipfs/go-libp2p/p2p/peer" - ps "gx/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream" - pst "gx/QmRmT6MSnfhRDW1PTUGSd3z4fqXK48GUequQAZzeT4c5iC/go-stream-muxer" - psmss "gx/QmRmT6MSnfhRDW1PTUGSd3z4fqXK48GUequQAZzeT4c5iC/go-stream-muxer/multistream" - mafilter "gx/QmVCmuhgDFer5MW5737Z8GtBEGpUyEkFnLUv4ASDWnLZdC/multiaddr-filter" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" - context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" - "gx/QmfDXyLfKNfja2XebomRZjZ2UZCa4BDyFoCymKtzNRVQ5b/goprocess" - goprocessctx "gx/QmfDXyLfKNfja2XebomRZjZ2UZCa4BDyFoCymKtzNRVQ5b/goprocess/context" - - logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log" + ma "github.com/jbenet/go-multiaddr" + ps "github.com/jbenet/go-peerstream" + pst "github.com/jbenet/go-stream-muxer" + psmss "github.com/jbenet/go-stream-muxer/multistream" + "github.com/jbenet/goprocess" + goprocessctx "github.com/jbenet/goprocess/context" + mafilter "github.com/whyrusleeping/multiaddr-filter" + context "golang.org/x/net/context" + + logging "github.com/ipfs/go-log" ) var log = logging.Logger("swarm2") diff --git a/swarm_addr.go b/swarm_addr.go index 81a77bb..039683b 100644 --- a/swarm_addr.go +++ b/swarm_addr.go @@ -4,7 +4,7 @@ import ( conn "github.com/ipfs/go-libp2p/p2p/net/conn" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + ma "github.com/jbenet/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 7383bee..7db46d3 100644 --- a/swarm_addr_test.go +++ b/swarm_addr_test.go @@ -8,8 +8,8 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" testutil "github.com/ipfs/go-libp2p/testutil" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" - context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" + ma "github.com/jbenet/go-multiaddr" + context "golang.org/x/net/context" ) func TestFilterAddrs(t *testing.T) { diff --git a/swarm_conn.go b/swarm_conn.go index e7d1ec9..840a9b4 100644 --- a/swarm_conn.go +++ b/swarm_conn.go @@ -8,9 +8,9 @@ import ( conn "github.com/ipfs/go-libp2p/p2p/net/conn" peer "github.com/ipfs/go-libp2p/p2p/peer" - ps "gx/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" - context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" + ma "github.com/jbenet/go-multiaddr" + ps "github.com/jbenet/go-peerstream" + context "golang.org/x/net/context" ) // a Conn is a simple wrapper around a ps.Conn that also exposes diff --git a/swarm_dial.go b/swarm_dial.go index fa4fce1..0cb2858 100644 --- a/swarm_dial.go +++ b/swarm_dial.go @@ -12,10 +12,10 @@ import ( conn "github.com/ipfs/go-libp2p/p2p/net/conn" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" peer "github.com/ipfs/go-libp2p/p2p/peer" - "gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2/go-multiaddr-net" + "github.com/jbenet/go-multiaddr-net" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" - context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" + ma "github.com/jbenet/go-multiaddr" + context "golang.org/x/net/context" ) // Diagram of dial sync: diff --git a/swarm_listen.go b/swarm_listen.go index bd1810b..f184640 100644 --- a/swarm_listen.go +++ b/swarm_listen.go @@ -9,9 +9,9 @@ import ( conn "github.com/ipfs/go-libp2p/p2p/net/conn" transport "github.com/ipfs/go-libp2p/p2p/net/transport" - ps "gx/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" - context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" + ma "github.com/jbenet/go-multiaddr" + ps "github.com/jbenet/go-peerstream" + context "golang.org/x/net/context" ) // Open listeners and reuse-dialers for the given addresses diff --git a/swarm_net.go b/swarm_net.go index e5a6e02..a8361fc 100644 --- a/swarm_net.go +++ b/swarm_net.go @@ -8,9 +8,9 @@ import ( metrics "github.com/ipfs/go-libp2p/p2p/metrics" inet "github.com/ipfs/go-libp2p/p2p/net" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" - context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" - "gx/QmfDXyLfKNfja2XebomRZjZ2UZCa4BDyFoCymKtzNRVQ5b/goprocess" + ma "github.com/jbenet/go-multiaddr" + "github.com/jbenet/goprocess" + context "golang.org/x/net/context" ) // Network implements the inet.Network interface. diff --git a/swarm_net_test.go b/swarm_net_test.go index c40b89c..14c590b 100644 --- a/swarm_net_test.go +++ b/swarm_net_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" inet "github.com/ipfs/go-libp2p/p2p/net" testutil "github.com/ipfs/go-libp2p/p2p/test/util" + context "golang.org/x/net/context" ) // TestConnectednessCorrect starts a few networks, connects a few diff --git a/swarm_notif_test.go b/swarm_notif_test.go index 9b59bb2..0d976e8 100644 --- a/swarm_notif_test.go +++ b/swarm_notif_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" - context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" + ma "github.com/jbenet/go-multiaddr" + context "golang.org/x/net/context" inet "github.com/ipfs/go-libp2p/p2p/net" peer "github.com/ipfs/go-libp2p/p2p/peer" diff --git a/swarm_stream.go b/swarm_stream.go index f4ee314..7965d27 100644 --- a/swarm_stream.go +++ b/swarm_stream.go @@ -3,7 +3,7 @@ package swarm import ( inet "github.com/ipfs/go-libp2p/p2p/net" - ps "gx/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream" + ps "github.com/jbenet/go-peerstream" ) // a 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 b6aa692..a1c3569 100644 --- a/swarm_test.go +++ b/swarm_test.go @@ -14,8 +14,8 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" testutil "github.com/ipfs/go-libp2p/testutil" - ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" - context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" + ma "github.com/jbenet/go-multiaddr" + context "golang.org/x/net/context" ) func EchoStreamHandler(stream inet.Stream) { -- GitLab