From e73da92c04250cac778af2f7ebb6610cfe7c47bd Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 23 Feb 2015 16:51:09 +0100 Subject: [PATCH] rewrote import paths of go.net/context to use golang.org/x/context - updated go-ctxgroup and goprocess ctxgroup: AddChildGroup was changed to AddChild. Used in two files: - p2p/net/mock/mock_net.go - routing/dht/dht.go - updated context from hg repo to git prev. commit in hg was ad01a6fcc8a19d3a4478c836895ffe883bd2ceab. (context: make parentCancelCtx iterative) represents commit 84f8955a887232b6308d79c68b8db44f64df455c in git repo - updated context to master (b6fdb7d8a4ccefede406f8fe0f017fb58265054c) Aaron Jacobs (2): net/context: Don't accept a context in the DoSomethingSlow example. context: Be clear that users must cancel the result of WithCancel. Andrew Gerrand (1): go.net: use golang.org/x/... import paths Bryan C. Mills (1): net/context: Don't leak goroutines in Done example. Damien Neil (1): context: fix removal of cancelled timer contexts from parent David Symonds (2): context: Fix WithValue example code. net: add import comments. Sameer Ajmani (1): context: fix TestAllocs to account for ints in interfaces --- crypto/secio/interface.go | 3 +-- crypto/secio/protocol.go | 3 +-- crypto/secio/rw.go | 2 +- host/basic/basic_host.go | 3 +-- host/basic/basic_host_test.go | 2 +- host/basic/natmgr.go | 2 +- host/host.go | 3 +-- host/routed/routed.go | 3 +-- net/conn/conn.go | 3 +-- net/conn/conn_test.go | 3 +-- net/conn/dial.go | 2 +- net/conn/dial_test.go | 2 +- net/conn/listen.go | 2 +- net/conn/secure_conn.go | 2 +- net/conn/secure_conn_test.go | 2 +- net/interface.go | 2 +- net/mock/mock.go | 2 +- net/mock/mock_net.go | 4 ++-- net/mock/mock_notif_test.go | 3 +-- net/mock/mock_peernet.go | 2 +- net/mock/mock_test.go | 2 +- net/swarm/addr/addr.go | 2 +- net/swarm/dial_test.go | 2 +- net/swarm/peers_test.go | 2 +- net/swarm/simul_test.go | 2 +- net/swarm/swarm.go | 2 +- net/swarm/swarm_addr_test.go | 2 +- net/swarm/swarm_conn.go | 2 +- net/swarm/swarm_dial.go | 2 +- net/swarm/swarm_listen.go | 2 +- net/swarm/swarm_net.go | 2 +- net/swarm/swarm_net_test.go | 3 +-- net/swarm/swarm_notif_test.go | 2 +- net/swarm/swarm_test.go | 2 +- peer/queue/queue_test.go | 2 +- peer/queue/sync.go | 3 +-- protocol/identify/id.go | 2 +- protocol/identify/id_test.go | 2 +- protocol/mux.go | 3 +-- protocol/relay/relay_test.go | 2 +- test/backpressure/backpressure_test.go | 2 +- test/reconnects/reconnect_test.go | 2 +- test/util/util.go | 2 +- 43 files changed, 44 insertions(+), 55 deletions(-) diff --git a/crypto/secio/interface.go b/crypto/secio/interface.go index 934a5fad..612a32fc 100644 --- a/crypto/secio/interface.go +++ b/crypto/secio/interface.go @@ -6,9 +6,8 @@ import ( ci "github.com/jbenet/go-ipfs/p2p/crypto" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" peer "github.com/jbenet/go-ipfs/p2p/peer" ) diff --git a/crypto/secio/protocol.go b/crypto/secio/protocol.go index 9f90dc95..f06e2c23 100644 --- a/crypto/secio/protocol.go +++ b/crypto/secio/protocol.go @@ -7,9 +7,8 @@ import ( "fmt" "io" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ci "github.com/jbenet/go-ipfs/p2p/crypto" pb "github.com/jbenet/go-ipfs/p2p/crypto/secio/internal/pb" peer "github.com/jbenet/go-ipfs/p2p/peer" diff --git a/crypto/secio/rw.go b/crypto/secio/rw.go index 758b2400..b9a27198 100644 --- a/crypto/secio/rw.go +++ b/crypto/secio/rw.go @@ -9,10 +9,10 @@ import ( "crypto/hmac" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto" msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio" mpool "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio/mpool" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) // ErrMACInvalid signals that a MAC verification failed diff --git a/host/basic/basic_host.go b/host/basic/basic_host.go index 9ff5a558..3a145310 100644 --- a/host/basic/basic_host.go +++ b/host/basic/basic_host.go @@ -1,10 +1,9 @@ package basichost import ( - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" goprocess "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" inet "github.com/jbenet/go-ipfs/p2p/net" diff --git a/host/basic/basic_host_test.go b/host/basic/basic_host_test.go index 0b79d330..cf24ece5 100644 --- a/host/basic/basic_host_test.go +++ b/host/basic/basic_host_test.go @@ -9,7 +9,7 @@ import ( protocol "github.com/jbenet/go-ipfs/p2p/protocol" testutil "github.com/jbenet/go-ipfs/p2p/test/util" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func TestHostSimple(t *testing.T) { diff --git a/host/basic/natmgr.go b/host/basic/natmgr.go index 492841a9..35cc162f 100644 --- a/host/basic/natmgr.go +++ b/host/basic/natmgr.go @@ -3,9 +3,9 @@ package basichost import ( "sync" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" goprocess "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" inat "github.com/jbenet/go-ipfs/p2p/nat" inet "github.com/jbenet/go-ipfs/p2p/net" diff --git a/host/host.go b/host/host.go index e75e9983..caa45f54 100644 --- a/host/host.go +++ b/host/host.go @@ -1,9 +1,8 @@ package host import ( - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" inet "github.com/jbenet/go-ipfs/p2p/net" peer "github.com/jbenet/go-ipfs/p2p/peer" protocol "github.com/jbenet/go-ipfs/p2p/protocol" diff --git a/host/routed/routed.go b/host/routed/routed.go index 9f18869f..4ceec6bc 100644 --- a/host/routed/routed.go +++ b/host/routed/routed.go @@ -4,9 +4,8 @@ import ( "fmt" "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables" diff --git a/net/conn/conn.go b/net/conn/conn.go index f205970b..81c4c735 100644 --- a/net/conn/conn.go +++ b/net/conn/conn.go @@ -6,12 +6,11 @@ import ( "net" "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio" mpool "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio/mpool" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ic "github.com/jbenet/go-ipfs/p2p/crypto" peer "github.com/jbenet/go-ipfs/p2p/peer" eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" diff --git a/net/conn/conn_test.go b/net/conn/conn_test.go index 31206030..145654da 100644 --- a/net/conn/conn_test.go +++ b/net/conn/conn_test.go @@ -8,8 +8,7 @@ import ( "testing" "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" travis "github.com/jbenet/go-ipfs/util/testutil/ci/travis" ) diff --git a/net/conn/dial.go b/net/conn/dial.go index 073bd5c6..03fe1538 100644 --- a/net/conn/dial.go +++ b/net/conn/dial.go @@ -7,10 +7,10 @@ import ( "strings" "syscall" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net" reuseport "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-reuseport" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables" addrutil "github.com/jbenet/go-ipfs/p2p/net/swarm/addr" diff --git a/net/conn/dial_test.go b/net/conn/dial_test.go index 3c141012..37c3689b 100644 --- a/net/conn/dial_test.go +++ b/net/conn/dial_test.go @@ -10,7 +10,7 @@ import ( tu "github.com/jbenet/go-ipfs/util/testutil" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func echoListen(ctx context.Context, listener Listener) { diff --git a/net/conn/listen.go b/net/conn/listen.go index 33b97956..f11287fe 100644 --- a/net/conn/listen.go +++ b/net/conn/listen.go @@ -5,12 +5,12 @@ import ( "io" "net" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net" reuseport "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-reuseport" tec "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-temp-err-catcher" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ic "github.com/jbenet/go-ipfs/p2p/crypto" peer "github.com/jbenet/go-ipfs/p2p/peer" diff --git a/net/conn/secure_conn.go b/net/conn/secure_conn.go index d2c16e0a..76b6eb5e 100644 --- a/net/conn/secure_conn.go +++ b/net/conn/secure_conn.go @@ -4,9 +4,9 @@ import ( "net" "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ic "github.com/jbenet/go-ipfs/p2p/crypto" secio "github.com/jbenet/go-ipfs/p2p/crypto/secio" diff --git a/net/conn/secure_conn_test.go b/net/conn/secure_conn_test.go index 6ffc0acd..83374ec1 100644 --- a/net/conn/secure_conn_test.go +++ b/net/conn/secure_conn_test.go @@ -10,7 +10,7 @@ import ( ic "github.com/jbenet/go-ipfs/p2p/crypto" travis "github.com/jbenet/go-ipfs/util/testutil/ci/travis" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func upgradeToSecureConn(t *testing.T, ctx context.Context, sk ic.PrivKey, c Conn) (Conn, error) { diff --git a/net/interface.go b/net/interface.go index a5a006be..8dda7fbb 100644 --- a/net/interface.go +++ b/net/interface.go @@ -6,9 +6,9 @@ import ( conn "github.com/jbenet/go-ipfs/p2p/net/conn" peer "github.com/jbenet/go-ipfs/p2p/peer" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) // MessageSizeMax is a soft (recommended) maximum for network messages. diff --git a/net/mock/mock.go b/net/mock/mock.go index eaeb1628..c6c161ff 100644 --- a/net/mock/mock.go +++ b/net/mock/mock.go @@ -3,7 +3,7 @@ package mocknet import ( eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) var log = eventlog.Logger("mocknet") diff --git a/net/mock/mock_net.go b/net/mock/mock_net.go index f3a560cb..6a4f4782 100644 --- a/net/mock/mock_net.go +++ b/net/mock/mock_net.go @@ -13,9 +13,9 @@ import ( p2putil "github.com/jbenet/go-ipfs/p2p/test/util" testutil "github.com/jbenet/go-ipfs/util/testutil" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) // mocknet implements mocknet.Mocknet @@ -69,7 +69,7 @@ func (mn *mocknet) AddPeer(k ic.PrivKey, a ma.Multiaddr) (host.Host, error) { h := bhost.New(n) log.Debugf("mocknet added listen addr for peer: %s -- %s", n.LocalPeer(), a) - mn.cg.AddChildGroup(n.cg) + mn.cg.AddChild(n.cg) mn.Lock() mn.nets[n.peer] = n diff --git a/net/mock/mock_notif_test.go b/net/mock/mock_notif_test.go index cb248abf..cc92a667 100644 --- a/net/mock/mock_notif_test.go +++ b/net/mock/mock_notif_test.go @@ -4,9 +4,8 @@ import ( "testing" "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" inet "github.com/jbenet/go-ipfs/p2p/net" ) diff --git a/net/mock/mock_peernet.go b/net/mock/mock_peernet.go index 79c4a6aa..e850d5c6 100644 --- a/net/mock/mock_peernet.go +++ b/net/mock/mock_peernet.go @@ -9,9 +9,9 @@ import ( inet "github.com/jbenet/go-ipfs/p2p/net" peer "github.com/jbenet/go-ipfs/p2p/peer" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) // peernet implements inet.Network diff --git a/net/mock/mock_test.go b/net/mock/mock_test.go index 1b1ca7dd..023bb896 100644 --- a/net/mock/mock_test.go +++ b/net/mock/mock_test.go @@ -12,7 +12,7 @@ import ( protocol "github.com/jbenet/go-ipfs/p2p/protocol" testutil "github.com/jbenet/go-ipfs/util/testutil" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func randPeer(t *testing.T) peer.ID { diff --git a/net/swarm/addr/addr.go b/net/swarm/addr/addr.go index 919a279e..e611ccd5 100644 --- a/net/swarm/addr/addr.go +++ b/net/swarm/addr/addr.go @@ -5,9 +5,9 @@ import ( eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) var log = eventlog.Logger("p2p/net/swarm/addr") diff --git a/net/swarm/dial_test.go b/net/swarm/dial_test.go index 252859df..497c63b6 100644 --- a/net/swarm/dial_test.go +++ b/net/swarm/dial_test.go @@ -14,9 +14,9 @@ import ( jenkins "github.com/jbenet/go-ipfs/util/testutil/ci/jenkins" travis "github.com/jbenet/go-ipfs/util/testutil/ci/travis" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func acceptAndHang(l net.Listener) { diff --git a/net/swarm/peers_test.go b/net/swarm/peers_test.go index 583e218d..1ade532a 100644 --- a/net/swarm/peers_test.go +++ b/net/swarm/peers_test.go @@ -5,8 +5,8 @@ import ( peer "github.com/jbenet/go-ipfs/p2p/peer" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func TestPeers(t *testing.T) { diff --git a/net/swarm/simul_test.go b/net/swarm/simul_test.go index 446a011d..37fcf3e6 100644 --- a/net/swarm/simul_test.go +++ b/net/swarm/simul_test.go @@ -8,8 +8,8 @@ import ( peer "github.com/jbenet/go-ipfs/p2p/peer" ci "github.com/jbenet/go-ipfs/util/testutil/ci" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func TestSimultOpen(t *testing.T) { diff --git a/net/swarm/swarm.go b/net/swarm/swarm.go index e4117724..4e2282a1 100644 --- a/net/swarm/swarm.go +++ b/net/swarm/swarm.go @@ -12,11 +12,11 @@ import ( peer "github.com/jbenet/go-ipfs/p2p/peer" eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream" psy "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream/transport/yamux" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) var log = eventlog.Logger("swarm2") diff --git a/net/swarm/swarm_addr_test.go b/net/swarm/swarm_addr_test.go index e822a4b0..b86898d4 100644 --- a/net/swarm/swarm_addr_test.go +++ b/net/swarm/swarm_addr_test.go @@ -7,8 +7,8 @@ import ( peer "github.com/jbenet/go-ipfs/p2p/peer" testutil "github.com/jbenet/go-ipfs/util/testutil" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func TestFilterAddrs(t *testing.T) { diff --git a/net/swarm/swarm_conn.go b/net/swarm/swarm_conn.go index 580f88fa..9da3ace7 100644 --- a/net/swarm/swarm_conn.go +++ b/net/swarm/swarm_conn.go @@ -8,9 +8,9 @@ import ( conn "github.com/jbenet/go-ipfs/p2p/net/conn" peer "github.com/jbenet/go-ipfs/p2p/peer" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) // a Conn is a simple wrapper around a ps.Conn that also exposes diff --git a/net/swarm/swarm_dial.go b/net/swarm/swarm_dial.go index d5487689..4fd1261e 100644 --- a/net/swarm/swarm_dial.go +++ b/net/swarm/swarm_dial.go @@ -13,11 +13,11 @@ import ( peer "github.com/jbenet/go-ipfs/p2p/peer" lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net" process "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess" ratelimit "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/ratelimit" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) // Diagram of dial sync: diff --git a/net/swarm/swarm_listen.go b/net/swarm/swarm_listen.go index d19ad961..8aac8695 100644 --- a/net/swarm/swarm_listen.go +++ b/net/swarm/swarm_listen.go @@ -8,9 +8,9 @@ import ( addrutil "github.com/jbenet/go-ipfs/p2p/net/swarm/addr" lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" multierr "github.com/jbenet/go-ipfs/thirdparty/multierr" ) diff --git a/net/swarm/swarm_net.go b/net/swarm/swarm_net.go index 857eabd2..78343fa8 100644 --- a/net/swarm/swarm_net.go +++ b/net/swarm/swarm_net.go @@ -7,9 +7,9 @@ import ( inet "github.com/jbenet/go-ipfs/p2p/net" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) // Network implements the inet.Network interface. diff --git a/net/swarm/swarm_net_test.go b/net/swarm/swarm_net_test.go index 3849838b..28ef96cb 100644 --- a/net/swarm/swarm_net_test.go +++ b/net/swarm/swarm_net_test.go @@ -5,8 +5,7 @@ import ( "testing" "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" inet "github.com/jbenet/go-ipfs/p2p/net" testutil "github.com/jbenet/go-ipfs/p2p/test/util" ) diff --git a/net/swarm/swarm_notif_test.go b/net/swarm/swarm_notif_test.go index dccf69b2..766bfb42 100644 --- a/net/swarm/swarm_notif_test.go +++ b/net/swarm/swarm_notif_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" inet "github.com/jbenet/go-ipfs/p2p/net" ) diff --git a/net/swarm/swarm_test.go b/net/swarm/swarm_test.go index a2bb943e..4ef7c36c 100644 --- a/net/swarm/swarm_test.go +++ b/net/swarm/swarm_test.go @@ -12,8 +12,8 @@ import ( errors "github.com/jbenet/go-ipfs/util/debugerror" testutil "github.com/jbenet/go-ipfs/util/testutil" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func EchoStreamHandler(stream inet.Stream) { diff --git a/peer/queue/queue_test.go b/peer/queue/queue_test.go index 957564fc..5ca0b09d 100644 --- a/peer/queue/queue_test.go +++ b/peer/queue/queue_test.go @@ -9,7 +9,7 @@ import ( peer "github.com/jbenet/go-ipfs/p2p/peer" u "github.com/jbenet/go-ipfs/util" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func TestQueue(t *testing.T) { diff --git a/peer/queue/sync.go b/peer/queue/sync.go index c009ab73..b937c09a 100644 --- a/peer/queue/sync.go +++ b/peer/queue/sync.go @@ -1,8 +1,7 @@ package queue import ( - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" peer "github.com/jbenet/go-ipfs/p2p/peer" eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" ) diff --git a/protocol/identify/id.go b/protocol/identify/id.go index 5712656e..7d59c612 100644 --- a/protocol/identify/id.go +++ b/protocol/identify/id.go @@ -4,10 +4,10 @@ import ( "strings" "sync" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io" semver "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/coreos/go-semver/semver" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" host "github.com/jbenet/go-ipfs/p2p/host" inet "github.com/jbenet/go-ipfs/p2p/net" diff --git a/protocol/identify/id_test.go b/protocol/identify/id_test.go index 6af01283..906809fe 100644 --- a/protocol/identify/id_test.go +++ b/protocol/identify/id_test.go @@ -9,8 +9,8 @@ import ( identify "github.com/jbenet/go-ipfs/p2p/protocol/identify" testutil "github.com/jbenet/go-ipfs/p2p/test/util" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func subtestIDService(t *testing.T, postDialWait time.Duration) { diff --git a/protocol/mux.go b/protocol/mux.go index ddf27a58..9f4ae731 100644 --- a/protocol/mux.go +++ b/protocol/mux.go @@ -5,8 +5,7 @@ import ( "io" "sync" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" inet "github.com/jbenet/go-ipfs/p2p/net" eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables" diff --git a/protocol/relay/relay_test.go b/protocol/relay/relay_test.go index 91d05d97..2022285b 100644 --- a/protocol/relay/relay_test.go +++ b/protocol/relay/relay_test.go @@ -10,7 +10,7 @@ import ( testutil "github.com/jbenet/go-ipfs/p2p/test/util" eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) var log = eventlog.Logger("relay_test") diff --git a/test/backpressure/backpressure_test.go b/test/backpressure/backpressure_test.go index 78c1ce97..34781085 100644 --- a/test/backpressure/backpressure_test.go +++ b/test/backpressure/backpressure_test.go @@ -14,7 +14,7 @@ import ( testutil "github.com/jbenet/go-ipfs/p2p/test/util" eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) var log = eventlog.Logger("backpressure") diff --git a/test/reconnects/reconnect_test.go b/test/reconnects/reconnect_test.go index 92ce8729..39bb18cf 100644 --- a/test/reconnects/reconnect_test.go +++ b/test/reconnects/reconnect_test.go @@ -15,8 +15,8 @@ import ( testutil "github.com/jbenet/go-ipfs/p2p/test/util" eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func init() { diff --git a/test/util/util.go b/test/util/util.go index a680d4f3..b60dbaa1 100644 --- a/test/util/util.go +++ b/test/util/util.go @@ -9,8 +9,8 @@ import ( peer "github.com/jbenet/go-ipfs/p2p/peer" tu "github.com/jbenet/go-ipfs/util/testutil" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func GenSwarmNetwork(t *testing.T, ctx context.Context) *swarm.Network {