From 417004c7c5ce3d454650f955fd9ec83cc3528325 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Sun, 15 Nov 2015 18:42:27 -0800 Subject: [PATCH] vendor in notifier --- addr/addr.go | 2 +- dial_test.go | 2 +- peers_test.go | 2 +- simul_test.go | 2 +- swarm.go | 6 +++--- swarm_addr_test.go | 2 +- swarm_conn.go | 2 +- swarm_dial.go | 2 +- swarm_listen.go | 2 +- swarm_net.go | 4 ++-- swarm_net_test.go | 2 +- swarm_notif_test.go | 2 +- swarm_test.go | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/addr/addr.go b/addr/addr.go index c0c4851..857b0f7 100644 --- a/addr/addr.go +++ b/addr/addr.go @@ -6,8 +6,8 @@ import ( logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log" manet "QmU5s159q8cZuM1f9Vqti4LHu6y8zyVc5dxv2py81sdp6Q/go-multiaddr-net" + context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" - context "golang.org/x/net/context" ) var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/net/swarm/addr") diff --git a/dial_test.go b/dial_test.go index 632ceb7..027e794 100644 --- a/dial_test.go +++ b/dial_test.go @@ -14,8 +14,8 @@ import ( ci "util/testutil/ci" manet "QmU5s159q8cZuM1f9Vqti4LHu6y8zyVc5dxv2py81sdp6Q/go-multiaddr-net" + context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" - context "golang.org/x/net/context" ) func acceptAndHang(l net.Listener) { diff --git a/peers_test.go b/peers_test.go index 29099de..0068b37 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" - context "golang.org/x/net/context" ) func TestPeers(t *testing.T) { diff --git a/simul_test.go b/simul_test.go index 7adc022..549dad4 100644 --- a/simul_test.go +++ b/simul_test.go @@ -9,8 +9,8 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" ci "util/testutil/ci" + context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" - context "golang.org/x/net/context" ) func TestSimultOpen(t *testing.T) { diff --git a/swarm.go b/swarm.go index 2fcd275..e542480 100644 --- a/swarm.go +++ b/swarm.go @@ -16,15 +16,15 @@ import ( transport "github.com/ipfs/go-libp2p/p2p/net/transport" peer "github.com/ipfs/go-libp2p/p2p/peer" + "QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess" + goprocessctx "QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess/context" mafilter "QmYWqTn1i8yv9QRDzGPJ2yRudKzYCaC5Aqasbm8vwaG92E/multiaddr-filter" + context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/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" - context "golang.org/x/net/context" logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log" ) diff --git a/swarm_addr_test.go b/swarm_addr_test.go index 0b0d6ff..ec5c657 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 "util/testutil" + context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" - context "golang.org/x/net/context" ) func TestFilterAddrs(t *testing.T) { diff --git a/swarm_conn.go b/swarm_conn.go index be95a42..7b9c920 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" + context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/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/swarm_dial.go b/swarm_dial.go index 2bedebc..3c7aa01 100644 --- a/swarm_dial.go +++ b/swarm_dial.go @@ -14,8 +14,8 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" lgbl "util/eventlog/loggables" + context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" - context "golang.org/x/net/context" ) // Diagram of dial sync: diff --git a/swarm_listen.go b/swarm_listen.go index ee8ee91..8355815 100644 --- a/swarm_listen.go +++ b/swarm_listen.go @@ -9,9 +9,9 @@ import ( transport "github.com/ipfs/go-libp2p/p2p/net/transport" lgbl "util/eventlog/loggables" + context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/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/swarm_net.go b/swarm_net.go index 972afc1..36416fa 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" - "github.com/jbenet/goprocess" - context "golang.org/x/net/context" ) // Network implements the inet.Network interface. diff --git a/swarm_net_test.go b/swarm_net_test.go index 647c53c..2db22fb 100644 --- a/swarm_net_test.go +++ b/swarm_net_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - context "golang.org/x/net/context" + context "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 2ba852d..1180d64 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" - context "golang.org/x/net/context" inet "github.com/ipfs/go-libp2p/p2p/net" peer "github.com/ipfs/go-libp2p/p2p/peer" diff --git a/swarm_test.go b/swarm_test.go index f9ba35e..27331ad 100644 --- a/swarm_test.go +++ b/swarm_test.go @@ -14,8 +14,8 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" testutil "util/testutil" + context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context" ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr" - context "golang.org/x/net/context" ) func EchoStreamHandler(stream inet.Stream) { -- GitLab