From ac13de30f775a22ac0ea3486b7ff63cc7d27849a Mon Sep 17 00:00:00 2001 From: Jeromy Date: Sun, 15 Nov 2015 11:56:01 -0800 Subject: [PATCH] more vendoring --- addr/addr.go | 4 ++-- addr/addr_test.go | 4 ++-- dial_test.go | 4 ++-- peers_test.go | 2 +- simul_test.go | 2 +- swarm.go | 4 ++-- swarm_addr.go | 2 +- swarm_addr_test.go | 2 +- swarm_conn.go | 2 +- swarm_dial.go | 4 ++-- swarm_listen.go | 2 +- swarm_net.go | 2 +- swarm_notif_test.go | 2 +- swarm_test.go | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/addr/addr.go b/addr/addr.go index cec777a..cdb7058 100644 --- a/addr/addr.go +++ b/addr/addr.go @@ -5,8 +5,8 @@ import ( logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" + ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr" + manet "QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net" context "golang.org/x/net/context" ) diff --git a/addr/addr_test.go b/addr/addr_test.go index 49eec13..2015b97 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 "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr" + manet "QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net" ) func newMultiaddr(t *testing.T, s string) ma.Multiaddr { diff --git a/dial_test.go b/dial_test.go index f121f97..77f827c 100644 --- a/dial_test.go +++ b/dial_test.go @@ -13,8 +13,8 @@ import ( testutil "util/testutil" ci "util/testutil/ci" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" + ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr" + manet "QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net" context "golang.org/x/net/context" ) diff --git a/peers_test.go b/peers_test.go index b107fbf..cc8e143 100644 --- a/peers_test.go +++ b/peers_test.go @@ -5,7 +5,7 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" - ma "github.com/jbenet/go-multiaddr" + ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr" context "golang.org/x/net/context" ) diff --git a/simul_test.go b/simul_test.go index 63e07ff..c046ac2 100644 --- a/simul_test.go +++ b/simul_test.go @@ -9,7 +9,7 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" ci "util/testutil/ci" - ma "github.com/jbenet/go-multiaddr" + ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr" context "golang.org/x/net/context" ) diff --git a/swarm.go b/swarm.go index 245b720..d09b62a 100644 --- a/swarm.go +++ b/swarm.go @@ -16,14 +16,14 @@ import ( transport "github.com/ipfs/go-libp2p/p2p/net/transport" peer "github.com/ipfs/go-libp2p/p2p/peer" - ma "github.com/jbenet/go-multiaddr" + mafilter "QmVdADza4QFVAR9xqAxRQjt9vTZJ6UrVLgBstKua1Xg7he/multiaddr-filter" + ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/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" prom "github.com/prometheus/client_golang/prometheus" - mafilter "github.com/whyrusleeping/multiaddr-filter" context "golang.org/x/net/context" logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log" diff --git a/swarm_addr.go b/swarm_addr.go index 039683b..87ee37b 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 "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/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 b1f167a..78685a4 100644 --- a/swarm_addr_test.go +++ b/swarm_addr_test.go @@ -8,7 +8,7 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" testutil "util/testutil" - ma "github.com/jbenet/go-multiaddr" + ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr" context "golang.org/x/net/context" ) diff --git a/swarm_conn.go b/swarm_conn.go index 840a9b4..c97a47d 100644 --- a/swarm_conn.go +++ b/swarm_conn.go @@ -8,7 +8,7 @@ import ( conn "github.com/ipfs/go-libp2p/p2p/net/conn" peer "github.com/ipfs/go-libp2p/p2p/peer" - ma "github.com/jbenet/go-multiaddr" + ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr" ps "github.com/jbenet/go-peerstream" context "golang.org/x/net/context" ) diff --git a/swarm_dial.go b/swarm_dial.go index 4790eb0..47caa69 100644 --- a/swarm_dial.go +++ b/swarm_dial.go @@ -8,13 +8,13 @@ import ( "sync" "time" - "github.com/jbenet/go-multiaddr-net" + "QmanZCL6SXRfafiUEMCBLq2QR171uQSdXQ8YAdHXLd8Cwr/go-multiaddr-net" 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 "util/eventlog/loggables" - ma "github.com/jbenet/go-multiaddr" + ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr" context "golang.org/x/net/context" ) diff --git a/swarm_listen.go b/swarm_listen.go index f3da2ee..394d5c2 100644 --- a/swarm_listen.go +++ b/swarm_listen.go @@ -9,7 +9,7 @@ import ( transport "github.com/ipfs/go-libp2p/p2p/net/transport" lgbl "util/eventlog/loggables" - ma "github.com/jbenet/go-multiaddr" + ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr" ps "github.com/jbenet/go-peerstream" context "golang.org/x/net/context" ) diff --git a/swarm_net.go b/swarm_net.go index 91c4208..3c5e692 100644 --- a/swarm_net.go +++ b/swarm_net.go @@ -8,7 +8,7 @@ import ( metrics "github.com/ipfs/go-libp2p/p2p/metrics" inet "github.com/ipfs/go-libp2p/p2p/net" - ma "github.com/jbenet/go-multiaddr" + ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr" "github.com/jbenet/goprocess" context "golang.org/x/net/context" ) diff --git a/swarm_notif_test.go b/swarm_notif_test.go index 0d976e8..3d2ef86 100644 --- a/swarm_notif_test.go +++ b/swarm_notif_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - ma "github.com/jbenet/go-multiaddr" + ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr" context "golang.org/x/net/context" inet "github.com/ipfs/go-libp2p/p2p/net" diff --git a/swarm_test.go b/swarm_test.go index 2c98e5e..c6e4a98 100644 --- a/swarm_test.go +++ b/swarm_test.go @@ -14,7 +14,7 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" testutil "util/testutil" - ma "github.com/jbenet/go-multiaddr" + ma "QmaA6aDzeHjZiuqBtgYRz8ZXb1qMCoyMHgyDjBEYQniUKF/go-multiaddr" context "golang.org/x/net/context" ) -- GitLab