From fe940b8638b677b9afd7f2a7874302cc0c8fa39f Mon Sep 17 00:00:00 2001 From: Juan Batiz-Benet Date: Wed, 30 Sep 2015 19:24:00 -0400 Subject: [PATCH] rewrote imports to p2p --- dial_test.go | 4 ++-- peers_test.go | 2 +- simul_test.go | 2 +- swarm.go | 10 +++++----- swarm_addr.go | 4 ++-- swarm_addr_test.go | 6 +++--- swarm_conn.go | 8 ++++---- swarm_dial.go | 10 +++++----- swarm_listen.go | 10 +++++----- swarm_net.go | 6 +++--- swarm_net_test.go | 4 ++-- swarm_notif_test.go | 4 ++-- swarm_stream.go | 2 +- swarm_test.go | 6 +++--- 14 files changed, 39 insertions(+), 39 deletions(-) diff --git a/dial_test.go b/dial_test.go index 0ed10f4..4d4ea15 100644 --- a/dial_test.go +++ b/dial_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr" - peer "github.com/ipfs/go-ipfs/p2p/peer" + addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" + peer "github.com/ipfs/go-libp2p/p2p/peer" testutil "github.com/ipfs/go-ipfs/util/testutil" ci "github.com/ipfs/go-ipfs/util/testutil/ci" diff --git a/peers_test.go b/peers_test.go index 2f8b07e..65756a6 100644 --- a/peers_test.go +++ b/peers_test.go @@ -3,7 +3,7 @@ package swarm import ( "testing" - peer "github.com/ipfs/go-ipfs/p2p/peer" + peer "github.com/ipfs/go-libp2p/p2p/peer" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" diff --git a/simul_test.go b/simul_test.go index dfb775c..09be20a 100644 --- a/simul_test.go +++ b/simul_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - peer "github.com/ipfs/go-ipfs/p2p/peer" ci "github.com/ipfs/go-ipfs/util/testutil/ci" + peer "github.com/ipfs/go-libp2p/p2p/peer" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" diff --git a/swarm.go b/swarm.go index 5123690..b20b128 100644 --- a/swarm.go +++ b/swarm.go @@ -7,12 +7,12 @@ import ( "sync" "time" - metrics "github.com/ipfs/go-ipfs/metrics" - inet "github.com/ipfs/go-ipfs/p2p/net" - filter "github.com/ipfs/go-ipfs/p2p/net/filter" - addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr" - peer "github.com/ipfs/go-ipfs/p2p/peer" logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0" + inet "github.com/ipfs/go-libp2p/p2p/net" + filter "github.com/ipfs/go-libp2p/p2p/net/filter" + addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" + peer "github.com/ipfs/go-libp2p/p2p/peer" + metrics "github.com/ipfs/go-libp2p/util/metrics" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream" diff --git a/swarm_addr.go b/swarm_addr.go index 8f9360d..c3eaa3b 100644 --- a/swarm_addr.go +++ b/swarm_addr.go @@ -1,8 +1,8 @@ package swarm import ( - conn "github.com/ipfs/go-ipfs/p2p/net/conn" - addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr" + conn "github.com/ipfs/go-libp2p/p2p/net/conn" + addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ) diff --git a/swarm_addr_test.go b/swarm_addr_test.go index b75b491..fbfbcb8 100644 --- a/swarm_addr_test.go +++ b/swarm_addr_test.go @@ -3,10 +3,10 @@ package swarm import ( "testing" - metrics "github.com/ipfs/go-ipfs/metrics" - addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr" - peer "github.com/ipfs/go-ipfs/p2p/peer" testutil "github.com/ipfs/go-ipfs/util/testutil" + addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" + peer "github.com/ipfs/go-libp2p/p2p/peer" + metrics "github.com/ipfs/go-libp2p/util/metrics" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" diff --git a/swarm_conn.go b/swarm_conn.go index 126ace6..dd9f308 100644 --- a/swarm_conn.go +++ b/swarm_conn.go @@ -3,10 +3,10 @@ package swarm import ( "fmt" - ic "github.com/ipfs/go-ipfs/p2p/crypto" - inet "github.com/ipfs/go-ipfs/p2p/net" - conn "github.com/ipfs/go-ipfs/p2p/net/conn" - peer "github.com/ipfs/go-ipfs/p2p/peer" + ic "github.com/ipfs/go-libp2p/p2p/crypto" + inet "github.com/ipfs/go-libp2p/p2p/net" + conn "github.com/ipfs/go-libp2p/p2p/net/conn" + peer "github.com/ipfs/go-libp2p/p2p/peer" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream" diff --git a/swarm_dial.go b/swarm_dial.go index a68d288..d48d8a9 100644 --- a/swarm_dial.go +++ b/swarm_dial.go @@ -8,11 +8,11 @@ import ( "sync" "time" - mconn "github.com/ipfs/go-ipfs/metrics/conn" - conn "github.com/ipfs/go-ipfs/p2p/net/conn" - addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr" - peer "github.com/ipfs/go-ipfs/p2p/peer" - lgbl "github.com/ipfs/go-ipfs/util/eventlog/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/util/eventlog/loggables" + mconn "github.com/ipfs/go-libp2p/util/metrics/conn" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net" diff --git a/swarm_listen.go b/swarm_listen.go index d1bcb07..d41e173 100644 --- a/swarm_listen.go +++ b/swarm_listen.go @@ -3,11 +3,11 @@ package swarm import ( "fmt" - mconn "github.com/ipfs/go-ipfs/metrics/conn" - inet "github.com/ipfs/go-ipfs/p2p/net" - conn "github.com/ipfs/go-ipfs/p2p/net/conn" - addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr" - lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables" + inet "github.com/ipfs/go-libp2p/p2p/net" + conn "github.com/ipfs/go-libp2p/p2p/net/conn" + addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" + lgbl "github.com/ipfs/go-libp2p/util/eventlog/loggables" + mconn "github.com/ipfs/go-libp2p/util/metrics/conn" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net" diff --git a/swarm_net.go b/swarm_net.go index da9b522..863ef5e 100644 --- a/swarm_net.go +++ b/swarm_net.go @@ -3,10 +3,10 @@ package swarm import ( "fmt" - peer "github.com/ipfs/go-ipfs/p2p/peer" + peer "github.com/ipfs/go-libp2p/p2p/peer" - metrics "github.com/ipfs/go-ipfs/metrics" - inet "github.com/ipfs/go-ipfs/p2p/net" + inet "github.com/ipfs/go-libp2p/p2p/net" + metrics "github.com/ipfs/go-libp2p/util/metrics" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess" diff --git a/swarm_net_test.go b/swarm_net_test.go index b5f5c56..59c4892 100644 --- a/swarm_net_test.go +++ b/swarm_net_test.go @@ -6,8 +6,8 @@ import ( "time" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" - inet "github.com/ipfs/go-ipfs/p2p/net" - testutil "github.com/ipfs/go-ipfs/p2p/test/util" + inet "github.com/ipfs/go-libp2p/p2p/net" + testutil "github.com/ipfs/go-libp2p/p2p/test/util" ) // TestConnectednessCorrect starts a few networks, connects a few diff --git a/swarm_notif_test.go b/swarm_notif_test.go index 9b0e3a9..9bbf43e 100644 --- a/swarm_notif_test.go +++ b/swarm_notif_test.go @@ -7,8 +7,8 @@ import ( ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" - inet "github.com/ipfs/go-ipfs/p2p/net" - peer "github.com/ipfs/go-ipfs/p2p/peer" + inet "github.com/ipfs/go-libp2p/p2p/net" + peer "github.com/ipfs/go-libp2p/p2p/peer" ) func TestNotifications(t *testing.T) { diff --git a/swarm_stream.go b/swarm_stream.go index 66dd635..bcb188b 100644 --- a/swarm_stream.go +++ b/swarm_stream.go @@ -1,7 +1,7 @@ package swarm import ( - inet "github.com/ipfs/go-ipfs/p2p/net" + inet "github.com/ipfs/go-libp2p/p2p/net" ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream" ) diff --git a/swarm_test.go b/swarm_test.go index 9193db0..1d0479f 100644 --- a/swarm_test.go +++ b/swarm_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - metrics "github.com/ipfs/go-ipfs/metrics" - inet "github.com/ipfs/go-ipfs/p2p/net" - peer "github.com/ipfs/go-ipfs/p2p/peer" testutil "github.com/ipfs/go-ipfs/util/testutil" + inet "github.com/ipfs/go-libp2p/p2p/net" + peer "github.com/ipfs/go-libp2p/p2p/peer" + metrics "github.com/ipfs/go-libp2p/util/metrics" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" -- GitLab