From 92d08db7a587784be89c876c1532006a0c0b3773 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 --- Godeps/Godeps.json | 15 ++- .../jbenet/go-ctxgroup/Godeps/Godeps.json | 7 +- .../github.com/jbenet/go-ctxgroup/ctxgroup.go | 24 ++--- .../jbenet/go-ctxgroup/ctxgroup_test.go | 2 +- .../jbenet/goprocess/context/context.go | 2 +- .../x/net}/context/context.go | 92 +++++++++++-------- .../x/net}/context/context_test.go | 24 ++++- .../x/net}/context/withtimeout_test.go | 2 +- blocks/blockstore/blockstore.go | 3 +- blocks/blockstore/blockstore_test.go | 2 +- blocks/blockstore/write_cache.go | 3 +- blockservice/blocks_test.go | 2 +- blockservice/blockservice.go | 2 +- cmd/ipfs/init.go | 2 +- cmd/ipfs/main.go | 3 +- cmd/ipfs_bootstrapd/main.go | 2 +- cmd/ipfs_routingd/main.go | 2 +- cmd/ipfswatch/main.go | 2 +- commands/http/handler.go | 3 +- commands/request.go | 3 +- core/bootstrap.go | 2 +- core/builder.go | 3 +- core/commands/block.go | 3 +- core/commands/cat.go | 2 +- core/commands/id.go | 3 +- core/commands/ping.go | 2 +- core/commands/refs.go | 3 +- core/commands/swarm.go | 2 +- core/core.go | 3 +- core/core_test.go | 2 +- core/corehttp/gateway_handler.go | 2 +- core/corehttp/gateway_test.go | 2 +- core/corehttp/ipns_hostname.go | 2 +- core/corenet/net.go | 2 +- core/corerepo/gc.go | 2 +- core/corerouting/core.go | 2 +- core/coreunix/add_test.go | 2 +- core/coreunix/metadata_test.go | 2 +- core/mock.go | 2 +- diagnostics/diag.go | 3 +- exchange/bitswap/bitswap.go | 3 +- exchange/bitswap/bitswap_test.go | 3 +- exchange/bitswap/decision/engine.go | 2 +- exchange/bitswap/decision/engine_test.go | 2 +- exchange/bitswap/network/interface.go | 3 +- exchange/bitswap/network/ipfs_impl.go | 3 +- .../bitswap/notifications/notifications.go | 3 +- .../notifications/notifications_test.go | 2 +- exchange/bitswap/testnet/network_test.go | 2 +- exchange/bitswap/testnet/peernet.go | 2 +- exchange/bitswap/testnet/virtual.go | 2 +- exchange/bitswap/testutils.go | 2 +- exchange/bitswap/workers.go | 2 +- exchange/interface.go | 3 +- exchange/offline/offline.go | 2 +- exchange/offline/offline_test.go | 2 +- exchange/reprovide/reprovide.go | 3 +- exchange/reprovide/reprovide_test.go | 3 +- fuse/ipns/ipns_test.go | 2 +- fuse/ipns/ipns_unix.go | 2 +- fuse/readonly/readonly_unix.go | 3 +- importer/balanced/balanced_test.go | 2 +- importer/importer_test.go | 2 +- importer/trickle/trickle_test.go | 2 +- merkledag/merkledag.go | 3 +- merkledag/merkledag_test.go | 2 +- namesys/dns.go | 2 +- namesys/interface.go | 2 +- namesys/namesys.go | 2 +- namesys/proquint.go | 2 +- namesys/publisher.go | 2 +- namesys/resolve_test.go | 2 +- namesys/routing.go | 3 +- notifications/query.go | 2 +- p2p/crypto/secio/interface.go | 3 +- p2p/crypto/secio/protocol.go | 3 +- p2p/crypto/secio/rw.go | 2 +- p2p/host/basic/basic_host.go | 3 +- p2p/host/basic/basic_host_test.go | 2 +- p2p/host/basic/natmgr.go | 2 +- p2p/host/host.go | 3 +- p2p/host/routed/routed.go | 3 +- p2p/net/conn/conn.go | 3 +- p2p/net/conn/conn_test.go | 3 +- p2p/net/conn/dial.go | 2 +- p2p/net/conn/dial_test.go | 2 +- p2p/net/conn/listen.go | 2 +- p2p/net/conn/secure_conn.go | 2 +- p2p/net/conn/secure_conn_test.go | 2 +- p2p/net/interface.go | 2 +- p2p/net/mock/mock.go | 2 +- p2p/net/mock/mock_net.go | 4 +- p2p/net/mock/mock_notif_test.go | 3 +- p2p/net/mock/mock_peernet.go | 2 +- p2p/net/mock/mock_test.go | 2 +- p2p/net/swarm/addr/addr.go | 2 +- p2p/net/swarm/dial_test.go | 2 +- p2p/net/swarm/peers_test.go | 2 +- p2p/net/swarm/simul_test.go | 2 +- p2p/net/swarm/swarm.go | 2 +- p2p/net/swarm/swarm_addr_test.go | 2 +- p2p/net/swarm/swarm_conn.go | 2 +- p2p/net/swarm/swarm_dial.go | 2 +- p2p/net/swarm/swarm_listen.go | 2 +- p2p/net/swarm/swarm_net.go | 2 +- p2p/net/swarm/swarm_net_test.go | 3 +- p2p/net/swarm/swarm_notif_test.go | 2 +- p2p/net/swarm/swarm_test.go | 2 +- p2p/peer/queue/queue_test.go | 2 +- p2p/peer/queue/sync.go | 3 +- p2p/protocol/identify/id.go | 2 +- p2p/protocol/identify/id_test.go | 2 +- p2p/protocol/mux.go | 3 +- p2p/protocol/relay/relay_test.go | 2 +- p2p/test/backpressure/backpressure_test.go | 2 +- p2p/test/reconnects/reconnect_test.go | 2 +- p2p/test/util/util.go | 2 +- pin/pin.go | 2 +- routing/dht/dht.go | 4 +- routing/dht/dht_bootstrap.go | 2 +- routing/dht/dht_net.go | 2 +- routing/dht/dht_test.go | 3 +- routing/dht/ext_test.go | 5 +- routing/dht/handlers.go | 2 +- routing/dht/lookup.go | 3 +- routing/dht/providers.go | 2 +- routing/dht/providers_test.go | 2 +- routing/dht/query.go | 2 +- routing/dht/records.go | 3 +- routing/dht/routing.go | 3 +- routing/mock/centralized_client.go | 2 +- routing/mock/centralized_server.go | 2 +- routing/mock/centralized_test.go | 2 +- routing/mock/dht.go | 2 +- routing/mock/interface.go | 2 +- routing/offline/offline.go | 2 +- routing/routing.go | 3 +- routing/supernode/client.go | 2 +- routing/supernode/proxy/loopback.go | 3 +- routing/supernode/proxy/standard.go | 2 +- routing/supernode/server.go | 2 +- server/http/ipfs.go | 2 +- test/integration/addcat_test.go | 2 +- test/integration/bitswap_wo_routing_test.go | 2 +- test/integration/core.go | 2 +- test/integration/grandcentral_test.go | 2 +- test/integration/three_legged_cat_test.go | 2 +- test/supernode_client/main.go | 2 +- thirdparty/eventlog/context.go | 2 +- thirdparty/eventlog/context_test.go | 2 +- thirdparty/eventlog/example_test.go | 2 +- thirdparty/eventlog/log.go | 2 +- thirdparty/waitable/waitable.go | 2 +- unixfs/io/dagmodifier_test.go | 2 +- unixfs/io/dagreader.go | 3 +- unixfs/tar/reader.go | 2 +- util/context.go | 2 +- util/context_test.go | 2 +- util/ctx/ctxio.go | 2 +- util/ctx/ctxio_test.go | 2 +- util/ctx/fracctx.go | 2 +- util/ctx/fracctx_test.go | 2 +- util/ctxcloser/closer.go | 2 +- util/do.go | 2 +- util/do_test.go | 2 +- 165 files changed, 258 insertions(+), 271 deletions(-) rename Godeps/_workspace/src/{code.google.com/p/go.net => golang.org/x/net}/context/context.go (87%) rename Godeps/_workspace/src/{code.google.com/p/go.net => golang.org/x/net}/context/context_test.go (95%) rename Godeps/_workspace/src/{code.google.com/p/go.net => golang.org/x/net}/context/withtimeout_test.go (88%) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 851b41988..d72a89bdf 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "github.com/jbenet/go-ipfs", - "GoVersion": "go1.4", + "GoVersion": "go1.4.2", "Packages": [ "./..." ], @@ -29,11 +29,6 @@ "Comment": "null-236", "Rev": "69e2a90ed92d03812364aeb947b7068dc42e561e" }, - { - "ImportPath": "code.google.com/p/go.net/context", - "Comment": "null-144", - "Rev": "ad01a6fcc8a19d3a4478c836895ffe883bd2ceab" - }, { "ImportPath": "code.google.com/p/gogoprotobuf/io", "Rev": "6c980277330804e94257ac7ef70a3adbe1641059" @@ -156,7 +151,7 @@ }, { "ImportPath": "github.com/jbenet/go-ctxgroup", - "Rev": "6b9437e8517175306e30ffec241c523752a38303" + "Rev": "c14598396fa31465dc558b176c7976606f95a49d" }, { "ImportPath": "github.com/jbenet/go-datastore", @@ -214,7 +209,7 @@ }, { "ImportPath": "github.com/jbenet/goprocess", - "Rev": "060ad098994e6adac22f0bd889eb756d4f5ad35b" + "Rev": "b4efc4c8775f0250710b39bfa716276ca10f85af" }, { "ImportPath": "github.com/kr/binarydist", @@ -241,6 +236,10 @@ "ImportPath": "github.com/syndtr/gosnappy/snappy", "Rev": "ce8acff4829e0c2458a67ead32390ac0a381c862" }, + { + "ImportPath": "golang.org/x/net/context", + "Rev": "b6fdb7d8a4ccefede406f8fe0f017fb58265054c" + }, { "ImportPath": "gopkg.in/fsnotify.v1", "Comment": "v1.1.0", diff --git a/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/Godeps/Godeps.json b/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/Godeps/Godeps.json index 0ab169bc8..acfaccebd 100644 --- a/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/Godeps/Godeps.json +++ b/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/Godeps/Godeps.json @@ -1,14 +1,13 @@ { "ImportPath": "github.com/jbenet/go-ctxgroup", - "GoVersion": "go1.3", + "GoVersion": "go1.4.2", "Packages": [ "./..." ], "Deps": [ { - "ImportPath": "code.google.com/p/go.net/context", - "Comment": "null-144", - "Rev": "ad01a6fcc8a19d3a4478c836895ffe883bd2ceab" + "ImportPath": "golang.org/x/net/context", + "Rev": "b6fdb7d8a4ccefede406f8fe0f017fb58265054c" } ] } diff --git a/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/ctxgroup.go b/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/ctxgroup.go index 631a8919f..101c12850 100644 --- a/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/ctxgroup.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/ctxgroup.go @@ -3,9 +3,10 @@ package ctxgroup 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" ) // TeardownFunc is a function used to cleanup state at the end of the @@ -68,18 +69,9 @@ type ContextGroup interface { // WARNING: this is deprecated and will go away soon. Children() *sync.WaitGroup - // AddChildGroup registers a dependent ContextGroup child. The child will - // be closed when this parent is closed, and waited upon to finish. It is - // the functional equivalent of the following: - // - // parent.Children().Add(1) // add one more dependent child - // go func(parent, child ContextGroup) { - // <-parent.Closing() // wait until parent is closing - // child.Close() // signal child to close - // parent.Children().Done() // child signals it is done - // }(a, b) - // - AddChildGroup(c ContextGroup) + // AddChild gives ownership of a child io.Closer. The child will be closed + // when the context group is closed. + AddChild(io.Closer) // AddChildFunc registers a dependent ChildFund. The child will receive // its parent ContextGroup, and can wait on its signals. Child references @@ -163,9 +155,9 @@ func (c *contextGroup) Children() *sync.WaitGroup { return &c.children } -func (c *contextGroup) AddChildGroup(child ContextGroup) { +func (c *contextGroup) AddChild(child io.Closer) { c.children.Add(1) - go func(parent, child ContextGroup) { + go func(parent ContextGroup, child io.Closer) { <-parent.Closing() // wait until parent is closing child.Close() // signal child to close parent.Children().Done() // child signals it is done @@ -255,7 +247,7 @@ func WithParent(p ContextGroup) ContextGroup { panic("nil ContextGroup") } c := newContextGroup(p.Context(), nil) - p.AddChildGroup(c) + p.AddChild(c) return c } diff --git a/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/ctxgroup_test.go b/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/ctxgroup_test.go index 883ccf634..8a4425430 100644 --- a/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/ctxgroup_test.go +++ b/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/ctxgroup_test.go @@ -4,7 +4,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" ) type tree struct { diff --git a/Godeps/_workspace/src/github.com/jbenet/goprocess/context/context.go b/Godeps/_workspace/src/github.com/jbenet/goprocess/context/context.go index f8fb0dd55..fd2134256 100644 --- a/Godeps/_workspace/src/github.com/jbenet/goprocess/context/context.go +++ b/Godeps/_workspace/src/github.com/jbenet/goprocess/context/context.go @@ -1,8 +1,8 @@ package goprocessctx import ( - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" 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" ) // WithContext constructs and returns a Process that respects diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/context/context.go b/Godeps/_workspace/src/golang.org/x/net/context/context.go similarity index 87% rename from Godeps/_workspace/src/code.google.com/p/go.net/context/context.go rename to Godeps/_workspace/src/golang.org/x/net/context/context.go index e3c5345d7..ef2f3e86f 100644 --- a/Godeps/_workspace/src/code.google.com/p/go.net/context/context.go +++ b/Godeps/_workspace/src/golang.org/x/net/context/context.go @@ -64,18 +64,21 @@ type Context interface { // // Done is provided for use in select statements: // - // // DoSomething calls DoSomethingSlow and returns as soon as - // // it returns or ctx.Done is closed. - // func DoSomething(ctx context.Context) (Result, error) { - // c := make(chan Result, 1) - // go func() { c <- DoSomethingSlow(ctx) }() - // select { - // case res := <-c: - // return res, nil - // case <-ctx.Done(): - // return nil, ctx.Err() - // } - // } + // // Stream generates values with DoSomething and sends them to out + // // until DoSomething returns an error or ctx.Done is closed. + // func Stream(ctx context.Context, out <-chan Value) error { + // for { + // v, err := DoSomething(ctx) + // if err != nil { + // return err + // } + // select { + // case <-ctx.Done(): + // return ctx.Err() + // case out <- v: + // } + // } + // } // // See http://blog.golang.org/pipelines for more examples of how to use // a Done channel for cancelation. @@ -108,7 +111,7 @@ type Context interface { // // Package user defines a User type that's stored in Contexts. // package user // - // import "code.google.com/p/go.net/context" + // import "golang.org/x/net/context" // // // User is the type of value stored in the Contexts. // type User struct {...} @@ -124,7 +127,7 @@ type Context interface { // // // NewContext returns a new Context that carries value u. // func NewContext(ctx context.Context, u *User) context.Context { - // return context.WithValue(userKey, u) + // return context.WithValue(ctx, userKey, u) // } // // // FromContext returns the User value stored in ctx, if any. @@ -142,27 +145,28 @@ var Canceled = errors.New("context canceled") // deadline passes. var DeadlineExceeded = errors.New("context deadline exceeded") -// An emptyCtx is never canceled, has no values, and has no deadline. +// An emptyCtx is never canceled, has no values, and has no deadline. It is not +// struct{}, since vars of this type must have distinct addresses. type emptyCtx int -func (emptyCtx) Deadline() (deadline time.Time, ok bool) { +func (*emptyCtx) Deadline() (deadline time.Time, ok bool) { return } -func (emptyCtx) Done() <-chan struct{} { +func (*emptyCtx) Done() <-chan struct{} { return nil } -func (emptyCtx) Err() error { +func (*emptyCtx) Err() error { return nil } -func (emptyCtx) Value(key interface{}) interface{} { +func (*emptyCtx) Value(key interface{}) interface{} { return nil } -func (n emptyCtx) String() string { - switch n { +func (e *emptyCtx) String() string { + switch e { case background: return "context.Background" case todo: @@ -171,9 +175,9 @@ func (n emptyCtx) String() string { return "unknown empty Context" } -const ( - background emptyCtx = 1 - todo emptyCtx = 2 +var ( + background = new(emptyCtx) + todo = new(emptyCtx) ) // Background returns a non-nil, empty Context. It is never canceled, has no @@ -201,6 +205,9 @@ type CancelFunc func() // WithCancel returns a copy of parent with a new Done channel. The returned // context's Done channel is closed when the returned cancel function is called // or when the parent context's Done channel is closed, whichever happens first. +// +// Canceling this context releases resources associated with it, so code should +// call cancel as soon as the operations running in this Context complete. func WithCancel(parent Context) (ctx Context, cancel CancelFunc) { c := newCancelCtx(parent) propagateCancel(parent, &c) @@ -261,6 +268,19 @@ func parentCancelCtx(parent Context) (*cancelCtx, bool) { } } +// removeChild removes a context from its parent. +func removeChild(parent Context, child canceler) { + p, ok := parentCancelCtx(parent) + if !ok { + return + } + p.mu.Lock() + if p.children != nil { + delete(p.children, child) + } + p.mu.Unlock() +} + // A canceler is a context type that can be canceled directly. The // implementations are *cancelCtx and *timerCtx. type canceler interface { @@ -315,13 +335,7 @@ func (c *cancelCtx) cancel(removeFromParent bool, err error) { c.mu.Unlock() if removeFromParent { - if p, ok := parentCancelCtx(c.Context); ok { - p.mu.Lock() - if p.children != nil { - delete(p.children, c) - } - p.mu.Unlock() - } + removeChild(c.Context, c) } } @@ -332,9 +346,8 @@ func (c *cancelCtx) cancel(removeFromParent bool, err error) { // cancel function is called, or when the parent context's Done channel is // closed, whichever happens first. // -// Canceling this context releases resources associated with the deadline -// timer, so code should call cancel as soon as the operations running in this -// Context complete. +// Canceling this context releases resources associated with it, so code should +// call cancel as soon as the operations running in this Context complete. func WithDeadline(parent Context, deadline time.Time) (Context, CancelFunc) { if cur, ok := parent.Deadline(); ok && cur.Before(deadline) { // The current deadline is already sooner than the new one. @@ -379,7 +392,11 @@ func (c *timerCtx) String() string { } func (c *timerCtx) cancel(removeFromParent bool, err error) { - c.cancelCtx.cancel(removeFromParent, err) + c.cancelCtx.cancel(false, err) + if removeFromParent { + // Remove this timerCtx from its parent cancelCtx's children. + removeChild(c.cancelCtx.Context, c) + } c.mu.Lock() if c.timer != nil { c.timer.Stop() @@ -390,9 +407,8 @@ func (c *timerCtx) cancel(removeFromParent bool, err error) { // WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)). // -// Canceling this context releases resources associated with the deadline -// timer, so code should call cancel as soon as the operations running in this -// Context complete: +// Canceling this context releases resources associated with it, so code should +// call cancel as soon as the operations running in this Context complete: // // func slowOperationWithTimeout(ctx context.Context) (Result, error) { // ctx, cancel := context.WithTimeout(ctx, 100*time.Millisecond) diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/context/context_test.go b/Godeps/_workspace/src/golang.org/x/net/context/context_test.go similarity index 95% rename from Godeps/_workspace/src/code.google.com/p/go.net/context/context_test.go rename to Godeps/_workspace/src/golang.org/x/net/context/context_test.go index c1a4de5ff..faf67722a 100644 --- a/Godeps/_workspace/src/code.google.com/p/go.net/context/context_test.go +++ b/Godeps/_workspace/src/golang.org/x/net/context/context_test.go @@ -365,7 +365,7 @@ func TestAllocs(t *testing.T) { c := WithValue(bg, k1, nil) c.Value(k1) }, - limit: 1, + limit: 3, gccgoLimit: 3, }, { @@ -551,3 +551,25 @@ func testLayers(t *testing.T, seed int64, testTimeout bool) { checkValues("after cancel") } } + +func TestCancelRemoves(t *testing.T) { + checkChildren := func(when string, ctx Context, want int) { + if got := len(ctx.(*cancelCtx).children); got != want { + t.Errorf("%s: context has %d children, want %d", when, got, want) + } + } + + ctx, _ := WithCancel(Background()) + checkChildren("after creation", ctx, 0) + _, cancel := WithCancel(ctx) + checkChildren("with WithCancel child ", ctx, 1) + cancel() + checkChildren("after cancelling WithCancel child", ctx, 0) + + ctx, _ = WithCancel(Background()) + checkChildren("after creation", ctx, 0) + _, cancel = WithTimeout(ctx, 60*time.Minute) + checkChildren("with WithTimeout child ", ctx, 1) + cancel() + checkChildren("after cancelling WithTimeout child", ctx, 0) +} diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/context/withtimeout_test.go b/Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go similarity index 88% rename from Godeps/_workspace/src/code.google.com/p/go.net/context/withtimeout_test.go rename to Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go index 64854d81b..bfac10443 100644 --- a/Godeps/_workspace/src/code.google.com/p/go.net/context/withtimeout_test.go +++ b/Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func ExampleWithTimeout() { diff --git a/blocks/blockstore/blockstore.go b/blocks/blockstore/blockstore.go index 70a705884..7c7e7ed2d 100644 --- a/blocks/blockstore/blockstore.go +++ b/blocks/blockstore/blockstore.go @@ -5,12 +5,11 @@ package blockstore import ( "errors" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" dsns "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace" dsq "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/query" mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" blocks "github.com/jbenet/go-ipfs/blocks" eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" u "github.com/jbenet/go-ipfs/util" diff --git a/blocks/blockstore/blockstore_test.go b/blocks/blockstore/blockstore_test.go index 2280f78f8..0601773a0 100644 --- a/blocks/blockstore/blockstore_test.go +++ b/blocks/blockstore/blockstore_test.go @@ -5,10 +5,10 @@ import ( "fmt" "testing" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" dsq "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/query" ds_sync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" blocks "github.com/jbenet/go-ipfs/blocks" u "github.com/jbenet/go-ipfs/util" diff --git a/blocks/blockstore/write_cache.go b/blocks/blockstore/write_cache.go index 487899597..d082e0cdc 100644 --- a/blocks/blockstore/write_cache.go +++ b/blocks/blockstore/write_cache.go @@ -1,9 +1,8 @@ package blockstore import ( - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/hashicorp/golang-lru" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" "github.com/jbenet/go-ipfs/blocks" u "github.com/jbenet/go-ipfs/util" ) diff --git a/blockservice/blocks_test.go b/blockservice/blocks_test.go index 8f3d89c7b..be1ca6059 100644 --- a/blockservice/blocks_test.go +++ b/blockservice/blocks_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" blocks "github.com/jbenet/go-ipfs/blocks" blockstore "github.com/jbenet/go-ipfs/blocks/blockstore" blocksutil "github.com/jbenet/go-ipfs/blocks/blocksutil" diff --git a/blockservice/blockservice.go b/blockservice/blockservice.go index 0d4dcfa05..ee84d79d6 100644 --- a/blockservice/blockservice.go +++ b/blockservice/blockservice.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - 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" blocks "github.com/jbenet/go-ipfs/blocks" "github.com/jbenet/go-ipfs/blocks/blockstore" worker "github.com/jbenet/go-ipfs/blockservice/worker" diff --git a/cmd/ipfs/init.go b/cmd/ipfs/init.go index 4958c54f5..2ae64acd2 100644 --- a/cmd/ipfs/init.go +++ b/cmd/ipfs/init.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - 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" assets "github.com/jbenet/go-ipfs/assets" cmds "github.com/jbenet/go-ipfs/commands" core "github.com/jbenet/go-ipfs/core" diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index ea600c3ca..c560c3ca2 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -17,7 +17,7 @@ import ( 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/code.google.com/p/go.net/context" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" // log is the command logger cmds "github.com/jbenet/go-ipfs/commands" cmdsCli "github.com/jbenet/go-ipfs/commands/cli" cmdsHttp "github.com/jbenet/go-ipfs/commands/http" @@ -29,7 +29,6 @@ import ( "github.com/jbenet/go-ipfs/util/debugerror" ) -// log is the command logger var log = eventlog.Logger("cmd/ipfs") // signal to output help diff --git a/cmd/ipfs_bootstrapd/main.go b/cmd/ipfs_bootstrapd/main.go index c041d663f..a215d65b0 100644 --- a/cmd/ipfs_bootstrapd/main.go +++ b/cmd/ipfs_bootstrapd/main.go @@ -8,7 +8,7 @@ import ( "os" "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" core "github.com/jbenet/go-ipfs/core" corehttp "github.com/jbenet/go-ipfs/core/corehttp" corerepo "github.com/jbenet/go-ipfs/core/corerepo" diff --git a/cmd/ipfs_routingd/main.go b/cmd/ipfs_routingd/main.go index 27b6e160f..d02a9744a 100644 --- a/cmd/ipfs_routingd/main.go +++ b/cmd/ipfs_routingd/main.go @@ -9,11 +9,11 @@ import ( "os/signal" "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" aws "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws" s3 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/fzzy/radix/redis" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" core "github.com/jbenet/go-ipfs/core" corerouting "github.com/jbenet/go-ipfs/core/corerouting" config "github.com/jbenet/go-ipfs/repo/config" diff --git a/cmd/ipfswatch/main.go b/cmd/ipfswatch/main.go index 2f1c49978..7aff99a3f 100644 --- a/cmd/ipfswatch/main.go +++ b/cmd/ipfswatch/main.go @@ -7,9 +7,9 @@ import ( "os/signal" "path/filepath" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" process "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess" homedir "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" fsnotify "github.com/jbenet/go-ipfs/Godeps/_workspace/src/gopkg.in/fsnotify.v1" commands "github.com/jbenet/go-ipfs/commands" core "github.com/jbenet/go-ipfs/core" diff --git a/commands/http/handler.go b/commands/http/handler.go index 58e90370d..469c0221d 100644 --- a/commands/http/handler.go +++ b/commands/http/handler.go @@ -8,8 +8,7 @@ import ( "strconv" "strings" - 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" cmds "github.com/jbenet/go-ipfs/commands" u "github.com/jbenet/go-ipfs/util" ) diff --git a/commands/request.go b/commands/request.go index aa5daae87..f29672ef3 100644 --- a/commands/request.go +++ b/commands/request.go @@ -8,8 +8,7 @@ import ( "reflect" "strconv" - 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" "github.com/jbenet/go-ipfs/commands/files" "github.com/jbenet/go-ipfs/core" "github.com/jbenet/go-ipfs/repo/config" diff --git a/core/bootstrap.go b/core/bootstrap.go index 471635142..81ef927ab 100644 --- a/core/bootstrap.go +++ b/core/bootstrap.go @@ -15,11 +15,11 @@ import ( math2 "github.com/jbenet/go-ipfs/thirdparty/math2" 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" goprocess "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess" procctx "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/context" periodicproc "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/periodic" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) // ErrNotEnoughBootstrapPeers signals that we do not have enough bootstrap diff --git a/core/builder.go b/core/builder.go index 4c97f3c3e..667e53af2 100644 --- a/core/builder.go +++ b/core/builder.go @@ -3,10 +3,9 @@ package core import ( "errors" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" dsync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" repo "github.com/jbenet/go-ipfs/repo" ) diff --git a/core/commands/block.go b/core/commands/block.go index 727ea6aa8..805a86397 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -8,9 +8,8 @@ import ( "io/ioutil" "strings" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" "github.com/jbenet/go-ipfs/blocks" cmds "github.com/jbenet/go-ipfs/commands" u "github.com/jbenet/go-ipfs/util" diff --git a/core/commands/cat.go b/core/commands/cat.go index d375e4d67..c9380cd1d 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -8,8 +8,8 @@ import ( path "github.com/jbenet/go-ipfs/path" uio "github.com/jbenet/go-ipfs/unixfs/io" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/cheggaaa/pb" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB diff --git a/core/commands/id.go b/core/commands/id.go index 15bc8b16e..e61bbe50e 100644 --- a/core/commands/id.go +++ b/core/commands/id.go @@ -9,9 +9,8 @@ import ( "strings" "time" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" cmds "github.com/jbenet/go-ipfs/commands" core "github.com/jbenet/go-ipfs/core" diff --git a/core/commands/ping.go b/core/commands/ping.go index bfd6fe716..71d8d7cd7 100644 --- a/core/commands/ping.go +++ b/core/commands/ping.go @@ -13,8 +13,8 @@ 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" 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" ) const kPingTimeout = 10 * time.Second diff --git a/core/commands/refs.go b/core/commands/refs.go index 025bdc563..6a5b8b6ca 100644 --- a/core/commands/refs.go +++ b/core/commands/refs.go @@ -6,8 +6,7 @@ import ( "strings" "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" cmds "github.com/jbenet/go-ipfs/commands" "github.com/jbenet/go-ipfs/core" dag "github.com/jbenet/go-ipfs/merkledag" diff --git a/core/commands/swarm.go b/core/commands/swarm.go index 40c2ff6f9..3865199f3 100644 --- a/core/commands/swarm.go +++ b/core/commands/swarm.go @@ -11,8 +11,8 @@ import ( errors "github.com/jbenet/go-ipfs/util/debugerror" iaddr "github.com/jbenet/go-ipfs/util/ipfsaddr" - 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" ) type stringList struct { diff --git a/core/core.go b/core/core.go index 186e90e6f..c8a201e43 100644 --- a/core/core.go +++ b/core/core.go @@ -7,12 +7,11 @@ import ( "io" "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58" ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" 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" debugerror "github.com/jbenet/go-ipfs/util/debugerror" diff --git a/core/core_test.go b/core/core_test.go index 293bac0f6..274b5b46e 100644 --- a/core/core_test.go +++ b/core/core_test.go @@ -3,7 +3,7 @@ package core import ( "testing" - 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" "github.com/jbenet/go-ipfs/repo" config "github.com/jbenet/go-ipfs/repo/config" "github.com/jbenet/go-ipfs/util/testutil" diff --git a/core/corehttp/gateway_handler.go b/core/corehttp/gateway_handler.go index 4fcca2421..eceed8481 100644 --- a/core/corehttp/gateway_handler.go +++ b/core/corehttp/gateway_handler.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" core "github.com/jbenet/go-ipfs/core" "github.com/jbenet/go-ipfs/importer" diff --git a/core/corehttp/gateway_test.go b/core/corehttp/gateway_test.go index 74bb3af92..879f72f20 100644 --- a/core/corehttp/gateway_test.go +++ b/core/corehttp/gateway_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" core "github.com/jbenet/go-ipfs/core" coreunix "github.com/jbenet/go-ipfs/core/coreunix" namesys "github.com/jbenet/go-ipfs/namesys" diff --git a/core/corehttp/ipns_hostname.go b/core/corehttp/ipns_hostname.go index 27d683250..29c947d91 100644 --- a/core/corehttp/ipns_hostname.go +++ b/core/corehttp/ipns_hostname.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" "github.com/jbenet/go-ipfs/core" ) diff --git a/core/corenet/net.go b/core/corenet/net.go index b506188df..ebaa670d5 100644 --- a/core/corenet/net.go +++ b/core/corenet/net.go @@ -3,7 +3,7 @@ package corenet import ( "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" core "github.com/jbenet/go-ipfs/core" net "github.com/jbenet/go-ipfs/p2p/net" peer "github.com/jbenet/go-ipfs/p2p/peer" diff --git a/core/corerepo/gc.go b/core/corerepo/gc.go index 0d7826f9f..3cbba60fd 100644 --- a/core/corerepo/gc.go +++ b/core/corerepo/gc.go @@ -1,7 +1,7 @@ package corerepo 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" "github.com/jbenet/go-ipfs/core" u "github.com/jbenet/go-ipfs/util" diff --git a/core/corerouting/core.go b/core/corerouting/core.go index a911a0c6b..a1a30a7f6 100644 --- a/core/corerouting/core.go +++ b/core/corerouting/core.go @@ -3,8 +3,8 @@ package corerouting import ( "errors" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" core "github.com/jbenet/go-ipfs/core" "github.com/jbenet/go-ipfs/p2p/host" "github.com/jbenet/go-ipfs/p2p/peer" diff --git a/core/coreunix/add_test.go b/core/coreunix/add_test.go index 5987f47fe..b178bca6e 100644 --- a/core/coreunix/add_test.go +++ b/core/coreunix/add_test.go @@ -5,7 +5,7 @@ import ( "path" "testing" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" "github.com/jbenet/go-ipfs/core" "github.com/jbenet/go-ipfs/repo" "github.com/jbenet/go-ipfs/repo/config" diff --git a/core/coreunix/metadata_test.go b/core/coreunix/metadata_test.go index 56074fad5..631e12f4c 100644 --- a/core/coreunix/metadata_test.go +++ b/core/coreunix/metadata_test.go @@ -5,9 +5,9 @@ import ( "io/ioutil" "testing" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" bstore "github.com/jbenet/go-ipfs/blocks/blockstore" bserv "github.com/jbenet/go-ipfs/blockservice" core "github.com/jbenet/go-ipfs/core" diff --git a/core/mock.go b/core/mock.go index 040aab03e..2044f4363 100644 --- a/core/mock.go +++ b/core/mock.go @@ -1,9 +1,9 @@ package core import ( - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" syncds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" "github.com/jbenet/go-ipfs/blocks/blockstore" blockservice "github.com/jbenet/go-ipfs/blockservice" "github.com/jbenet/go-ipfs/exchange/offline" diff --git a/diagnostics/diag.go b/diagnostics/diag.go index 58ea66caf..9c1466f6a 100644 --- a/diagnostics/diag.go +++ b/diagnostics/diag.go @@ -12,11 +12,10 @@ import ( "crypto/rand" - "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" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto" ctxutil "github.com/jbenet/go-ipfs/util/ctx" - + 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" peer "github.com/jbenet/go-ipfs/p2p/peer" diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go index 3046c987c..500817b0a 100644 --- a/exchange/bitswap/bitswap.go +++ b/exchange/bitswap/bitswap.go @@ -7,9 +7,8 @@ import ( "sync" "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" process "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" blocks "github.com/jbenet/go-ipfs/blocks" blockstore "github.com/jbenet/go-ipfs/blocks/blockstore" exchange "github.com/jbenet/go-ipfs/exchange" diff --git a/exchange/bitswap/bitswap_test.go b/exchange/bitswap/bitswap_test.go index 6192773a4..781bde91f 100644 --- a/exchange/bitswap/bitswap_test.go +++ b/exchange/bitswap/bitswap_test.go @@ -6,8 +6,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" blocks "github.com/jbenet/go-ipfs/blocks" blocksutil "github.com/jbenet/go-ipfs/blocks/blocksutil" tn "github.com/jbenet/go-ipfs/exchange/bitswap/testnet" diff --git a/exchange/bitswap/decision/engine.go b/exchange/bitswap/decision/engine.go index 11edf5f6d..534f7ae65 100644 --- a/exchange/bitswap/decision/engine.go +++ b/exchange/bitswap/decision/engine.go @@ -4,7 +4,7 @@ package decision import ( "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" bstore "github.com/jbenet/go-ipfs/blocks/blockstore" bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message" wl "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist" diff --git a/exchange/bitswap/decision/engine_test.go b/exchange/bitswap/decision/engine_test.go index 8e5ab672c..dec19281b 100644 --- a/exchange/bitswap/decision/engine_test.go +++ b/exchange/bitswap/decision/engine_test.go @@ -8,9 +8,9 @@ import ( "sync" "testing" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" blocks "github.com/jbenet/go-ipfs/blocks" blockstore "github.com/jbenet/go-ipfs/blocks/blockstore" message "github.com/jbenet/go-ipfs/exchange/bitswap/message" diff --git a/exchange/bitswap/network/interface.go b/exchange/bitswap/network/interface.go index 857201152..aa87e3126 100644 --- a/exchange/bitswap/network/interface.go +++ b/exchange/bitswap/network/interface.go @@ -1,8 +1,7 @@ package network 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" bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message" peer "github.com/jbenet/go-ipfs/p2p/peer" protocol "github.com/jbenet/go-ipfs/p2p/protocol" diff --git a/exchange/bitswap/network/ipfs_impl.go b/exchange/bitswap/network/ipfs_impl.go index d9458776e..9d5c94535 100644 --- a/exchange/bitswap/network/ipfs_impl.go +++ b/exchange/bitswap/network/ipfs_impl.go @@ -1,9 +1,8 @@ package network 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" bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message" host "github.com/jbenet/go-ipfs/p2p/host" inet "github.com/jbenet/go-ipfs/p2p/net" diff --git a/exchange/bitswap/notifications/notifications.go b/exchange/bitswap/notifications/notifications.go index 4616ac735..8797792cf 100644 --- a/exchange/bitswap/notifications/notifications.go +++ b/exchange/bitswap/notifications/notifications.go @@ -1,9 +1,8 @@ package notifications import ( - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" pubsub "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/maybebtc/pubsub" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" blocks "github.com/jbenet/go-ipfs/blocks" u "github.com/jbenet/go-ipfs/util" ) diff --git a/exchange/bitswap/notifications/notifications_test.go b/exchange/bitswap/notifications/notifications_test.go index 372b1e139..97f28d1b9 100644 --- a/exchange/bitswap/notifications/notifications_test.go +++ b/exchange/bitswap/notifications/notifications_test.go @@ -5,7 +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" blocks "github.com/jbenet/go-ipfs/blocks" blocksutil "github.com/jbenet/go-ipfs/blocks/blocksutil" "github.com/jbenet/go-ipfs/util" diff --git a/exchange/bitswap/testnet/network_test.go b/exchange/bitswap/testnet/network_test.go index 268f93607..8af357bf2 100644 --- a/exchange/bitswap/testnet/network_test.go +++ b/exchange/bitswap/testnet/network_test.go @@ -4,7 +4,7 @@ import ( "sync" "testing" - 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" blocks "github.com/jbenet/go-ipfs/blocks" bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message" bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network" diff --git a/exchange/bitswap/testnet/peernet.go b/exchange/bitswap/testnet/peernet.go index 1d1d22408..632c12d37 100644 --- a/exchange/bitswap/testnet/peernet.go +++ b/exchange/bitswap/testnet/peernet.go @@ -1,8 +1,8 @@ package bitswap import ( - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network" mockpeernet "github.com/jbenet/go-ipfs/p2p/net/mock" peer "github.com/jbenet/go-ipfs/p2p/peer" diff --git a/exchange/bitswap/testnet/virtual.go b/exchange/bitswap/testnet/virtual.go index 7ee082cfd..8bebde357 100644 --- a/exchange/bitswap/testnet/virtual.go +++ b/exchange/bitswap/testnet/virtual.go @@ -3,7 +3,7 @@ package bitswap import ( "errors" - 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" bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message" bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network" peer "github.com/jbenet/go-ipfs/p2p/peer" diff --git a/exchange/bitswap/testutils.go b/exchange/bitswap/testutils.go index 5a6b59b3a..c14f1abb8 100644 --- a/exchange/bitswap/testutils.go +++ b/exchange/bitswap/testutils.go @@ -3,9 +3,9 @@ package bitswap import ( "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" ds_sync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" blockstore "github.com/jbenet/go-ipfs/blocks/blockstore" exchange "github.com/jbenet/go-ipfs/exchange" tn "github.com/jbenet/go-ipfs/exchange/bitswap/testnet" diff --git a/exchange/bitswap/workers.go b/exchange/bitswap/workers.go index 0c6e45604..8239fced3 100644 --- a/exchange/bitswap/workers.go +++ b/exchange/bitswap/workers.go @@ -3,9 +3,9 @@ package bitswap import ( "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" inflect "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/briantigerchow/inflect" process "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" ) func (bs *bitswap) startWorkers(px process.Process, ctx context.Context) { diff --git a/exchange/interface.go b/exchange/interface.go index aa2e2431c..c07d2a471 100644 --- a/exchange/interface.go +++ b/exchange/interface.go @@ -4,8 +4,7 @@ package exchange import ( "io" - 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" blocks "github.com/jbenet/go-ipfs/blocks" u "github.com/jbenet/go-ipfs/util" ) diff --git a/exchange/offline/offline.go b/exchange/offline/offline.go index f1a6aaa61..fe8fa723c 100644 --- a/exchange/offline/offline.go +++ b/exchange/offline/offline.go @@ -3,7 +3,7 @@ package offline 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" blocks "github.com/jbenet/go-ipfs/blocks" "github.com/jbenet/go-ipfs/blocks/blockstore" exchange "github.com/jbenet/go-ipfs/exchange" diff --git a/exchange/offline/offline_test.go b/exchange/offline/offline_test.go index d32f336d0..20588bde8 100644 --- a/exchange/offline/offline_test.go +++ b/exchange/offline/offline_test.go @@ -3,9 +3,9 @@ package offline import ( "testing" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" ds_sync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" blocks "github.com/jbenet/go-ipfs/blocks" "github.com/jbenet/go-ipfs/blocks/blockstore" "github.com/jbenet/go-ipfs/blocks/blocksutil" diff --git a/exchange/reprovide/reprovide.go b/exchange/reprovide/reprovide.go index df151c08a..d30237033 100644 --- a/exchange/reprovide/reprovide.go +++ b/exchange/reprovide/reprovide.go @@ -3,9 +3,8 @@ package reprovide import ( "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" backoff "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/cenkalti/backoff" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" blocks "github.com/jbenet/go-ipfs/blocks/blockstore" routing "github.com/jbenet/go-ipfs/routing" eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" diff --git a/exchange/reprovide/reprovide_test.go b/exchange/reprovide/reprovide_test.go index 18fc4d0b1..afd7a56b2 100644 --- a/exchange/reprovide/reprovide_test.go +++ b/exchange/reprovide/reprovide_test.go @@ -3,10 +3,9 @@ package reprovide_test import ( "testing" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" - + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" blocks "github.com/jbenet/go-ipfs/blocks" blockstore "github.com/jbenet/go-ipfs/blocks/blockstore" mock "github.com/jbenet/go-ipfs/routing/mock" diff --git a/fuse/ipns/ipns_test.go b/fuse/ipns/ipns_test.go index 3b6118e5f..189846669 100644 --- a/fuse/ipns/ipns_test.go +++ b/fuse/ipns/ipns_test.go @@ -3,7 +3,7 @@ package ipns import ( "bytes" "crypto/rand" - 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" "io/ioutil" "os" "testing" diff --git a/fuse/ipns/ipns_unix.go b/fuse/ipns/ipns_unix.go index 3af2d5eb2..6214bf7d5 100644 --- a/fuse/ipns/ipns_unix.go +++ b/fuse/ipns/ipns_unix.go @@ -11,8 +11,8 @@ import ( fuse "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse" fs "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs" - "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" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" core "github.com/jbenet/go-ipfs/core" diff --git a/fuse/readonly/readonly_unix.go b/fuse/readonly/readonly_unix.go index 311012762..e5982a5ea 100644 --- a/fuse/readonly/readonly_unix.go +++ b/fuse/readonly/readonly_unix.go @@ -11,9 +11,8 @@ import ( fuse "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse" fs "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs" - "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" - + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" core "github.com/jbenet/go-ipfs/core" mdag "github.com/jbenet/go-ipfs/merkledag" path "github.com/jbenet/go-ipfs/path" diff --git a/importer/balanced/balanced_test.go b/importer/balanced/balanced_test.go index 0e62406e6..5e400017b 100644 --- a/importer/balanced/balanced_test.go +++ b/importer/balanced/balanced_test.go @@ -10,7 +10,7 @@ import ( "os" "testing" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" chunk "github.com/jbenet/go-ipfs/importer/chunk" h "github.com/jbenet/go-ipfs/importer/helpers" merkledag "github.com/jbenet/go-ipfs/merkledag" diff --git a/importer/importer_test.go b/importer/importer_test.go index daaa9940d..3ca35c511 100644 --- a/importer/importer_test.go +++ b/importer/importer_test.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "testing" - 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" chunk "github.com/jbenet/go-ipfs/importer/chunk" dag "github.com/jbenet/go-ipfs/merkledag" mdtest "github.com/jbenet/go-ipfs/merkledag/test" diff --git a/importer/trickle/trickle_test.go b/importer/trickle/trickle_test.go index 79d728c5e..b520f0cb2 100644 --- a/importer/trickle/trickle_test.go +++ b/importer/trickle/trickle_test.go @@ -10,7 +10,7 @@ import ( "os" "testing" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" chunk "github.com/jbenet/go-ipfs/importer/chunk" h "github.com/jbenet/go-ipfs/importer/helpers" merkledag "github.com/jbenet/go-ipfs/merkledag" diff --git a/merkledag/merkledag.go b/merkledag/merkledag.go index 57a5b97f2..6e833056d 100644 --- a/merkledag/merkledag.go +++ b/merkledag/merkledag.go @@ -6,8 +6,7 @@ import ( "sync" "time" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" blocks "github.com/jbenet/go-ipfs/blocks" bserv "github.com/jbenet/go-ipfs/blockservice" u "github.com/jbenet/go-ipfs/util" diff --git a/merkledag/merkledag_test.go b/merkledag/merkledag_test.go index b66b085e8..efb7c77dd 100644 --- a/merkledag/merkledag_test.go +++ b/merkledag/merkledag_test.go @@ -8,9 +8,9 @@ import ( "sync" "testing" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" bstore "github.com/jbenet/go-ipfs/blocks/blockstore" blockservice "github.com/jbenet/go-ipfs/blockservice" bserv "github.com/jbenet/go-ipfs/blockservice" diff --git a/namesys/dns.go b/namesys/dns.go index 2fb477930..9efc72348 100644 --- a/namesys/dns.go +++ b/namesys/dns.go @@ -3,10 +3,10 @@ package namesys import ( "net" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58" isd "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-is-domain" mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" u "github.com/jbenet/go-ipfs/util" ) diff --git a/namesys/interface.go b/namesys/interface.go index 6faaeaf6a..10e4fb89f 100644 --- a/namesys/interface.go +++ b/namesys/interface.go @@ -4,7 +4,7 @@ package namesys import ( "errors" - 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" ci "github.com/jbenet/go-ipfs/p2p/crypto" u "github.com/jbenet/go-ipfs/util" ) diff --git a/namesys/namesys.go b/namesys/namesys.go index eddae747d..d4cc03964 100644 --- a/namesys/namesys.go +++ b/namesys/namesys.go @@ -1,7 +1,7 @@ package namesys 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" ci "github.com/jbenet/go-ipfs/p2p/crypto" routing "github.com/jbenet/go-ipfs/routing" u "github.com/jbenet/go-ipfs/util" diff --git a/namesys/proquint.go b/namesys/proquint.go index 24e97529d..b43f7a2a6 100644 --- a/namesys/proquint.go +++ b/namesys/proquint.go @@ -3,8 +3,8 @@ package namesys import ( "errors" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" proquint "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/bren2010/proquint" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" u "github.com/jbenet/go-ipfs/util" ) diff --git a/namesys/publisher.go b/namesys/publisher.go index 3b209cd26..656730b40 100644 --- a/namesys/publisher.go +++ b/namesys/publisher.go @@ -6,9 +6,9 @@ import ( "fmt" "time" - 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" mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" pb "github.com/jbenet/go-ipfs/namesys/internal/pb" ci "github.com/jbenet/go-ipfs/p2p/crypto" diff --git a/namesys/resolve_test.go b/namesys/resolve_test.go index e349a0aa9..3b8bb7072 100644 --- a/namesys/resolve_test.go +++ b/namesys/resolve_test.go @@ -1,9 +1,9 @@ package namesys import ( - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" "testing" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" mockrouting "github.com/jbenet/go-ipfs/routing/mock" u "github.com/jbenet/go-ipfs/util" testutil "github.com/jbenet/go-ipfs/util/testutil" diff --git a/namesys/routing.go b/namesys/routing.go index a66565db6..ed8690079 100644 --- a/namesys/routing.go +++ b/namesys/routing.go @@ -3,10 +3,9 @@ package namesys import ( "fmt" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto" - mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" pb "github.com/jbenet/go-ipfs/namesys/internal/pb" ci "github.com/jbenet/go-ipfs/p2p/crypto" routing "github.com/jbenet/go-ipfs/routing" diff --git a/notifications/query.go b/notifications/query.go index 77d6fcc58..a6d643b3b 100644 --- a/notifications/query.go +++ b/notifications/query.go @@ -3,7 +3,7 @@ package notifications import ( "encoding/json" - 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" ) diff --git a/p2p/crypto/secio/interface.go b/p2p/crypto/secio/interface.go index 934a5fad8..612a32fc9 100644 --- a/p2p/crypto/secio/interface.go +++ b/p2p/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/p2p/crypto/secio/protocol.go b/p2p/crypto/secio/protocol.go index 9f90dc952..f06e2c239 100644 --- a/p2p/crypto/secio/protocol.go +++ b/p2p/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/p2p/crypto/secio/rw.go b/p2p/crypto/secio/rw.go index 758b2400e..b9a271983 100644 --- a/p2p/crypto/secio/rw.go +++ b/p2p/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/p2p/host/basic/basic_host.go b/p2p/host/basic/basic_host.go index 9ff5a5581..3a1453101 100644 --- a/p2p/host/basic/basic_host.go +++ b/p2p/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/p2p/host/basic/basic_host_test.go b/p2p/host/basic/basic_host_test.go index 0b79d3308..cf24ece51 100644 --- a/p2p/host/basic/basic_host_test.go +++ b/p2p/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/p2p/host/basic/natmgr.go b/p2p/host/basic/natmgr.go index 492841a9d..35cc162fa 100644 --- a/p2p/host/basic/natmgr.go +++ b/p2p/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/p2p/host/host.go b/p2p/host/host.go index e75e99836..caa45f54f 100644 --- a/p2p/host/host.go +++ b/p2p/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/p2p/host/routed/routed.go b/p2p/host/routed/routed.go index 9f18869fe..4ceec6bcd 100644 --- a/p2p/host/routed/routed.go +++ b/p2p/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/p2p/net/conn/conn.go b/p2p/net/conn/conn.go index f205970be..81c4c7350 100644 --- a/p2p/net/conn/conn.go +++ b/p2p/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/p2p/net/conn/conn_test.go b/p2p/net/conn/conn_test.go index 312060308..145654da3 100644 --- a/p2p/net/conn/conn_test.go +++ b/p2p/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/p2p/net/conn/dial.go b/p2p/net/conn/dial.go index 073bd5c62..03fe15383 100644 --- a/p2p/net/conn/dial.go +++ b/p2p/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/p2p/net/conn/dial_test.go b/p2p/net/conn/dial_test.go index 3c141012c..37c3689b6 100644 --- a/p2p/net/conn/dial_test.go +++ b/p2p/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/p2p/net/conn/listen.go b/p2p/net/conn/listen.go index 33b979561..f11287fed 100644 --- a/p2p/net/conn/listen.go +++ b/p2p/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/p2p/net/conn/secure_conn.go b/p2p/net/conn/secure_conn.go index d2c16e0ac..76b6eb5e8 100644 --- a/p2p/net/conn/secure_conn.go +++ b/p2p/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/p2p/net/conn/secure_conn_test.go b/p2p/net/conn/secure_conn_test.go index 6ffc0acdf..83374ec1f 100644 --- a/p2p/net/conn/secure_conn_test.go +++ b/p2p/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/p2p/net/interface.go b/p2p/net/interface.go index a5a006be2..8dda7fbb7 100644 --- a/p2p/net/interface.go +++ b/p2p/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/p2p/net/mock/mock.go b/p2p/net/mock/mock.go index eaeb16281..c6c161ff0 100644 --- a/p2p/net/mock/mock.go +++ b/p2p/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/p2p/net/mock/mock_net.go b/p2p/net/mock/mock_net.go index f3a560cb9..6a4f47825 100644 --- a/p2p/net/mock/mock_net.go +++ b/p2p/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/p2p/net/mock/mock_notif_test.go b/p2p/net/mock/mock_notif_test.go index cb248abf6..cc92a6677 100644 --- a/p2p/net/mock/mock_notif_test.go +++ b/p2p/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/p2p/net/mock/mock_peernet.go b/p2p/net/mock/mock_peernet.go index 79c4a6aa0..e850d5c69 100644 --- a/p2p/net/mock/mock_peernet.go +++ b/p2p/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/p2p/net/mock/mock_test.go b/p2p/net/mock/mock_test.go index 1b1ca7ddb..023bb8966 100644 --- a/p2p/net/mock/mock_test.go +++ b/p2p/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/p2p/net/swarm/addr/addr.go b/p2p/net/swarm/addr/addr.go index 919a279eb..e611ccd51 100644 --- a/p2p/net/swarm/addr/addr.go +++ b/p2p/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/p2p/net/swarm/dial_test.go b/p2p/net/swarm/dial_test.go index 252859df0..497c63b6e 100644 --- a/p2p/net/swarm/dial_test.go +++ b/p2p/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/p2p/net/swarm/peers_test.go b/p2p/net/swarm/peers_test.go index 583e218d4..1ade532ad 100644 --- a/p2p/net/swarm/peers_test.go +++ b/p2p/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/p2p/net/swarm/simul_test.go b/p2p/net/swarm/simul_test.go index 446a011d7..37fcf3e69 100644 --- a/p2p/net/swarm/simul_test.go +++ b/p2p/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/p2p/net/swarm/swarm.go b/p2p/net/swarm/swarm.go index e41177247..4e2282a1d 100644 --- a/p2p/net/swarm/swarm.go +++ b/p2p/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/p2p/net/swarm/swarm_addr_test.go b/p2p/net/swarm/swarm_addr_test.go index e822a4b01..b86898d4d 100644 --- a/p2p/net/swarm/swarm_addr_test.go +++ b/p2p/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/p2p/net/swarm/swarm_conn.go b/p2p/net/swarm/swarm_conn.go index 580f88fae..9da3ace74 100644 --- a/p2p/net/swarm/swarm_conn.go +++ b/p2p/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/p2p/net/swarm/swarm_dial.go b/p2p/net/swarm/swarm_dial.go index d5487689d..4fd1261e6 100644 --- a/p2p/net/swarm/swarm_dial.go +++ b/p2p/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/p2p/net/swarm/swarm_listen.go b/p2p/net/swarm/swarm_listen.go index d19ad961a..8aac86957 100644 --- a/p2p/net/swarm/swarm_listen.go +++ b/p2p/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/p2p/net/swarm/swarm_net.go b/p2p/net/swarm/swarm_net.go index 857eabd26..78343fa86 100644 --- a/p2p/net/swarm/swarm_net.go +++ b/p2p/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/p2p/net/swarm/swarm_net_test.go b/p2p/net/swarm/swarm_net_test.go index 3849838ba..28ef96cb8 100644 --- a/p2p/net/swarm/swarm_net_test.go +++ b/p2p/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/p2p/net/swarm/swarm_notif_test.go b/p2p/net/swarm/swarm_notif_test.go index dccf69b2e..766bfb423 100644 --- a/p2p/net/swarm/swarm_notif_test.go +++ b/p2p/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/p2p/net/swarm/swarm_test.go b/p2p/net/swarm/swarm_test.go index a2bb943e6..4ef7c36c9 100644 --- a/p2p/net/swarm/swarm_test.go +++ b/p2p/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/p2p/peer/queue/queue_test.go b/p2p/peer/queue/queue_test.go index 957564fca..5ca0b09d0 100644 --- a/p2p/peer/queue/queue_test.go +++ b/p2p/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/p2p/peer/queue/sync.go b/p2p/peer/queue/sync.go index c009ab731..b937c09a0 100644 --- a/p2p/peer/queue/sync.go +++ b/p2p/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/p2p/protocol/identify/id.go b/p2p/protocol/identify/id.go index 5712656ea..7d59c6125 100644 --- a/p2p/protocol/identify/id.go +++ b/p2p/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/p2p/protocol/identify/id_test.go b/p2p/protocol/identify/id_test.go index 6af01283d..906809fe0 100644 --- a/p2p/protocol/identify/id_test.go +++ b/p2p/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/p2p/protocol/mux.go b/p2p/protocol/mux.go index ddf27a586..9f4ae7310 100644 --- a/p2p/protocol/mux.go +++ b/p2p/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/p2p/protocol/relay/relay_test.go b/p2p/protocol/relay/relay_test.go index 91d05d97a..2022285bc 100644 --- a/p2p/protocol/relay/relay_test.go +++ b/p2p/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/p2p/test/backpressure/backpressure_test.go b/p2p/test/backpressure/backpressure_test.go index 78c1ce971..347810856 100644 --- a/p2p/test/backpressure/backpressure_test.go +++ b/p2p/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/p2p/test/reconnects/reconnect_test.go b/p2p/test/reconnects/reconnect_test.go index 92ce8729c..39bb18cf9 100644 --- a/p2p/test/reconnects/reconnect_test.go +++ b/p2p/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/p2p/test/util/util.go b/p2p/test/util/util.go index a680d4f3d..b60dbaa1f 100644 --- a/p2p/test/util/util.go +++ b/p2p/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 { diff --git a/pin/pin.go b/pin/pin.go index 25edd5832..c53e17f1c 100644 --- a/pin/pin.go +++ b/pin/pin.go @@ -9,9 +9,9 @@ import ( "sync" "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" nsds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" "github.com/jbenet/go-ipfs/blocks/set" mdag "github.com/jbenet/go-ipfs/merkledag" "github.com/jbenet/go-ipfs/util" diff --git a/routing/dht/dht.go b/routing/dht/dht.go index edd18ff11..1294d9c4a 100644 --- a/routing/dht/dht.go +++ b/routing/dht/dht.go @@ -21,10 +21,10 @@ import ( "github.com/jbenet/go-ipfs/thirdparty/eventlog" u "github.com/jbenet/go-ipfs/util" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto" ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) var log = eventlog.Logger("dht") @@ -78,7 +78,7 @@ func NewDHT(ctx context.Context, h host.Host, dstore ds.ThreadSafeDatastore) *Ip h.SetStreamHandler(ProtocolDHT, dht.handleNewStream) dht.providers = NewProviderManager(dht.Context(), dht.self) - dht.AddChildGroup(dht.providers) + dht.AddChild(dht.providers) dht.routingTable = kb.NewRoutingTable(20, kb.ConvertPeerID(dht.self), time.Minute, dht.peerstore) dht.birth = time.Now() diff --git a/routing/dht/dht_bootstrap.go b/routing/dht/dht_bootstrap.go index 7eedb4821..79dcb4d64 100644 --- a/routing/dht/dht_bootstrap.go +++ b/routing/dht/dht_bootstrap.go @@ -12,9 +12,9 @@ import ( routing "github.com/jbenet/go-ipfs/routing" u "github.com/jbenet/go-ipfs/util" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" goprocess "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess" periodicproc "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/periodic" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) // BootstrapConfig specifies parameters used bootstrapping the DHT. diff --git a/routing/dht/dht_net.go b/routing/dht/dht_net.go index 15b0b63d8..d84e8e008 100644 --- a/routing/dht/dht_net.go +++ b/routing/dht/dht_net.go @@ -9,8 +9,8 @@ import ( pb "github.com/jbenet/go-ipfs/routing/dht/pb" ctxutil "github.com/jbenet/go-ipfs/util/ctx" - 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" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) // handleNewStream implements the inet.StreamHandler diff --git a/routing/dht/dht_test.go b/routing/dht/dht_test.go index b57caaccc..54a644877 100644 --- a/routing/dht/dht_test.go +++ b/routing/dht/dht_test.go @@ -9,11 +9,10 @@ import ( "testing" "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" 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" peer "github.com/jbenet/go-ipfs/p2p/peer" netutil "github.com/jbenet/go-ipfs/p2p/test/util" diff --git a/routing/dht/ext_test.go b/routing/dht/ext_test.go index ab756b5e4..ec5fffac3 100644 --- a/routing/dht/ext_test.go +++ b/routing/dht/ext_test.go @@ -5,6 +5,7 @@ import ( "io/ioutil" "math/rand" "testing" + "time" inet "github.com/jbenet/go-ipfs/p2p/net" mocknet "github.com/jbenet/go-ipfs/p2p/net/mock" @@ -14,12 +15,10 @@ import ( record "github.com/jbenet/go-ipfs/routing/record" u "github.com/jbenet/go-ipfs/util" - 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" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" - - "time" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func TestGetFailures(t *testing.T) { diff --git a/routing/dht/handlers.go b/routing/dht/handlers.go index 03c3eda3c..c1e96e402 100644 --- a/routing/dht/handlers.go +++ b/routing/dht/handlers.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - 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" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" peer "github.com/jbenet/go-ipfs/p2p/peer" pb "github.com/jbenet/go-ipfs/routing/dht/pb" u "github.com/jbenet/go-ipfs/util" diff --git a/routing/dht/lookup.go b/routing/dht/lookup.go index a713e553d..59ef3911f 100644 --- a/routing/dht/lookup.go +++ b/routing/dht/lookup.go @@ -1,8 +1,7 @@ package dht 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" notif "github.com/jbenet/go-ipfs/notifications" peer "github.com/jbenet/go-ipfs/p2p/peer" kb "github.com/jbenet/go-ipfs/routing/kbucket" diff --git a/routing/dht/providers.go b/routing/dht/providers.go index f4f7514fb..1f95bdf82 100644 --- a/routing/dht/providers.go +++ b/routing/dht/providers.go @@ -7,7 +7,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" ) type providerInfo struct { diff --git a/routing/dht/providers_test.go b/routing/dht/providers_test.go index 2781a3c59..22990d580 100644 --- a/routing/dht/providers_test.go +++ b/routing/dht/providers_test.go @@ -6,7 +6,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 TestProviderManager(t *testing.T) { diff --git a/routing/dht/query.go b/routing/dht/query.go index 7a32b45bb..aacab106f 100644 --- a/routing/dht/query.go +++ b/routing/dht/query.go @@ -12,8 +12,8 @@ import ( pset "github.com/jbenet/go-ipfs/util/peerset" todoctr "github.com/jbenet/go-ipfs/util/todocounter" - 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" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) var maxQueryConcurrency = AlphaValue diff --git a/routing/dht/records.go b/routing/dht/records.go index 0bc701153..c6baf4999 100644 --- a/routing/dht/records.go +++ b/routing/dht/records.go @@ -3,8 +3,7 @@ package dht import ( "fmt" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ci "github.com/jbenet/go-ipfs/p2p/crypto" peer "github.com/jbenet/go-ipfs/p2p/peer" pb "github.com/jbenet/go-ipfs/routing/dht/pb" diff --git a/routing/dht/routing.go b/routing/dht/routing.go index ade41b82e..7aa423285 100644 --- a/routing/dht/routing.go +++ b/routing/dht/routing.go @@ -5,8 +5,7 @@ import ( "sync" "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" notif "github.com/jbenet/go-ipfs/notifications" inet "github.com/jbenet/go-ipfs/p2p/net" peer "github.com/jbenet/go-ipfs/p2p/peer" diff --git a/routing/mock/centralized_client.go b/routing/mock/centralized_client.go index 6d358f52b..6a550bfaa 100644 --- a/routing/mock/centralized_client.go +++ b/routing/mock/centralized_client.go @@ -4,9 +4,9 @@ import ( "errors" "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" 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" peer "github.com/jbenet/go-ipfs/p2p/peer" routing "github.com/jbenet/go-ipfs/routing" u "github.com/jbenet/go-ipfs/util" diff --git a/routing/mock/centralized_server.go b/routing/mock/centralized_server.go index dc462797a..a0ee67e6d 100644 --- a/routing/mock/centralized_server.go +++ b/routing/mock/centralized_server.go @@ -5,8 +5,8 @@ import ( "sync" "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" peer "github.com/jbenet/go-ipfs/p2p/peer" u "github.com/jbenet/go-ipfs/util" "github.com/jbenet/go-ipfs/util/testutil" diff --git a/routing/mock/centralized_test.go b/routing/mock/centralized_test.go index 56f61c076..d77144a73 100644 --- a/routing/mock/centralized_test.go +++ b/routing/mock/centralized_test.go @@ -4,7 +4,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" peer "github.com/jbenet/go-ipfs/p2p/peer" delay "github.com/jbenet/go-ipfs/thirdparty/delay" u "github.com/jbenet/go-ipfs/util" diff --git a/routing/mock/dht.go b/routing/mock/dht.go index 2235970f5..0fe30b119 100644 --- a/routing/mock/dht.go +++ b/routing/mock/dht.go @@ -1,9 +1,9 @@ package mockrouting import ( - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" sync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" mocknet "github.com/jbenet/go-ipfs/p2p/net/mock" dht "github.com/jbenet/go-ipfs/routing/dht" "github.com/jbenet/go-ipfs/util/testutil" diff --git a/routing/mock/interface.go b/routing/mock/interface.go index f8b034098..34092dfda 100644 --- a/routing/mock/interface.go +++ b/routing/mock/interface.go @@ -5,8 +5,8 @@ package mockrouting import ( - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" peer "github.com/jbenet/go-ipfs/p2p/peer" routing "github.com/jbenet/go-ipfs/routing" delay "github.com/jbenet/go-ipfs/thirdparty/delay" diff --git a/routing/offline/offline.go b/routing/offline/offline.go index c73d73391..324e438be 100644 --- a/routing/offline/offline.go +++ b/routing/offline/offline.go @@ -4,9 +4,9 @@ import ( "errors" "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ci "github.com/jbenet/go-ipfs/p2p/crypto" "github.com/jbenet/go-ipfs/p2p/peer" routing "github.com/jbenet/go-ipfs/routing" diff --git a/routing/routing.go b/routing/routing.go index 3dea2feb6..be400a520 100644 --- a/routing/routing.go +++ b/routing/routing.go @@ -5,8 +5,7 @@ import ( "errors" "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" peer "github.com/jbenet/go-ipfs/p2p/peer" u "github.com/jbenet/go-ipfs/util" ) diff --git a/routing/supernode/client.go b/routing/supernode/client.go index 14a264524..09fa90ef6 100644 --- a/routing/supernode/client.go +++ b/routing/supernode/client.go @@ -4,8 +4,8 @@ import ( "bytes" "time" - 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" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" "github.com/jbenet/go-ipfs/p2p/host" peer "github.com/jbenet/go-ipfs/p2p/peer" routing "github.com/jbenet/go-ipfs/routing" diff --git a/routing/supernode/proxy/loopback.go b/routing/supernode/proxy/loopback.go index 01aeeac3c..df9dc1d72 100644 --- a/routing/supernode/proxy/loopback.go +++ b/routing/supernode/proxy/loopback.go @@ -1,8 +1,8 @@ package proxy import ( - 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" + 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" dhtpb "github.com/jbenet/go-ipfs/routing/dht/pb" @@ -24,7 +24,6 @@ func (_ *Loopback) Bootstrap(ctx context.Context) error { return nil } - // SendMessage intercepts local requests, forwarding them to a local handler func (lb *Loopback) SendMessage(ctx context.Context, m *dhtpb.Message) error { response := lb.Handler.HandleRequest(ctx, lb.Local, m) diff --git a/routing/supernode/proxy/standard.go b/routing/supernode/proxy/standard.go index e45bfb72b..92a6d9f01 100644 --- a/routing/supernode/proxy/standard.go +++ b/routing/supernode/proxy/standard.go @@ -1,8 +1,8 @@ package proxy import ( - 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" + 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" peer "github.com/jbenet/go-ipfs/p2p/peer" diff --git a/routing/supernode/server.go b/routing/supernode/server.go index 5aca4c4d0..be587f749 100644 --- a/routing/supernode/server.go +++ b/routing/supernode/server.go @@ -3,9 +3,9 @@ package supernode import ( "fmt" - 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" datastore "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" peer "github.com/jbenet/go-ipfs/p2p/peer" dhtpb "github.com/jbenet/go-ipfs/routing/dht/pb" record "github.com/jbenet/go-ipfs/routing/record" diff --git a/server/http/ipfs.go b/server/http/ipfs.go index b0c1687df..298ffc524 100644 --- a/server/http/ipfs.go +++ b/server/http/ipfs.go @@ -3,7 +3,7 @@ package http import ( "io" - "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" core "github.com/jbenet/go-ipfs/core" "github.com/jbenet/go-ipfs/importer" chunk "github.com/jbenet/go-ipfs/importer/chunk" diff --git a/test/integration/addcat_test.go b/test/integration/addcat_test.go index 1c20333b2..39020def5 100644 --- a/test/integration/addcat_test.go +++ b/test/integration/addcat_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" random "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" "github.com/jbenet/go-ipfs/core" coreunix "github.com/jbenet/go-ipfs/core/coreunix" mocknet "github.com/jbenet/go-ipfs/p2p/net/mock" diff --git a/test/integration/bitswap_wo_routing_test.go b/test/integration/bitswap_wo_routing_test.go index 4792a8cbd..96a8dfac7 100644 --- a/test/integration/bitswap_wo_routing_test.go +++ b/test/integration/bitswap_wo_routing_test.go @@ -5,7 +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" "github.com/jbenet/go-ipfs/blocks" "github.com/jbenet/go-ipfs/core" mocknet "github.com/jbenet/go-ipfs/p2p/net/mock" diff --git a/test/integration/core.go b/test/integration/core.go index 00a518ade..876ab2a39 100644 --- a/test/integration/core.go +++ b/test/integration/core.go @@ -1,9 +1,9 @@ package integrationtest import ( - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" syncds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" blockstore "github.com/jbenet/go-ipfs/blocks/blockstore" core "github.com/jbenet/go-ipfs/core" bitswap "github.com/jbenet/go-ipfs/exchange/bitswap" diff --git a/test/integration/grandcentral_test.go b/test/integration/grandcentral_test.go index b48f58242..4d7655b26 100644 --- a/test/integration/grandcentral_test.go +++ b/test/integration/grandcentral_test.go @@ -7,9 +7,9 @@ import ( "math" "testing" - context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" syncds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" core "github.com/jbenet/go-ipfs/core" "github.com/jbenet/go-ipfs/core/corerouting" "github.com/jbenet/go-ipfs/core/coreunix" diff --git a/test/integration/three_legged_cat_test.go b/test/integration/three_legged_cat_test.go index 8ed13f205..abcb2f67b 100644 --- a/test/integration/three_legged_cat_test.go +++ b/test/integration/three_legged_cat_test.go @@ -7,7 +7,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" core "github.com/jbenet/go-ipfs/core" coreunix "github.com/jbenet/go-ipfs/core/coreunix" mocknet "github.com/jbenet/go-ipfs/p2p/net/mock" diff --git a/test/supernode_client/main.go b/test/supernode_client/main.go index 6fe2e7db5..13f39ac8b 100644 --- a/test/supernode_client/main.go +++ b/test/supernode_client/main.go @@ -12,9 +12,9 @@ import ( gopath "path" "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" random "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" "github.com/jbenet/go-ipfs/util/ipfsaddr" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" diff --git a/thirdparty/eventlog/context.go b/thirdparty/eventlog/context.go index c11f47179..6c6f025ef 100644 --- a/thirdparty/eventlog/context.go +++ b/thirdparty/eventlog/context.go @@ -3,7 +3,7 @@ package eventlog import ( "errors" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) type key int diff --git a/thirdparty/eventlog/context_test.go b/thirdparty/eventlog/context_test.go index 8fd6c3280..ea720559d 100644 --- a/thirdparty/eventlog/context_test.go +++ b/thirdparty/eventlog/context_test.go @@ -3,7 +3,7 @@ package eventlog import ( "testing" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func TestContextContainsMetadata(t *testing.T) { diff --git a/thirdparty/eventlog/example_test.go b/thirdparty/eventlog/example_test.go index 04984045b..8148703fc 100644 --- a/thirdparty/eventlog/example_test.go +++ b/thirdparty/eventlog/example_test.go @@ -1,6 +1,6 @@ package eventlog -import "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" +import "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" func ExampleEventLogger() { { diff --git a/thirdparty/eventlog/log.go b/thirdparty/eventlog/log.go index 6600f6eb3..80bb60d18 100644 --- a/thirdparty/eventlog/log.go +++ b/thirdparty/eventlog/log.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "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" "github.com/jbenet/go-ipfs/util" // TODO remove IPFS dependency ) diff --git a/thirdparty/waitable/waitable.go b/thirdparty/waitable/waitable.go index afffce207..a7bf09ea2 100644 --- a/thirdparty/waitable/waitable.go +++ b/thirdparty/waitable/waitable.go @@ -1,7 +1,7 @@ package waitable 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" ) type Waitable interface { diff --git a/unixfs/io/dagmodifier_test.go b/unixfs/io/dagmodifier_test.go index 23f2a0afa..844393950 100644 --- a/unixfs/io/dagmodifier_test.go +++ b/unixfs/io/dagmodifier_test.go @@ -6,7 +6,6 @@ import ( "io/ioutil" "testing" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" "github.com/jbenet/go-ipfs/blocks/blockstore" bs "github.com/jbenet/go-ipfs/blockservice" @@ -19,6 +18,7 @@ import ( ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" logging "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-logging" + context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func getMockDagServ(t *testing.T) mdag.DAGService { diff --git a/unixfs/io/dagreader.go b/unixfs/io/dagreader.go index d363d22d1..0af49e9ee 100644 --- a/unixfs/io/dagreader.go +++ b/unixfs/io/dagreader.go @@ -6,9 +6,8 @@ import ( "io" "os" - "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" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" mdag "github.com/jbenet/go-ipfs/merkledag" ft "github.com/jbenet/go-ipfs/unixfs" ftpb "github.com/jbenet/go-ipfs/unixfs/pb" diff --git a/unixfs/tar/reader.go b/unixfs/tar/reader.go index 4d4f20c88..73f3ea8cf 100644 --- a/unixfs/tar/reader.go +++ b/unixfs/tar/reader.go @@ -4,11 +4,11 @@ import ( "archive/tar" "bytes" "compress/gzip" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" "io" gopath "path" "time" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" mdag "github.com/jbenet/go-ipfs/merkledag" path "github.com/jbenet/go-ipfs/path" uio "github.com/jbenet/go-ipfs/unixfs/io" diff --git a/util/context.go b/util/context.go index 6826ac225..f6a919baa 100644 --- a/util/context.go +++ b/util/context.go @@ -1,7 +1,7 @@ package util 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" ) // privateChanType protects the channel. Since this is a package-private type, diff --git a/util/context_test.go b/util/context_test.go index a7249ab09..42613a5eb 100644 --- a/util/context_test.go +++ b/util/context_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - 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 TestLogErrorDoesNotBlockWhenCtxIsNotSetUpForLogging(t *testing.T) { diff --git a/util/ctx/ctxio.go b/util/ctx/ctxio.go index 0b41086df..606ce6062 100644 --- a/util/ctx/ctxio.go +++ b/util/ctx/ctxio.go @@ -3,7 +3,7 @@ package ctxutil import ( "io" - 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" ) type ioret struct { diff --git a/util/ctx/ctxio_test.go b/util/ctx/ctxio_test.go index 4104fb4a0..6609093e3 100644 --- a/util/ctx/ctxio_test.go +++ b/util/ctx/ctxio_test.go @@ -6,7 +6,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" ) func TestReader(t *testing.T) { diff --git a/util/ctx/fracctx.go b/util/ctx/fracctx.go index 74d50b692..6abdb8463 100644 --- a/util/ctx/fracctx.go +++ b/util/ctx/fracctx.go @@ -3,7 +3,7 @@ package ctxutil import ( "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" ) func WithDeadlineFraction(ctx context.Context, fraction float64) (context.Context, context.CancelFunc) { diff --git a/util/ctx/fracctx_test.go b/util/ctx/fracctx_test.go index 230be285f..91a7a1b9a 100644 --- a/util/ctx/fracctx_test.go +++ b/util/ctx/fracctx_test.go @@ -6,7 +6,7 @@ import ( 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" ) // this test is on the context tool itself, not our stuff. it's for sanity on ours. diff --git a/util/ctxcloser/closer.go b/util/ctxcloser/closer.go index 5baf6591d..8d7990f5a 100644 --- a/util/ctxcloser/closer.go +++ b/util/ctxcloser/closer.go @@ -3,7 +3,7 @@ package ctxcloser import ( "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" ) // CloseFunc is a function used to close a ContextCloser diff --git a/util/do.go b/util/do.go index 95ec6e56a..78a9d0853 100644 --- a/util/do.go +++ b/util/do.go @@ -1,6 +1,6 @@ package util -import "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" +import "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" func ContextDo(ctx context.Context, f func() error) error { diff --git a/util/do_test.go b/util/do_test.go index 8abc91589..a6fe9451b 100644 --- a/util/do_test.go +++ b/util/do_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" ) func TestDoReturnsContextErr(t *testing.T) {