From 495154fc8aeae61bc1b23c27614eed4449fa4c90 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Mon, 3 Oct 2016 11:00:00 -0700 Subject: [PATCH] switch to using stdlib context package --- addr/addr.go | 2 +- dial_test.go | 2 +- peers_test.go | 2 +- simul_test.go | 2 +- swarm_addr_test.go | 2 +- swarm_conn.go | 2 +- swarm_listen.go | 2 +- swarm_net.go | 2 +- swarm_net_test.go | 2 +- swarm_notif_test.go | 2 +- swarm_test.go | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addr/addr.go b/addr/addr.go index 08ca90a..4a14c43 100644 --- a/addr/addr.go +++ b/addr/addr.go @@ -3,10 +3,10 @@ package addrutil import ( "fmt" + "context" 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" _ "github.com/whyrusleeping/ws-transport" ) diff --git a/dial_test.go b/dial_test.go index aeeb6ae..ab65b8c 100644 --- a/dial_test.go +++ b/dial_test.go @@ -10,11 +10,11 @@ import ( testutil "github.com/libp2p/go-libp2p/testutil" ci "github.com/libp2p/go-libp2p/testutil/ci" + "context" peer "github.com/ipfs/go-libp2p-peer" pstore "github.com/ipfs/go-libp2p-peerstore" 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/peers_test.go b/peers_test.go index b63e655..5eadf4e 100644 --- a/peers_test.go +++ b/peers_test.go @@ -3,10 +3,10 @@ package swarm import ( "testing" + "context" peer "github.com/ipfs/go-libp2p-peer" pstore "github.com/ipfs/go-libp2p-peerstore" ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" ) func TestPeers(t *testing.T) { diff --git a/simul_test.go b/simul_test.go index c6ee6cf..bc9cf3a 100644 --- a/simul_test.go +++ b/simul_test.go @@ -8,10 +8,10 @@ import ( ci "github.com/libp2p/go-libp2p/testutil/ci" + "context" peer "github.com/ipfs/go-libp2p-peer" pstore "github.com/ipfs/go-libp2p-peerstore" ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" ) func TestSimultOpen(t *testing.T) { diff --git a/swarm_addr_test.go b/swarm_addr_test.go index 772413b..e221f7b 100644 --- a/swarm_addr_test.go +++ b/swarm_addr_test.go @@ -7,9 +7,9 @@ import ( addrutil "github.com/libp2p/go-libp2p/p2p/net/swarm/addr" testutil "github.com/libp2p/go-libp2p/testutil" + "context" pstore "github.com/ipfs/go-libp2p-peerstore" ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" ) func TestFilterAddrs(t *testing.T) { diff --git a/swarm_conn.go b/swarm_conn.go index 762ba6e..40f5bdf 100644 --- a/swarm_conn.go +++ b/swarm_conn.go @@ -6,11 +6,11 @@ import ( inet "github.com/libp2p/go-libp2p/p2p/net" conn "github.com/libp2p/go-libp2p/p2p/net/conn" + "context" 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" ) // Conn is a simple wrapper around a ps.Conn that also exposes diff --git a/swarm_listen.go b/swarm_listen.go index 92ccd83..e1b9a87 100644 --- a/swarm_listen.go +++ b/swarm_listen.go @@ -3,6 +3,7 @@ package swarm import ( "fmt" + "context" lgbl "github.com/ipfs/go-libp2p-loggables" ma "github.com/jbenet/go-multiaddr" ps "github.com/jbenet/go-peerstream" @@ -10,7 +11,6 @@ import ( mconn "github.com/libp2p/go-libp2p/p2p/metrics/conn" inet "github.com/libp2p/go-libp2p/p2p/net" conn "github.com/libp2p/go-libp2p/p2p/net/conn" - context "golang.org/x/net/context" ) func (s *Swarm) AddListenAddr(a ma.Multiaddr) error { diff --git a/swarm_net.go b/swarm_net.go index abf2f21..d9e83d5 100644 --- a/swarm_net.go +++ b/swarm_net.go @@ -8,9 +8,9 @@ import ( metrics "github.com/libp2p/go-libp2p/p2p/metrics" inet "github.com/libp2p/go-libp2p/p2p/net" + "context" 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/swarm_net_test.go b/swarm_net_test.go index 4d564e3..205b841 100644 --- a/swarm_net_test.go +++ b/swarm_net_test.go @@ -7,7 +7,7 @@ import ( inet "github.com/libp2p/go-libp2p/p2p/net" testutil "github.com/libp2p/go-libp2p/p2p/test/util" - context "golang.org/x/net/context" + "context" ) // TestConnectednessCorrect starts a few networks, connects a few diff --git a/swarm_notif_test.go b/swarm_notif_test.go index 0677746..2bc663e 100644 --- a/swarm_notif_test.go +++ b/swarm_notif_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" + "context" peer "github.com/ipfs/go-libp2p-peer" ma "github.com/jbenet/go-multiaddr" inet "github.com/libp2p/go-libp2p/p2p/net" - context "golang.org/x/net/context" ) func streamsSame(a, b inet.Stream) bool { diff --git a/swarm_test.go b/swarm_test.go index db8a464..b7520dc 100644 --- a/swarm_test.go +++ b/swarm_test.go @@ -13,10 +13,10 @@ import ( inet "github.com/libp2p/go-libp2p/p2p/net" testutil "github.com/libp2p/go-libp2p/testutil" + "context" peer "github.com/ipfs/go-libp2p-peer" pstore "github.com/ipfs/go-libp2p-peerstore" ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" ) func EchoStreamHandler(stream inet.Stream) { -- GitLab