From 8e33c7379af09fc7e1e579bc62ba1d60adfd193d Mon Sep 17 00:00:00 2001 From: Jeromy Date: Mon, 4 Jan 2016 05:45:58 -0800 Subject: [PATCH] path rewrites --- 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 39f00db..8711e8d 100644 --- a/addr/addr.go +++ b/addr/addr.go @@ -3,11 +3,11 @@ package addrutil import ( "fmt" - logging "github.com/ipfs/go-log" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-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 49eec13..aa82097 100644 --- a/addr/addr_test.go +++ b/addr/addr_test.go @@ -3,8 +3,8 @@ package addrutil import ( "testing" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net" ) func newMultiaddr(t *testing.T, s string) ma.Multiaddr { diff --git a/dial_test.go b/dial_test.go index 57a4d7f..72dd858 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" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func acceptAndHang(l net.Listener) { diff --git a/peers_test.go b/peers_test.go index b107fbf..3451ec1 100644 --- a/peers_test.go +++ b/peers_test.go @@ -5,8 +5,8 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" - ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func TestPeers(t *testing.T) { diff --git a/simul_test.go b/simul_test.go index bd753e7..a838f30 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 "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func TestSimultOpen(t *testing.T) { diff --git a/swarm.go b/swarm.go index c71ef35..c422645 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" - 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" + ps "gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/go-peerstream" + "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" + goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + pst "gx/ipfs/QmTYr6RrJs8b63LTVwahmtytnuqzsLfNPBJp6EvmFWHbGh/go-stream-muxer" + psmss "gx/ipfs/QmTYr6RrJs8b63LTVwahmtytnuqzsLfNPBJp6EvmFWHbGh/go-stream-muxer/multistream" + mafilter "gx/ipfs/QmW3Q7RQa8D1qCEEeyKCBV1drgFxvHBqAZ3zgCujEwKpHD/multiaddr-filter" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" ) var log = logging.Logger("swarm2") diff --git a/swarm_addr.go b/swarm_addr.go index 039683b..5b7aae5 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 "github.com/jbenet/go-multiaddr" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/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 7db46d3..f48291b 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 "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func TestFilterAddrs(t *testing.T) { diff --git a/swarm_conn.go b/swarm_conn.go index 840a9b4..b8c5633 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" - ma "github.com/jbenet/go-multiaddr" - ps "github.com/jbenet/go-peerstream" - context "golang.org/x/net/context" + ps "gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/go-peerstream" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-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 0cb2858..e05a2a2 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" - "github.com/jbenet/go-multiaddr-net" + "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net" - ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) // Diagram of dial sync: diff --git a/swarm_listen.go b/swarm_listen.go index f184640..4584250 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" - ma "github.com/jbenet/go-multiaddr" - ps "github.com/jbenet/go-peerstream" - context "golang.org/x/net/context" + ps "gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/go-peerstream" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) // Open listeners and reuse-dialers for the given addresses diff --git a/swarm_net.go b/swarm_net.go index a8361fc..1d75814 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 "github.com/jbenet/go-multiaddr" - "github.com/jbenet/goprocess" - context "golang.org/x/net/context" + "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) // Network implements the inet.Network interface. diff --git a/swarm_net_test.go b/swarm_net_test.go index 14c590b..1ffb448 100644 --- a/swarm_net_test.go +++ b/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 "golang.org/x/net/context" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) // TestConnectednessCorrect starts a few networks, connects a few diff --git a/swarm_notif_test.go b/swarm_notif_test.go index 0d976e8..d6f06da 100644 --- a/swarm_notif_test.go +++ b/swarm_notif_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-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 7965d27..3f9115f 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 "github.com/jbenet/go-peerstream" + ps "gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/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 a1c3569..1166f52 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 "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func EchoStreamHandler(stream inet.Stream) { -- GitLab