From b0ad207270ca8a26459be280f0ae21ea300eec82 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Wed, 27 Apr 2016 12:45:16 -0700 Subject: [PATCH 1/5] rewrite all package paths to dvcs --- p2p/discovery/mdns.go | 10 ++++----- p2p/host/basic/basic_host.go | 12 +++++----- p2p/host/basic/basic_host_test.go | 2 +- p2p/host/basic/natmgr.go | 8 +++---- p2p/host/host.go | 10 ++++----- p2p/host/routed/routed.go | 12 +++++----- p2p/metrics/bw_stats.go | 4 ++-- p2p/metrics/conn/conn.go | 2 +- p2p/metrics/interface.go | 2 +- p2p/metrics/stream/metered.go | 2 +- p2p/metrics/stream/metered_test.go | 4 ++-- p2p/nat/nat.go | 14 ++++++------ p2p/net/conn/conn.go | 18 +++++++-------- p2p/net/conn/conn_test.go | 4 ++-- p2p/net/conn/dial.go | 16 ++++++------- p2p/net/conn/dial_test.go | 16 ++++++------- p2p/net/conn/interface.go | 8 +++---- p2p/net/conn/listen.go | 18 +++++++-------- p2p/net/conn/secure_conn.go | 10 ++++----- p2p/net/conn/secure_conn_test.go | 4 ++-- p2p/net/filter/filter.go | 4 ++-- p2p/net/filter/filter_test.go | 2 +- p2p/net/interface.go | 8 +++---- p2p/net/mock/interface.go | 6 ++--- p2p/net/mock/mock.go | 4 ++-- p2p/net/mock/mock_conn.go | 8 +++---- p2p/net/mock/mock_link.go | 2 +- p2p/net/mock/mock_net.go | 12 +++++----- p2p/net/mock/mock_notif_test.go | 6 ++--- p2p/net/mock/mock_peernet.go | 10 ++++----- p2p/net/mock/mock_printer.go | 2 +- p2p/net/mock/mock_stream.go | 2 +- p2p/net/mock/mock_test.go | 6 ++--- p2p/net/swarm/addr/addr.go | 8 +++---- p2p/net/swarm/addr/addr_test.go | 4 ++-- p2p/net/swarm/dial_test.go | 8 +++---- p2p/net/swarm/peers_test.go | 6 ++--- p2p/net/swarm/simul_test.go | 6 ++--- p2p/net/swarm/swarm.go | 26 +++++++++++----------- p2p/net/swarm/swarm_addr.go | 2 +- p2p/net/swarm/swarm_addr_test.go | 6 ++--- p2p/net/swarm/swarm_conn.go | 10 ++++----- p2p/net/swarm/swarm_dial.go | 10 ++++----- p2p/net/swarm/swarm_listen.go | 10 ++++----- p2p/net/swarm/swarm_net.go | 8 +++---- p2p/net/swarm/swarm_net_test.go | 2 +- p2p/net/swarm/swarm_notif_test.go | 6 ++--- p2p/net/swarm/swarm_stream.go | 2 +- p2p/net/swarm/swarm_test.go | 6 ++--- p2p/protocol/identify/id.go | 18 +++++++-------- p2p/protocol/identify/id_test.go | 6 ++--- p2p/protocol/identify/obsaddr.go | 4 ++-- p2p/protocol/identify/obsaddr_test.go | 2 +- p2p/protocol/identify/pb/identify.pb.go | 2 +- p2p/protocol/ping/ping.go | 8 +++---- p2p/protocol/ping/ping_test.go | 4 ++-- p2p/protocol/relay/relay.go | 8 +++---- p2p/protocol/relay/relay_test.go | 6 ++--- p2p/test/backpressure/backpressure_test.go | 8 +++---- p2p/test/reconnects/reconnect_test.go | 8 +++---- p2p/test/util/key.go | 10 ++++----- p2p/test/util/util.go | 6 ++--- package.json | 8 ++++++- testutil/gen.go | 8 +++---- testutil/identity.go | 6 ++--- 65 files changed, 243 insertions(+), 237 deletions(-) diff --git a/p2p/discovery/mdns.go b/p2p/discovery/mdns.go index f3257c0b8d..041017ecae 100644 --- a/p2p/discovery/mdns.go +++ b/p2p/discovery/mdns.go @@ -9,12 +9,12 @@ import ( "sync" "time" + "github.com/cryptix/mdns" + "github.com/ipfs/go-libp2p-peer" "github.com/ipfs/go-libp2p/p2p/host" - "gx/ipfs/QmSscYPCcE1H3UQr2tnsJ2a9dK9LsHTBGgP71VW6fz67e5/mdns" - manet "gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" - "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + logging "github.com/ipfs/go-log" + ma "github.com/jbenet/go-multiaddr" + manet "github.com/jbenet/go-multiaddr-net" ) var log = logging.Logger("mdns") diff --git a/p2p/host/basic/basic_host.go b/p2p/host/basic/basic_host.go index 640af87429..7ecc15afa3 100644 --- a/p2p/host/basic/basic_host.go +++ b/p2p/host/basic/basic_host.go @@ -3,19 +3,19 @@ package basichost import ( "io" + peer "github.com/ipfs/go-libp2p-peer" metrics "github.com/ipfs/go-libp2p/p2p/metrics" mstream "github.com/ipfs/go-libp2p/p2p/metrics/stream" inet "github.com/ipfs/go-libp2p/p2p/net" protocol "github.com/ipfs/go-libp2p/p2p/protocol" identify "github.com/ipfs/go-libp2p/p2p/protocol/identify" relay "github.com/ipfs/go-libp2p/p2p/protocol/relay" - goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + logging "github.com/ipfs/go-log" + ma "github.com/jbenet/go-multiaddr" + goprocess "github.com/jbenet/goprocess" + context "golang.org/x/net/context" - msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream" + msmux "github.com/whyrusleeping/go-multistream" ) var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host/basic") diff --git a/p2p/host/basic/basic_host_test.go b/p2p/host/basic/basic_host_test.go index afa1069370..3de87797eb 100644 --- a/p2p/host/basic/basic_host_test.go +++ b/p2p/host/basic/basic_host_test.go @@ -9,7 +9,7 @@ import ( protocol "github.com/ipfs/go-libp2p/p2p/protocol" testutil "github.com/ipfs/go-libp2p/p2p/test/util" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + context "golang.org/x/net/context" ) func TestHostSimple(t *testing.T) { diff --git a/p2p/host/basic/natmgr.go b/p2p/host/basic/natmgr.go index de67858e50..7581a2e221 100644 --- a/p2p/host/basic/natmgr.go +++ b/p2p/host/basic/natmgr.go @@ -3,12 +3,12 @@ package basichost import ( "sync" + lgbl "github.com/ipfs/go-libp2p-loggables" inat "github.com/ipfs/go-libp2p/p2p/nat" inet "github.com/ipfs/go-libp2p/p2p/net" - goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" - lgbl "gx/ipfs/QmYqiDbGUGqatbPFie11Py8cnyduoJYqcgKtjfhu1SQLh1/go-libp2p-loggables" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + goprocess "github.com/jbenet/goprocess" + context "golang.org/x/net/context" ) // natManager takes care of adding + removing port mappings to the nat. diff --git a/p2p/host/host.go b/p2p/host/host.go index 12a3d65e6c..3cd00c68f8 100644 --- a/p2p/host/host.go +++ b/p2p/host/host.go @@ -1,14 +1,14 @@ package host import ( + peer "github.com/ipfs/go-libp2p-peer" metrics "github.com/ipfs/go-libp2p/p2p/metrics" inet "github.com/ipfs/go-libp2p/p2p/net" protocol "github.com/ipfs/go-libp2p/p2p/protocol" - msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + logging "github.com/ipfs/go-log" + ma "github.com/jbenet/go-multiaddr" + msmux "github.com/whyrusleeping/go-multistream" + context "golang.org/x/net/context" ) var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host") diff --git a/p2p/host/routed/routed.go b/p2p/host/routed/routed.go index 596154cc5f..1b17f85e20 100644 --- a/p2p/host/routed/routed.go +++ b/p2p/host/routed/routed.go @@ -4,17 +4,17 @@ import ( "fmt" "time" + lgbl "github.com/ipfs/go-libp2p-loggables" + peer "github.com/ipfs/go-libp2p-peer" host "github.com/ipfs/go-libp2p/p2p/host" metrics "github.com/ipfs/go-libp2p/p2p/metrics" inet "github.com/ipfs/go-libp2p/p2p/net" protocol "github.com/ipfs/go-libp2p/p2p/protocol" - lgbl "gx/ipfs/QmYqiDbGUGqatbPFie11Py8cnyduoJYqcgKtjfhu1SQLh1/go-libp2p-loggables" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + logging "github.com/ipfs/go-log" + ma "github.com/jbenet/go-multiaddr" + context "golang.org/x/net/context" - msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream" + msmux "github.com/whyrusleeping/go-multistream" ) var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host/routed") diff --git a/p2p/metrics/bw_stats.go b/p2p/metrics/bw_stats.go index 27f4f35dc3..0f222b76dd 100644 --- a/p2p/metrics/bw_stats.go +++ b/p2p/metrics/bw_stats.go @@ -1,11 +1,11 @@ package metrics import ( - gm "gx/ipfs/QmeYJHEk8UjVVZ4XCRTZe6dFQrb8pGWD81LYCgeLp8CvMB/go-metrics" + gm "github.com/whyrusleeping/go-metrics" "sync" + peer "github.com/ipfs/go-libp2p-peer" protocol "github.com/ipfs/go-libp2p/p2p/protocol" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" ) type Stats struct { diff --git a/p2p/metrics/conn/conn.go b/p2p/metrics/conn/conn.go index a3eb2e5eda..8cc0f62a21 100644 --- a/p2p/metrics/conn/conn.go +++ b/p2p/metrics/conn/conn.go @@ -1,8 +1,8 @@ package meterconn import ( + transport "github.com/ipfs/go-libp2p-transport" metrics "github.com/ipfs/go-libp2p/p2p/metrics" - transport "gx/ipfs/QmRHqYZs3Diy8YC3bW16zvs8VDDwS2ARKBuKwALxEMqibc/go-libp2p-transport" ) type MeteredConn struct { diff --git a/p2p/metrics/interface.go b/p2p/metrics/interface.go index b34667aac1..876523c5fd 100644 --- a/p2p/metrics/interface.go +++ b/p2p/metrics/interface.go @@ -1,8 +1,8 @@ package metrics import ( + peer "github.com/ipfs/go-libp2p-peer" protocol "github.com/ipfs/go-libp2p/p2p/protocol" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" ) type StreamMeterCallback func(int64, protocol.ID, peer.ID) diff --git a/p2p/metrics/stream/metered.go b/p2p/metrics/stream/metered.go index e0db226995..2531dfbe5c 100644 --- a/p2p/metrics/stream/metered.go +++ b/p2p/metrics/stream/metered.go @@ -1,10 +1,10 @@ package meterstream import ( + peer "github.com/ipfs/go-libp2p-peer" metrics "github.com/ipfs/go-libp2p/p2p/metrics" inet "github.com/ipfs/go-libp2p/p2p/net" protocol "github.com/ipfs/go-libp2p/p2p/protocol" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" ) type meteredStream struct { diff --git a/p2p/metrics/stream/metered_test.go b/p2p/metrics/stream/metered_test.go index 825c44a08a..97d4374f96 100644 --- a/p2p/metrics/stream/metered_test.go +++ b/p2p/metrics/stream/metered_test.go @@ -5,10 +5,10 @@ import ( "io/ioutil" "testing" + randbo "github.com/dustin/randbo" + peer "github.com/ipfs/go-libp2p-peer" inet "github.com/ipfs/go-libp2p/p2p/net" protocol "github.com/ipfs/go-libp2p/p2p/protocol" - randbo "gx/ipfs/QmYvsG72GsfLgUeSojXArjnU6L4Wmwk7wuAxtNLuyXcc1T/randbo" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" ) type FakeStream struct { diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index a3dd83c6d0..237c1296ca 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -8,13 +8,13 @@ import ( "sync" "time" - nat "gx/ipfs/QmNLvkCDV6ZjUJsEwGNporYBuZdhWT6q7TBVYQwwRv12HT/go-nat" - goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" - periodic "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/periodic" - manet "gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" - logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" - notifier "gx/ipfs/QmbcS9XrwZkF1rZj8bBwwzoYhVuA2PCnPhFUL1pyWGgt2A/go-notifier" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + nat "github.com/fd/go-nat" + logging "github.com/ipfs/go-log" + ma "github.com/jbenet/go-multiaddr" + manet "github.com/jbenet/go-multiaddr-net" + goprocess "github.com/jbenet/goprocess" + periodic "github.com/jbenet/goprocess/periodic" + notifier "github.com/whyrusleeping/go-notifier" ) var ( diff --git a/p2p/net/conn/conn.go b/p2p/net/conn/conn.go index 031b9346a9..396cabb169 100644 --- a/p2p/net/conn/conn.go +++ b/p2p/net/conn/conn.go @@ -6,15 +6,15 @@ import ( "net" "time" - mpool "gx/ipfs/QmRQhVisS8dmPbjBUthVkenn81pBxrx1GxE281csJhm2vL/go-msgio/mpool" - manet "gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" - ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" - lgbl "gx/ipfs/QmYqiDbGUGqatbPFie11Py8cnyduoJYqcgKtjfhu1SQLh1/go-libp2p-loggables" - u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + u "github.com/ipfs/go-ipfs-util" + ic "github.com/ipfs/go-libp2p-crypto" + lgbl "github.com/ipfs/go-libp2p-loggables" + peer "github.com/ipfs/go-libp2p-peer" + logging "github.com/ipfs/go-log" + mpool "github.com/jbenet/go-msgio/mpool" + ma "github.com/jbenet/go-multiaddr" + manet "github.com/jbenet/go-multiaddr-net" + context "golang.org/x/net/context" ) var log = logging.Logger("conn") diff --git a/p2p/net/conn/conn_test.go b/p2p/net/conn/conn_test.go index 4f442b5e7b..461a1314c4 100644 --- a/p2p/net/conn/conn_test.go +++ b/p2p/net/conn/conn_test.go @@ -9,8 +9,8 @@ import ( "time" travis "github.com/ipfs/go-libp2p/testutil/ci/travis" - msgio "gx/ipfs/QmRQhVisS8dmPbjBUthVkenn81pBxrx1GxE281csJhm2vL/go-msgio" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + msgio "github.com/jbenet/go-msgio" + context "golang.org/x/net/context" ) func msgioWrap(c Conn) msgio.ReadWriter { diff --git a/p2p/net/conn/dial.go b/p2p/net/conn/dial.go index 0cf3789683..8efd7d10b4 100644 --- a/p2p/net/conn/dial.go +++ b/p2p/net/conn/dial.go @@ -5,15 +5,15 @@ import ( "math/rand" "strings" + ci "github.com/ipfs/go-libp2p-crypto" + lgbl "github.com/ipfs/go-libp2p-loggables" + peer "github.com/ipfs/go-libp2p-peer" + transport "github.com/ipfs/go-libp2p-transport" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" - transport "gx/ipfs/QmRHqYZs3Diy8YC3bW16zvs8VDDwS2ARKBuKwALxEMqibc/go-libp2p-transport" - manet "gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" - ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" - msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream" - lgbl "gx/ipfs/QmYqiDbGUGqatbPFie11Py8cnyduoJYqcgKtjfhu1SQLh1/go-libp2p-loggables" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + manet "github.com/jbenet/go-multiaddr-net" + msmux "github.com/whyrusleeping/go-multistream" + context "golang.org/x/net/context" ) type WrapFunc func(transport.Conn) transport.Conn diff --git a/p2p/net/conn/dial_test.go b/p2p/net/conn/dial_test.go index 0ccb0bf03a..a46bf42c71 100644 --- a/p2p/net/conn/dial_test.go +++ b/p2p/net/conn/dial_test.go @@ -11,15 +11,15 @@ import ( "testing" "time" + ic "github.com/ipfs/go-libp2p-crypto" + peer "github.com/ipfs/go-libp2p-peer" + transport "github.com/ipfs/go-libp2p-transport" tu "github.com/ipfs/go-libp2p/testutil" - transport "gx/ipfs/QmRHqYZs3Diy8YC3bW16zvs8VDDwS2ARKBuKwALxEMqibc/go-libp2p-transport" - ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - - grc "gx/ipfs/QmTd4Jgb4nbJq5uR55KJgGLyHWmM3dovS21D1HcwRneSLu/gorocheck" - msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + + ma "github.com/jbenet/go-multiaddr" + msmux "github.com/whyrusleeping/go-multistream" + grc "github.com/whyrusleeping/gorocheck" + context "golang.org/x/net/context" ) func goroFilter(r *grc.Goroutine) bool { diff --git a/p2p/net/conn/interface.go b/p2p/net/conn/interface.go index c3a2210ca7..816284f35b 100644 --- a/p2p/net/conn/interface.go +++ b/p2p/net/conn/interface.go @@ -5,11 +5,11 @@ import ( "net" "time" + ic "github.com/ipfs/go-libp2p-crypto" + peer "github.com/ipfs/go-libp2p-peer" + transport "github.com/ipfs/go-libp2p-transport" filter "github.com/ipfs/go-libp2p/p2p/net/filter" - transport "gx/ipfs/QmRHqYZs3Diy8YC3bW16zvs8VDDwS2ARKBuKwALxEMqibc/go-libp2p-transport" - ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" ) type PeerConn interface { diff --git a/p2p/net/conn/listen.go b/p2p/net/conn/listen.go index f4308b0c4a..b7a4687894 100644 --- a/p2p/net/conn/listen.go +++ b/p2p/net/conn/listen.go @@ -7,16 +7,16 @@ import ( "sync" "time" + ic "github.com/ipfs/go-libp2p-crypto" + peer "github.com/ipfs/go-libp2p-peer" + transport "github.com/ipfs/go-libp2p-transport" filter "github.com/ipfs/go-libp2p/p2p/net/filter" - "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" - goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context" - transport "gx/ipfs/QmRHqYZs3Diy8YC3bW16zvs8VDDwS2ARKBuKwALxEMqibc/go-libp2p-transport" - ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" - msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream" - tec "gx/ipfs/QmWHgLqrghM9zw77nF6gdvT9ExQ2RB9pLxkd8sDHZf1rWb/go-temp-err-catcher" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + tec "github.com/jbenet/go-temp-err-catcher" + "github.com/jbenet/goprocess" + goprocessctx "github.com/jbenet/goprocess/context" + msmux "github.com/whyrusleeping/go-multistream" + context "golang.org/x/net/context" ) const ( diff --git a/p2p/net/conn/secure_conn.go b/p2p/net/conn/secure_conn.go index d29cb7e5e3..6aa16f9208 100644 --- a/p2p/net/conn/secure_conn.go +++ b/p2p/net/conn/secure_conn.go @@ -5,11 +5,11 @@ import ( "net" "time" - secio "gx/ipfs/QmPKuU1ohMDaJRJHmatXewCqjZp5wKrD3CK6m9TnCK6XBe/go-libp2p-secio" - ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ic "github.com/ipfs/go-libp2p-crypto" + peer "github.com/ipfs/go-libp2p-peer" + secio "github.com/ipfs/go-libp2p-secio" + ma "github.com/jbenet/go-multiaddr" + context "golang.org/x/net/context" ) // secureConn wraps another Conn object with an encrypted channel. diff --git a/p2p/net/conn/secure_conn_test.go b/p2p/net/conn/secure_conn_test.go index 72cb7b1a2b..834f727db6 100644 --- a/p2p/net/conn/secure_conn_test.go +++ b/p2p/net/conn/secure_conn_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" + ic "github.com/ipfs/go-libp2p-crypto" travis "github.com/ipfs/go-libp2p/testutil/ci/travis" - ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + context "golang.org/x/net/context" ) func upgradeToSecureConn(t *testing.T, ctx context.Context, sk ic.PrivKey, c Conn) (Conn, error) { diff --git a/p2p/net/filter/filter.go b/p2p/net/filter/filter.go index 857b4ae869..c31ad0b752 100644 --- a/p2p/net/filter/filter.go +++ b/p2p/net/filter/filter.go @@ -4,8 +4,8 @@ import ( "net" "sync" - manet "gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + manet "github.com/jbenet/go-multiaddr-net" ) type Filters struct { diff --git a/p2p/net/filter/filter_test.go b/p2p/net/filter/filter_test.go index 8a0c46a9f8..8cd0bcc339 100644 --- a/p2p/net/filter/filter_test.go +++ b/p2p/net/filter/filter_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" ) func TestFilter(t *testing.T) { diff --git a/p2p/net/interface.go b/p2p/net/interface.go index ca2545bdb0..b090e18a71 100644 --- a/p2p/net/interface.go +++ b/p2p/net/interface.go @@ -3,11 +3,11 @@ package net import ( "io" + peer "github.com/ipfs/go-libp2p-peer" conn "github.com/ipfs/go-libp2p/p2p/net/conn" - "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + "github.com/jbenet/goprocess" + context "golang.org/x/net/context" ) // MessageSizeMax is a soft (recommended) maximum for network messages. diff --git a/p2p/net/mock/interface.go b/p2p/net/mock/interface.go index 5b5f45c118..ce3c6877ee 100644 --- a/p2p/net/mock/interface.go +++ b/p2p/net/mock/interface.go @@ -7,14 +7,14 @@ package mocknet import ( + ic "github.com/ipfs/go-libp2p-crypto" + peer "github.com/ipfs/go-libp2p-peer" host "github.com/ipfs/go-libp2p/p2p/host" inet "github.com/ipfs/go-libp2p/p2p/net" - ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" "io" "time" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" ) type Mocknet interface { diff --git a/p2p/net/mock/mock.go b/p2p/net/mock/mock.go index e6abf47bae..3c526a36e8 100644 --- a/p2p/net/mock/mock.go +++ b/p2p/net/mock/mock.go @@ -1,8 +1,8 @@ package mocknet import ( - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" + logging "github.com/ipfs/go-log" + context "golang.org/x/net/context" ) var log = logging.Logger("mocknet") diff --git a/p2p/net/mock/mock_conn.go b/p2p/net/mock/mock_conn.go index 058032cf17..f0fe6c1ceb 100644 --- a/p2p/net/mock/mock_conn.go +++ b/p2p/net/mock/mock_conn.go @@ -4,11 +4,11 @@ import ( "container/list" "sync" + ic "github.com/ipfs/go-libp2p-crypto" + peer "github.com/ipfs/go-libp2p-peer" inet "github.com/ipfs/go-libp2p/p2p/net" - process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" - ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + process "github.com/jbenet/goprocess" ) // conn represents one side's perspective of a diff --git a/p2p/net/mock/mock_link.go b/p2p/net/mock/mock_link.go index a548d3b42f..eb25dd4147 100644 --- a/p2p/net/mock/mock_link.go +++ b/p2p/net/mock/mock_link.go @@ -6,8 +6,8 @@ import ( "sync" "time" + peer "github.com/ipfs/go-libp2p-peer" inet "github.com/ipfs/go-libp2p/p2p/net" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" ) // link implements mocknet.Link diff --git a/p2p/net/mock/mock_net.go b/p2p/net/mock/mock_net.go index a6d7725c4a..9f539924c9 100644 --- a/p2p/net/mock/mock_net.go +++ b/p2p/net/mock/mock_net.go @@ -5,18 +5,18 @@ import ( "sort" "sync" + ic "github.com/ipfs/go-libp2p-crypto" + peer "github.com/ipfs/go-libp2p-peer" host "github.com/ipfs/go-libp2p/p2p/host" bhost "github.com/ipfs/go-libp2p/p2p/host/basic" inet "github.com/ipfs/go-libp2p/p2p/net" p2putil "github.com/ipfs/go-libp2p/p2p/test/util" testutil "github.com/ipfs/go-libp2p/testutil" - ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" - goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + "github.com/jbenet/goprocess" + goprocessctx "github.com/jbenet/goprocess/context" + context "golang.org/x/net/context" ) // mocknet implements mocknet.Mocknet diff --git a/p2p/net/mock/mock_notif_test.go b/p2p/net/mock/mock_notif_test.go index 91fe7dfe0d..bf871da3da 100644 --- a/p2p/net/mock/mock_notif_test.go +++ b/p2p/net/mock/mock_notif_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" + peer "github.com/ipfs/go-libp2p-peer" inet "github.com/ipfs/go-libp2p/p2p/net" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + context "golang.org/x/net/context" ) func TestNotifications(t *testing.T) { diff --git a/p2p/net/mock/mock_peernet.go b/p2p/net/mock/mock_peernet.go index 27951c730a..162d2921bd 100644 --- a/p2p/net/mock/mock_peernet.go +++ b/p2p/net/mock/mock_peernet.go @@ -5,12 +5,12 @@ import ( "math/rand" "sync" + peer "github.com/ipfs/go-libp2p-peer" inet "github.com/ipfs/go-libp2p/p2p/net" - "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" - goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + "github.com/jbenet/goprocess" + goprocessctx "github.com/jbenet/goprocess/context" + context "golang.org/x/net/context" ) // peernet implements inet.Network diff --git a/p2p/net/mock/mock_printer.go b/p2p/net/mock/mock_printer.go index 226972c107..7afb1213fe 100644 --- a/p2p/net/mock/mock_printer.go +++ b/p2p/net/mock/mock_printer.go @@ -4,8 +4,8 @@ import ( "fmt" "io" + peer "github.com/ipfs/go-libp2p-peer" inet "github.com/ipfs/go-libp2p/p2p/net" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" ) // separate object so our interfaces are separate :) diff --git a/p2p/net/mock/mock_stream.go b/p2p/net/mock/mock_stream.go index fec8104927..78b4d750ec 100644 --- a/p2p/net/mock/mock_stream.go +++ b/p2p/net/mock/mock_stream.go @@ -6,7 +6,7 @@ import ( "time" inet "github.com/ipfs/go-libp2p/p2p/net" - process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" + process "github.com/jbenet/goprocess" ) // stream implements inet.Stream diff --git a/p2p/net/mock/mock_test.go b/p2p/net/mock/mock_test.go index 2519ed837e..a4964a6a9c 100644 --- a/p2p/net/mock/mock_test.go +++ b/p2p/net/mock/mock_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" + peer "github.com/ipfs/go-libp2p-peer" inet "github.com/ipfs/go-libp2p/p2p/net" protocol "github.com/ipfs/go-libp2p/p2p/protocol" testutil "github.com/ipfs/go-libp2p/testutil" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - detectrace "gx/ipfs/QmQHGMVmrsgmqUG8ih3puNXUJneSpi13dkcZpzLKkskUkH/go-detect-race" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + detectrace "github.com/jbenet/go-detect-race" + context "golang.org/x/net/context" ) func randPeer(t *testing.T) peer.ID { diff --git a/p2p/net/swarm/addr/addr.go b/p2p/net/swarm/addr/addr.go index 7cda66439c..1e22bae261 100644 --- a/p2p/net/swarm/addr/addr.go +++ b/p2p/net/swarm/addr/addr.go @@ -3,10 +3,10 @@ package addrutil import ( "fmt" - manet "gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + logging "github.com/ipfs/go-log" + 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/p2p/net/swarm/addr/addr_test.go b/p2p/net/swarm/addr/addr_test.go index 8793bc0917..17039967e3 100644 --- a/p2p/net/swarm/addr/addr_test.go +++ b/p2p/net/swarm/addr/addr_test.go @@ -3,8 +3,8 @@ package addrutil import ( "testing" - manet "gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/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/p2p/net/swarm/dial_test.go b/p2p/net/swarm/dial_test.go index 31efd1b467..988f7f7f01 100644 --- a/p2p/net/swarm/dial_test.go +++ b/p2p/net/swarm/dial_test.go @@ -7,14 +7,14 @@ import ( "testing" "time" + peer "github.com/ipfs/go-libp2p-peer" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" testutil "github.com/ipfs/go-libp2p/testutil" ci "github.com/ipfs/go-libp2p/testutil/ci" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - manet "gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + manet "github.com/jbenet/go-multiaddr-net" + context "golang.org/x/net/context" ) func closeSwarms(swarms []*Swarm) { diff --git a/p2p/net/swarm/peers_test.go b/p2p/net/swarm/peers_test.go index 6429a86278..cacd88ece8 100644 --- a/p2p/net/swarm/peers_test.go +++ b/p2p/net/swarm/peers_test.go @@ -3,9 +3,9 @@ package swarm import ( "testing" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + peer "github.com/ipfs/go-libp2p-peer" + ma "github.com/jbenet/go-multiaddr" + context "golang.org/x/net/context" ) func TestPeers(t *testing.T) { diff --git a/p2p/net/swarm/simul_test.go b/p2p/net/swarm/simul_test.go index b0c5497743..39ba6411b6 100644 --- a/p2p/net/swarm/simul_test.go +++ b/p2p/net/swarm/simul_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" + peer "github.com/ipfs/go-libp2p-peer" ci "github.com/ipfs/go-libp2p/testutil/ci" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + context "golang.org/x/net/context" ) func TestSimultOpen(t *testing.T) { diff --git a/p2p/net/swarm/swarm.go b/p2p/net/swarm/swarm.go index 5f75b5494a..c812f37565 100644 --- a/p2p/net/swarm/swarm.go +++ b/p2p/net/swarm/swarm.go @@ -8,25 +8,25 @@ import ( "sync" "time" + peer "github.com/ipfs/go-libp2p-peer" + transport "github.com/ipfs/go-libp2p-transport" metrics "github.com/ipfs/go-libp2p/p2p/metrics" mconn "github.com/ipfs/go-libp2p/p2p/metrics/conn" inet "github.com/ipfs/go-libp2p/p2p/net" conn "github.com/ipfs/go-libp2p/p2p/net/conn" filter "github.com/ipfs/go-libp2p/p2p/net/filter" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" - "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" - goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context" - transport "gx/ipfs/QmRHqYZs3Diy8YC3bW16zvs8VDDwS2ARKBuKwALxEMqibc/go-libp2p-transport" - pst "gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer" - psmss "gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer/multistream" - spdy "gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer/spdystream" - yamux "gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer/yamux" - ps "gx/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8/go-peerstream" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" - mafilter "gx/ipfs/Qme8dipKnZAChkp5Kfgj2MYYyBbzjqqPXmxQx3g9v3MoxP/multiaddr-filter" + logging "github.com/ipfs/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" + spdy "github.com/jbenet/go-stream-muxer/spdystream" + yamux "github.com/jbenet/go-stream-muxer/yamux" + "github.com/jbenet/goprocess" + goprocessctx "github.com/jbenet/goprocess/context" + mafilter "github.com/whyrusleeping/multiaddr-filter" + context "golang.org/x/net/context" ) var log = logging.Logger("swarm2") diff --git a/p2p/net/swarm/swarm_addr.go b/p2p/net/swarm/swarm_addr.go index faab0a3fdb..039683bfb9 100644 --- a/p2p/net/swarm/swarm_addr.go +++ b/p2p/net/swarm/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/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" ) // ListenAddresses returns a list of addresses at which this swarm listens. diff --git a/p2p/net/swarm/swarm_addr_test.go b/p2p/net/swarm/swarm_addr_test.go index 9822ff7d44..42ee299e87 100644 --- a/p2p/net/swarm/swarm_addr_test.go +++ b/p2p/net/swarm/swarm_addr_test.go @@ -3,13 +3,13 @@ package swarm import ( "testing" + peer "github.com/ipfs/go-libp2p-peer" metrics "github.com/ipfs/go-libp2p/p2p/metrics" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" testutil "github.com/ipfs/go-libp2p/testutil" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + context "golang.org/x/net/context" ) func TestFilterAddrs(t *testing.T) { diff --git a/p2p/net/swarm/swarm_conn.go b/p2p/net/swarm/swarm_conn.go index d815f7dc0e..96700ba835 100644 --- a/p2p/net/swarm/swarm_conn.go +++ b/p2p/net/swarm/swarm_conn.go @@ -6,11 +6,11 @@ import ( inet "github.com/ipfs/go-libp2p/p2p/net" conn "github.com/ipfs/go-libp2p/p2p/net/conn" - ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" - ps "gx/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8/go-peerstream" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ic "github.com/ipfs/go-libp2p-crypto" + peer "github.com/ipfs/go-libp2p-peer" + 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/p2p/net/swarm/swarm_dial.go b/p2p/net/swarm/swarm_dial.go index c069543d51..aa4a3514b4 100644 --- a/p2p/net/swarm/swarm_dial.go +++ b/p2p/net/swarm/swarm_dial.go @@ -8,13 +8,13 @@ import ( "sync" "time" + lgbl "github.com/ipfs/go-libp2p-loggables" + peer "github.com/ipfs/go-libp2p-peer" conn "github.com/ipfs/go-libp2p/p2p/net/conn" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" - "gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" - lgbl "gx/ipfs/QmYqiDbGUGqatbPFie11Py8cnyduoJYqcgKtjfhu1SQLh1/go-libp2p-loggables" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + "github.com/jbenet/go-multiaddr-net" + context "golang.org/x/net/context" ) // Diagram of dial sync: diff --git a/p2p/net/swarm/swarm_listen.go b/p2p/net/swarm/swarm_listen.go index e17cda6e7f..38457f16fe 100644 --- a/p2p/net/swarm/swarm_listen.go +++ b/p2p/net/swarm/swarm_listen.go @@ -3,14 +3,14 @@ package swarm import ( "fmt" + lgbl "github.com/ipfs/go-libp2p-loggables" + transport "github.com/ipfs/go-libp2p-transport" mconn "github.com/ipfs/go-libp2p/p2p/metrics/conn" inet "github.com/ipfs/go-libp2p/p2p/net" conn "github.com/ipfs/go-libp2p/p2p/net/conn" - transport "gx/ipfs/QmRHqYZs3Diy8YC3bW16zvs8VDDwS2ARKBuKwALxEMqibc/go-libp2p-transport" - lgbl "gx/ipfs/QmYqiDbGUGqatbPFie11Py8cnyduoJYqcgKtjfhu1SQLh1/go-libp2p-loggables" - ps "gx/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8/go-peerstream" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + 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/p2p/net/swarm/swarm_net.go b/p2p/net/swarm/swarm_net.go index 14a3a953d4..84cc6326eb 100644 --- a/p2p/net/swarm/swarm_net.go +++ b/p2p/net/swarm/swarm_net.go @@ -3,13 +3,13 @@ package swarm import ( "fmt" + peer "github.com/ipfs/go-libp2p-peer" metrics "github.com/ipfs/go-libp2p/p2p/metrics" inet "github.com/ipfs/go-libp2p/p2p/net" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + 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/p2p/net/swarm/swarm_net_test.go b/p2p/net/swarm/swarm_net_test.go index 1ffb44812e..14c590b9d1 100644 --- a/p2p/net/swarm/swarm_net_test.go +++ b/p2p/net/swarm/swarm_net_test.go @@ -7,7 +7,7 @@ import ( inet "github.com/ipfs/go-libp2p/p2p/net" testutil "github.com/ipfs/go-libp2p/p2p/test/util" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + context "golang.org/x/net/context" ) // TestConnectednessCorrect starts a few networks, connects a few diff --git a/p2p/net/swarm/swarm_notif_test.go b/p2p/net/swarm/swarm_notif_test.go index 0230ac4ab7..aa4fca2448 100644 --- a/p2p/net/swarm/swarm_notif_test.go +++ b/p2p/net/swarm/swarm_notif_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" + peer "github.com/ipfs/go-libp2p-peer" inet "github.com/ipfs/go-libp2p/p2p/net" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + context "golang.org/x/net/context" ) func TestNotifications(t *testing.T) { diff --git a/p2p/net/swarm/swarm_stream.go b/p2p/net/swarm/swarm_stream.go index 3fbcc5d37c..7965d27439 100644 --- a/p2p/net/swarm/swarm_stream.go +++ b/p2p/net/swarm/swarm_stream.go @@ -3,7 +3,7 @@ package swarm import ( inet "github.com/ipfs/go-libp2p/p2p/net" - ps "gx/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8/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/p2p/net/swarm/swarm_test.go b/p2p/net/swarm/swarm_test.go index c231e3b248..6e9f121fcd 100644 --- a/p2p/net/swarm/swarm_test.go +++ b/p2p/net/swarm/swarm_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" + peer "github.com/ipfs/go-libp2p-peer" metrics "github.com/ipfs/go-libp2p/p2p/metrics" inet "github.com/ipfs/go-libp2p/p2p/net" testutil "github.com/ipfs/go-libp2p/testutil" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + context "golang.org/x/net/context" ) func EchoStreamHandler(stream inet.Stream) { diff --git a/p2p/protocol/identify/id.go b/p2p/protocol/identify/id.go index cbfec59de7..ce8ea91cb3 100644 --- a/p2p/protocol/identify/id.go +++ b/p2p/protocol/identify/id.go @@ -4,19 +4,19 @@ import ( "strings" "sync" + semver "github.com/coreos/go-semver/semver" + ggio "github.com/gogo/protobuf/io" + peer "github.com/ipfs/go-libp2p-peer" host "github.com/ipfs/go-libp2p/p2p/host" mstream "github.com/ipfs/go-libp2p/p2p/metrics/stream" inet "github.com/ipfs/go-libp2p/p2p/net" pb "github.com/ipfs/go-libp2p/p2p/protocol/identify/pb" - msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream" - ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" - semver "gx/ipfs/QmcrrEpx3VMUbrbgVroH3YiYyUS5c4YAykzyPJWKspUYLa/go-semver/semver" - - lgbl "gx/ipfs/QmYqiDbGUGqatbPFie11Py8cnyduoJYqcgKtjfhu1SQLh1/go-libp2p-loggables" - logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" + ma "github.com/jbenet/go-multiaddr" + msmux "github.com/whyrusleeping/go-multistream" + context "golang.org/x/net/context" + + lgbl "github.com/ipfs/go-libp2p-loggables" + logging "github.com/ipfs/go-log" ) var log = logging.Logger("net/identify") diff --git a/p2p/protocol/identify/id_test.go b/p2p/protocol/identify/id_test.go index fb261108dc..f2721d4085 100644 --- a/p2p/protocol/identify/id_test.go +++ b/p2p/protocol/identify/id_test.go @@ -4,13 +4,13 @@ import ( "testing" "time" + peer "github.com/ipfs/go-libp2p-peer" host "github.com/ipfs/go-libp2p/p2p/host" identify "github.com/ipfs/go-libp2p/p2p/protocol/identify" testutil "github.com/ipfs/go-libp2p/p2p/test/util" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + context "golang.org/x/net/context" ) func subtestIDService(t *testing.T, postDialWait time.Duration) { diff --git a/p2p/protocol/identify/obsaddr.go b/p2p/protocol/identify/obsaddr.go index 86c3dd33bb..fa50d55175 100644 --- a/p2p/protocol/identify/obsaddr.go +++ b/p2p/protocol/identify/obsaddr.go @@ -4,8 +4,8 @@ import ( "sync" "time" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + peer "github.com/ipfs/go-libp2p-peer" + ma "github.com/jbenet/go-multiaddr" ) // ObservedAddr is an entry for an address reported by our peers. diff --git a/p2p/protocol/identify/obsaddr_test.go b/p2p/protocol/identify/obsaddr_test.go index 6a2d330467..81413c4f09 100644 --- a/p2p/protocol/identify/obsaddr_test.go +++ b/p2p/protocol/identify/obsaddr_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" ) // TestObsAddrSet diff --git a/p2p/protocol/identify/pb/identify.pb.go b/p2p/protocol/identify/pb/identify.pb.go index c6634f6494..cc4cba4975 100644 --- a/p2p/protocol/identify/pb/identify.pb.go +++ b/p2p/protocol/identify/pb/identify.pb.go @@ -13,7 +13,7 @@ It has these top-level messages: */ package identify_pb -import proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" +import proto "github.com/gogo/protobuf/proto" import math "math" // Reference imports to suppress errors if they are not otherwise used. diff --git a/p2p/protocol/ping/ping.go b/p2p/protocol/ping/ping.go index 7d2fc8caca..803525108c 100644 --- a/p2p/protocol/ping/ping.go +++ b/p2p/protocol/ping/ping.go @@ -6,12 +6,12 @@ import ( "io" "time" + u "github.com/ipfs/go-ipfs-util" + peer "github.com/ipfs/go-libp2p-peer" host "github.com/ipfs/go-libp2p/p2p/host" inet "github.com/ipfs/go-libp2p/p2p/net" - u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" + logging "github.com/ipfs/go-log" + context "golang.org/x/net/context" ) var log = logging.Logger("ping") diff --git a/p2p/protocol/ping/ping_test.go b/p2p/protocol/ping/ping_test.go index 31006e29b6..f54275341f 100644 --- a/p2p/protocol/ping/ping_test.go +++ b/p2p/protocol/ping/ping_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" + peer "github.com/ipfs/go-libp2p-peer" netutil "github.com/ipfs/go-libp2p/p2p/test/util" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + context "golang.org/x/net/context" ) func TestPing(t *testing.T) { diff --git a/p2p/protocol/relay/relay.go b/p2p/protocol/relay/relay.go index ac9a114855..e2ad262bbc 100644 --- a/p2p/protocol/relay/relay.go +++ b/p2p/protocol/relay/relay.go @@ -5,13 +5,13 @@ import ( "io" "time" + peer "github.com/ipfs/go-libp2p-peer" host "github.com/ipfs/go-libp2p/p2p/host" inet "github.com/ipfs/go-libp2p/p2p/net" protocol "github.com/ipfs/go-libp2p/p2p/protocol" - mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" + logging "github.com/ipfs/go-log" + mh "github.com/jbenet/go-multihash" + context "golang.org/x/net/context" ) var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/protocol/relay") diff --git a/p2p/protocol/relay/relay_test.go b/p2p/protocol/relay/relay_test.go index 681fe28000..57e69a661c 100644 --- a/p2p/protocol/relay/relay_test.go +++ b/p2p/protocol/relay/relay_test.go @@ -8,9 +8,9 @@ import ( protocol "github.com/ipfs/go-libp2p/p2p/protocol" relay "github.com/ipfs/go-libp2p/p2p/protocol/relay" testutil "github.com/ipfs/go-libp2p/p2p/test/util" - msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" + logging "github.com/ipfs/go-log" + msmux "github.com/whyrusleeping/go-multistream" + context "golang.org/x/net/context" ) var log = logging.Logger("relay_test") diff --git a/p2p/test/backpressure/backpressure_test.go b/p2p/test/backpressure/backpressure_test.go index 916e084f7e..f9a5d40201 100644 --- a/p2p/test/backpressure/backpressure_test.go +++ b/p2p/test/backpressure/backpressure_test.go @@ -6,14 +6,14 @@ import ( "testing" "time" + u "github.com/ipfs/go-ipfs-util" + peer "github.com/ipfs/go-libp2p-peer" host "github.com/ipfs/go-libp2p/p2p/host" inet "github.com/ipfs/go-libp2p/p2p/net" protocol "github.com/ipfs/go-libp2p/p2p/protocol" testutil "github.com/ipfs/go-libp2p/p2p/test/util" - u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" + logging "github.com/ipfs/go-log" + context "golang.org/x/net/context" ) var log = logging.Logger("backpressure") diff --git a/p2p/test/reconnects/reconnect_test.go b/p2p/test/reconnects/reconnect_test.go index 71a57b6ac0..81c0d59702 100644 --- a/p2p/test/reconnects/reconnect_test.go +++ b/p2p/test/reconnects/reconnect_test.go @@ -7,15 +7,15 @@ import ( "testing" "time" + u "github.com/ipfs/go-ipfs-util" host "github.com/ipfs/go-libp2p/p2p/host" inet "github.com/ipfs/go-libp2p/p2p/net" swarm "github.com/ipfs/go-libp2p/p2p/net/swarm" protocol "github.com/ipfs/go-libp2p/p2p/protocol" testutil "github.com/ipfs/go-libp2p/p2p/test/util" - ps "gx/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8/go-peerstream" - u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" + logging "github.com/ipfs/go-log" + ps "github.com/jbenet/go-peerstream" + context "golang.org/x/net/context" ) func init() { diff --git a/p2p/test/util/key.go b/p2p/test/util/key.go index a4dfd13f09..2cbc436c2a 100644 --- a/p2p/test/util/key.go +++ b/p2p/test/util/key.go @@ -5,13 +5,13 @@ import ( "io" "testing" + u "github.com/ipfs/go-ipfs-util" + ic "github.com/ipfs/go-libp2p-crypto" + peer "github.com/ipfs/go-libp2p-peer" testutil "github.com/ipfs/go-libp2p/testutil" - ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" - u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" + logging "github.com/ipfs/go-log" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" ) var log = logging.Logger("boguskey") diff --git a/p2p/test/util/util.go b/p2p/test/util/util.go index 9c9b23db76..275129bbdd 100644 --- a/p2p/test/util/util.go +++ b/p2p/test/util/util.go @@ -3,15 +3,15 @@ package testutil import ( "testing" + peer "github.com/ipfs/go-libp2p-peer" bhost "github.com/ipfs/go-libp2p/p2p/host/basic" metrics "github.com/ipfs/go-libp2p/p2p/metrics" inet "github.com/ipfs/go-libp2p/p2p/net" swarm "github.com/ipfs/go-libp2p/p2p/net/swarm" tu "github.com/ipfs/go-libp2p/testutil" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" + context "golang.org/x/net/context" ) func GenSwarmNetwork(t *testing.T, ctx context.Context) *swarm.Network { diff --git a/package.json b/package.json index 7ce4acf4aa..bf07a35776 100644 --- a/package.json +++ b/package.json @@ -143,6 +143,12 @@ "name": "gorocheck", "version": "0.0.0" }, + { + "author": "whyrusleeping", + "name": "go-libp2p-loggables", + "hash": "QmYqiDbGUGqatbPFie11Py8cnyduoJYqcgKtjfhu1SQLh1", + "version": "1.0.1" + }, { "author": "whyrusleeping", "hash": "QmPKuU1ohMDaJRJHmatXewCqjZp5wKrD3CK6m9TnCK6XBe", @@ -163,4 +169,4 @@ "license": "", "name": "go-libp2p", "version": "2.0.3" -} \ No newline at end of file +} diff --git a/testutil/gen.go b/testutil/gen.go index 48f2ab1371..246216fffd 100644 --- a/testutil/gen.go +++ b/testutil/gen.go @@ -8,11 +8,11 @@ import ( "sync" "testing" - ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" - u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" + u "github.com/ipfs/go-ipfs-util" + ci "github.com/ipfs/go-libp2p-crypto" + peer "github.com/ipfs/go-libp2p-peer" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ma "github.com/jbenet/go-multiaddr" ) // ZeroLocalTCPAddress is the "zero" tcp local multiaddr. This means: diff --git a/testutil/identity.go b/testutil/identity.go index c4c2ded847..72e37b5190 100644 --- a/testutil/identity.go +++ b/testutil/identity.go @@ -3,9 +3,9 @@ package testutil import ( "testing" - ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" - peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" - ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" + ci "github.com/ipfs/go-libp2p-crypto" + peer "github.com/ipfs/go-libp2p-peer" + ma "github.com/jbenet/go-multiaddr" ) type Identity interface { From fa837475712e16ba350b9f608fa8f5240a2e74bf Mon Sep 17 00:00:00 2001 From: Lars Gierth Date: Sat, 16 Apr 2016 20:26:35 -0700 Subject: [PATCH 2/5] Fix bugs and gxVersion fields in manifest License: MIT Signed-off-by: Lars Gierth --- package.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index bf07a35776..b4fcc6f254 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,4 @@ { - "author": "whyrusleeping", - "bugs": {}, - "gx": { - "dvcsimport": "github.com/ipfs/go-libp2p", - "goversion": "1.5.2" - }, "gxDependencies": [ { "hash": "QmcrrEpx3VMUbrbgVroH3YiYyUS5c4YAykzyPJWKspUYLa", @@ -162,11 +156,17 @@ "version": "1.1.0" } ], - "gxVersion": "0.6.0", - "gx_version": "0.4.0", - "issues_url": "", - "language": "go", - "license": "", + "license": "MIT", "name": "go-libp2p", - "version": "2.0.3" + "version": "2.0.3", + "language": "go", + "gxVersion": "0.4.0", + "gx": { + "dvcsimport": "github.com/ipfs/go-libp2p", + "goversion":"1.5.2" + }, + "bugs": { + "url": "https://github.com/ipfs/go-libp2p" + }, + "author": "whyrusleeping" } From 7d2224667a78a5c5c792473a9b46d49c19075cb5 Mon Sep 17 00:00:00 2001 From: Lars Gierth Date: Sat, 16 Apr 2016 21:01:30 -0700 Subject: [PATCH 3/5] Add package extraction notes License: MIT Signed-off-by: Lars Gierth --- README.md | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5627b62c63..f9625b2de3 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ libp2p is the product of a long, and arduous quest of understanding -- a deep di libp2p implementation in Go is a work in progress. As such, there's a few things you can do right now to help out: - Go through the modules below and **check out existing issues**. This would be especially useful for modules in active development. Some knowledge of IPFS/libp2p may be required, as well as the infrasture behind it - for instance, you may need to read up on p2p and more complex operations like muxing to be able to help technically. - - **Perform code reviews**. + - **Perform code reviews**. - **Add tests**. There can never be enough tests. # Usage @@ -53,3 +53,55 @@ $ go test ./p2p/ ## Links - [**Specs**](https://github.com/ipfs/specs/tree/master/libp2p) - [**Website**](https://github.com/diasdavid/libp2p-website) + + +## Extracting packages from go-libp2p + +We want to maintain history, so we'll use git-subtree for extracting packages. + +```sh +# 1) create the extracted tree (has the directory specified as -P as its root) +> cd go-libp2p/ +> git subtree split -P p2p/crypto/secio/ -b libp2p-secio +62b0a5c21574bcbe06c422785cd5feff378ae5bd +# important to delete the tree now, so that outdated imports fail in step 5 +> git rm -r p2p/crypto/secio/ +> git commit +> cd ../ + +# 2) make the new repo +> mkdir go-libp2p-secio +> cd go-libp2p-secio/ +> git init && git commit --allow-empty + +# 3) fetch the extracted tree from the previous repo +> git remote add libp2p ../go-libp2p +> git fetch libp2p +> git reset --hard libp2p/libp2p-secio + +# 4) update self import paths +> sed -someflagsidontknow 'go-libp2p/p2p/crypto/secio' 'golibp2p-secio' +> git commit + +# 5) create package.json and check all imports are correct +> vim package.json +> gx --verbose install --global +> gx-go rewrite +> go test ./... +> gx-go rewrite --undo +> git commit + +# 4) make the package ready +> vim README.md LICENSE +> git commit + +# 5) bump the version separately +> vim package.json +> gx publish +> git add package.json .gx/ +> git commit -m 'Publish 1.2.3' + +# 6) clean up and push +> git remote rm libp2p +> git push origin master +``` From 55d6bd1eed095acd4d2d2f207f84513365265bb6 Mon Sep 17 00:00:00 2001 From: Lars Gierth Date: Sat, 16 Apr 2016 21:14:38 -0700 Subject: [PATCH 4/5] Publish 3.0.0 License: MIT Signed-off-by: Lars Gierth --- .gx/lastpubver | 2 +- package.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gx/lastpubver b/.gx/lastpubver index b9a49d6b60..87faa7dc0b 100644 --- a/.gx/lastpubver +++ b/.gx/lastpubver @@ -1 +1 @@ -2.0.3: QmXDvxcXUYn2DDnGKJwdQPxkJgG83jBTp5UmmNzeHzqbj5 +3.0.0: QmQKQiD9d8mSPRhB4g3b6nRL9AHg4db9Rgu5Vw5LDUuyep diff --git a/package.json b/package.json index b4fcc6f254..66e96ee02f 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,7 @@ { + "name": "go-libp2p", + "author": "whyrusleeping", + "version": "3.0.0", "gxDependencies": [ { "hash": "QmcrrEpx3VMUbrbgVroH3YiYyUS5c4YAykzyPJWKspUYLa", @@ -157,8 +160,6 @@ } ], "license": "MIT", - "name": "go-libp2p", - "version": "2.0.3", "language": "go", "gxVersion": "0.4.0", "gx": { @@ -167,6 +168,5 @@ }, "bugs": { "url": "https://github.com/ipfs/go-libp2p" - }, - "author": "whyrusleeping" + } } From 664cf0001fe0f79f391549040320abb2e944e2c4 Mon Sep 17 00:00:00 2001 From: Lars Gierth Date: Sat, 16 Apr 2016 21:49:25 -0700 Subject: [PATCH 5/5] Rewrite import paths for CI License: MIT Signed-off-by: Lars Gierth --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3ed1cf5ab6..072d4c8ddf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ install: true script: - make deps + - gx-go rewrite - go test ./p2p/... cache: