From 464328f948c83c69f3f52d959ae298a13588d690 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Wed, 18 Nov 2015 11:47:51 -0800 Subject: [PATCH] migrate to gx namespace --- 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 | 8 ++++---- 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, 45 insertions(+), 45 deletions(-) diff --git a/addr/addr.go b/addr/addr.go index 00b8ed1..c741475 100644 --- a/addr/addr.go +++ b/addr/addr.go @@ -3,11 +3,11 @@ package addrutil import ( "fmt" - logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log" + logging "gx/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu/go-log" - manet "QmRCPT5WRph8aWXmaT2Rfn6ac98YRUUJnNURpD3hNAWp4f/go-multiaddr-net" - context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + manet "gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2/go-multiaddr-net" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/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 8a0bc9c..120195a 100644 --- a/addr/addr_test.go +++ b/addr/addr_test.go @@ -3,8 +3,8 @@ package addrutil import ( "testing" - manet "QmRCPT5WRph8aWXmaT2Rfn6ac98YRUUJnNURpD3hNAWp4f/go-multiaddr-net" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + manet "gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2/go-multiaddr-net" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" ) func newMultiaddr(t *testing.T, s string) ma.Multiaddr { diff --git a/dial_test.go b/dial_test.go index f915808..0df87fd 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 "QmRCPT5WRph8aWXmaT2Rfn6ac98YRUUJnNURpD3hNAWp4f/go-multiaddr-net" - context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + manet "gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2/go-multiaddr-net" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ) func acceptAndHang(l net.Listener) { diff --git a/peers_test.go b/peers_test.go index 0068b37..ef9c22f 100644 --- a/peers_test.go +++ b/peers_test.go @@ -5,8 +5,8 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" - context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ) func TestPeers(t *testing.T) { diff --git a/simul_test.go b/simul_test.go index ec988bc..408b39b 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" - context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ) func TestSimultOpen(t *testing.T) { diff --git a/swarm.go b/swarm.go index 3a37d30..a6ddae3 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" - pst "QmPxuHs2NQjz16gnvndgkzHkm5PjtqbB5rwoSpLusBkQ7Q/go-stream-muxer" - psmss "QmPxuHs2NQjz16gnvndgkzHkm5PjtqbB5rwoSpLusBkQ7Q/go-stream-muxer/multistream" - "QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess" - goprocessctx "QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess/context" - ps "QmTgxFwS1nDK126fH5XPnLFcxcDFsxKbPPnCBwyRWNAjDX/go-peerstream" - mafilter "QmYhewVqJhkgEsm3AYVUbpT14q2P9V4Xb7np9JXKua6y7A/multiaddr-filter" - context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" - - logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log" + 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" ) var log = logging.Logger("swarm2") diff --git a/swarm_addr.go b/swarm_addr.go index 6149eb6..81a77bb 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 "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/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 b397a07..7383bee 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" - context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ) func TestFilterAddrs(t *testing.T) { diff --git a/swarm_conn.go b/swarm_conn.go index e07e82f..e7d1ec9 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 "QmTgxFwS1nDK126fH5XPnLFcxcDFsxKbPPnCBwyRWNAjDX/go-peerstream" - context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + ps "gx/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/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 11b3f20..fa4fce1 100644 --- a/swarm_dial.go +++ b/swarm_dial.go @@ -8,14 +8,14 @@ import ( "sync" "time" - "QmRCPT5WRph8aWXmaT2Rfn6ac98YRUUJnNURpD3hNAWp4f/go-multiaddr-net" + lgbl "github.com/ipfs/go-libp2p/loggables" 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" - lgbl "github.com/ipfs/go-libp2p/loggables" + "gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2/go-multiaddr-net" - context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ) // Diagram of dial sync: diff --git a/swarm_listen.go b/swarm_listen.go index b986876..bd1810b 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 "QmTgxFwS1nDK126fH5XPnLFcxcDFsxKbPPnCBwyRWNAjDX/go-peerstream" - context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + ps "gx/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ) // Open listeners and reuse-dialers for the given addresses diff --git a/swarm_net.go b/swarm_net.go index 36416fa..d8724a4 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" - "QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess" - context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" + "gx/QmfDXyLfKNfja2XebomRZjZ2UZCa4BDyFoCymKtzNRVQ5b/goprocess" ) // Network implements the inet.Network interface. diff --git a/swarm_net_test.go b/swarm_net_test.go index 2db22fb..c40b89c 100644 --- a/swarm_net_test.go +++ b/swarm_net_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" + context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" inet "github.com/ipfs/go-libp2p/p2p/net" testutil "github.com/ipfs/go-libp2p/p2p/test/util" ) diff --git a/swarm_notif_test.go b/swarm_notif_test.go index 1180d64..9b59bb2 100644 --- a/swarm_notif_test.go +++ b/swarm_notif_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/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 d52962a..f4ee314 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 "QmTgxFwS1nDK126fH5XPnLFcxcDFsxKbPPnCBwyRWNAjDX/go-peerstream" + ps "gx/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/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 670ea26..c8a1ce5 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" - context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" - ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" + ma "gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr" + context "gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ) func EchoStreamHandler(stream inet.Stream) { -- GitLab