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
Henry committed
Feb 23, 2015 at 16:51 UTC
92d08db7a587784be89c876c1532006a0c0b3773
165 files changed
+258
-271
Godeps/Godeps.json
+7
-8
@@ -1,6 +1,6 @@
1
{
2
"ImportPath": "github.com/jbenet/go-ipfs",
3
- "GoVersion": "go1.4",
3
+ "GoVersion": "go1.4.2",
4
"Packages": [
5
"./..."
6
],
@@ -29,11 +29,6 @@
29
"Comment": "null-236",
30
"Rev": "69e2a90ed92d03812364aeb947b7068dc42e561e"
31
},
32
- {
33
- "ImportPath": "code.google.com/p/go.net/context",
34
- "Comment": "null-144",
35
- "Rev": "ad01a6fcc8a19d3a4478c836895ffe883bd2ceab"
36
- },
32
{
33
"ImportPath": "code.google.com/p/gogoprotobuf/io",
34
"Rev": "6c980277330804e94257ac7ef70a3adbe1641059"
@@ -156,7 +151,7 @@
151
},
152
{
153
"ImportPath": "github.com/jbenet/go-ctxgroup",
159
- "Rev": "6b9437e8517175306e30ffec241c523752a38303"
154
+ "Rev": "c14598396fa31465dc558b176c7976606f95a49d"
155
},
156
{
157
"ImportPath": "github.com/jbenet/go-datastore",
@@ -214,7 +209,7 @@
209
},
210
{
211
"ImportPath": "github.com/jbenet/goprocess",
217
- "Rev": "060ad098994e6adac22f0bd889eb756d4f5ad35b"
212
+ "Rev": "b4efc4c8775f0250710b39bfa716276ca10f85af"
213
},
214
{
215
"ImportPath": "github.com/kr/binarydist",
@@ -241,6 +236,10 @@
236
"ImportPath": "github.com/syndtr/gosnappy/snappy",
237
"Rev": "ce8acff4829e0c2458a67ead32390ac0a381c862"
238
},
239
+ {
240
+ "ImportPath": "golang.org/x/net/context",
241
+ "Rev": "b6fdb7d8a4ccefede406f8fe0f017fb58265054c"
242
+ },
243
{
244
"ImportPath": "gopkg.in/fsnotify.v1",
245
"Comment": "v1.1.0",
Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/Godeps/Godeps.json
+3
-4
@@ -1,14 +1,13 @@
1
{
2
"ImportPath": "github.com/jbenet/go-ctxgroup",
3
- "GoVersion": "go1.3",
3
+ "GoVersion": "go1.4.2",
4
"Packages": [
5
"./..."
6
],
7
"Deps": [
8
{
9
- "ImportPath": "code.google.com/p/go.net/context",
10
- "Comment": "null-144",
11
- "Rev": "ad01a6fcc8a19d3a4478c836895ffe883bd2ceab"
9
+ "ImportPath": "golang.org/x/net/context",
10
+ "Rev": "b6fdb7d8a4ccefede406f8fe0f017fb58265054c"
11
}
12
]
13
}
Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/ctxgroup.go
+8
-16
@@ -3,9 +3,10 @@
3
package ctxgroup
4
5
import (
6
+ "io"
7
"sync"
8
8
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
10
)
11
12
// TeardownFunc is a function used to cleanup state at the end of the
@@ -68,18 +69,9 @@ type ContextGroup interface {
69
// WARNING: this is deprecated and will go away soon.
70
Children() *sync.WaitGroup
71
71
- // AddChildGroup registers a dependent ContextGroup child. The child will
72
- // be closed when this parent is closed, and waited upon to finish. It is
73
- // the functional equivalent of the following:
74
- //
75
- // parent.Children().Add(1) // add one more dependent child
76
- // go func(parent, child ContextGroup) {
77
- // <-parent.Closing() // wait until parent is closing
78
- // child.Close() // signal child to close
79
- // parent.Children().Done() // child signals it is done
80
- // }(a, b)
81
- //
82
- AddChildGroup(c ContextGroup)
72
+ // AddChild gives ownership of a child io.Closer. The child will be closed
73
+ // when the context group is closed.
74
+ AddChild(io.Closer)
75
76
// AddChildFunc registers a dependent ChildFund. The child will receive
77
// its parent ContextGroup, and can wait on its signals. Child references
@@ -163,9 +155,9 @@ func (c *contextGroup) Children() *sync.WaitGroup {
155
return &c.children
156
}
157
166
-func (c *contextGroup) AddChildGroup(child ContextGroup) {
158
+func (c *contextGroup) AddChild(child io.Closer) {
159
c.children.Add(1)
168
- go func(parent, child ContextGroup) {
160
+ go func(parent ContextGroup, child io.Closer) {
161
<-parent.Closing() // wait until parent is closing
162
child.Close() // signal child to close
163
parent.Children().Done() // child signals it is done
@@ -255,7 +247,7 @@ func WithParent(p ContextGroup) ContextGroup {
247
panic("nil ContextGroup")
248
}
249
c := newContextGroup(p.Context(), nil)
258
- p.AddChildGroup(c)
250
+ p.AddChild(c)
251
return c
252
}
253
Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/ctxgroup_test.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"testing"
5
"time"
6
7
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
8
)
9
10
type tree struct {
Godeps/_workspace/src/github.com/jbenet/goprocess/context/context.go
+1
-1
@@ -1,8 +1,8 @@
1
package goprocessctx
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
goprocess "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
5
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
6
)
7
8
// WithContext constructs and returns a Process that respects
Godeps/_workspace/src/golang.org/x/net/context/context.go
renamed
+54
-38
@@ -64,18 +64,21 @@ type Context interface {
64
//
65
// Done is provided for use in select statements:
66
//
67
- // // DoSomething calls DoSomethingSlow and returns as soon as
68
- // // it returns or ctx.Done is closed.
69
- // func DoSomething(ctx context.Context) (Result, error) {
70
- // c := make(chan Result, 1)
71
- // go func() { c <- DoSomethingSlow(ctx) }()
72
- // select {
73
- // case res := <-c:
74
- // return res, nil
75
- // case <-ctx.Done():
76
- // return nil, ctx.Err()
77
- // }
78
- // }
67
+ // // Stream generates values with DoSomething and sends them to out
68
+ // // until DoSomething returns an error or ctx.Done is closed.
69
+ // func Stream(ctx context.Context, out <-chan Value) error {
70
+ // for {
71
+ // v, err := DoSomething(ctx)
72
+ // if err != nil {
73
+ // return err
74
+ // }
75
+ // select {
76
+ // case <-ctx.Done():
77
+ // return ctx.Err()
78
+ // case out <- v:
79
+ // }
80
+ // }
81
+ // }
82
//
83
// See http://blog.golang.org/pipelines for more examples of how to use
84
// a Done channel for cancelation.
@@ -108,7 +111,7 @@ type Context interface {
111
// // Package user defines a User type that's stored in Contexts.
112
// package user
113
//
111
- // import "code.google.com/p/go.net/context"
114
+ // import "golang.org/x/net/context"
115
//
116
// // User is the type of value stored in the Contexts.
117
// type User struct {...}
@@ -124,7 +127,7 @@ type Context interface {
127
//
128
// // NewContext returns a new Context that carries value u.
129
// func NewContext(ctx context.Context, u *User) context.Context {
127
- // return context.WithValue(userKey, u)
130
+ // return context.WithValue(ctx, userKey, u)
131
// }
132
//
133
// // FromContext returns the User value stored in ctx, if any.
@@ -142,27 +145,28 @@ var Canceled = errors.New("context canceled")
145
// deadline passes.
146
var DeadlineExceeded = errors.New("context deadline exceeded")
147
145
-// An emptyCtx is never canceled, has no values, and has no deadline.
148
+// An emptyCtx is never canceled, has no values, and has no deadline. It is not
149
+// struct{}, since vars of this type must have distinct addresses.
150
type emptyCtx int
151
148
-func (emptyCtx) Deadline() (deadline time.Time, ok bool) {
152
+func (*emptyCtx) Deadline() (deadline time.Time, ok bool) {
153
return
154
}
155
152
-func (emptyCtx) Done() <-chan struct{} {
156
+func (*emptyCtx) Done() <-chan struct{} {
157
return nil
158
}
159
156
-func (emptyCtx) Err() error {
160
+func (*emptyCtx) Err() error {
161
return nil
162
}
163
160
-func (emptyCtx) Value(key interface{}) interface{} {
164
+func (*emptyCtx) Value(key interface{}) interface{} {
165
return nil
166
}
167
164
-func (n emptyCtx) String() string {
165
- switch n {
168
+func (e *emptyCtx) String() string {
169
+ switch e {
170
case background:
171
return "context.Background"
172
case todo:
@@ -171,9 +175,9 @@ func (n emptyCtx) String() string {
175
return "unknown empty Context"
176
}
177
174
-const (
175
- background emptyCtx = 1
176
- todo emptyCtx = 2
178
+var (
179
+ background = new(emptyCtx)
180
+ todo = new(emptyCtx)
181
)
182
183
// Background returns a non-nil, empty Context. It is never canceled, has no
@@ -201,6 +205,9 @@ type CancelFunc func()
205
// WithCancel returns a copy of parent with a new Done channel. The returned
206
// context's Done channel is closed when the returned cancel function is called
207
// or when the parent context's Done channel is closed, whichever happens first.
208
+//
209
+// Canceling this context releases resources associated with it, so code should
210
+// call cancel as soon as the operations running in this Context complete.
211
func WithCancel(parent Context) (ctx Context, cancel CancelFunc) {
212
c := newCancelCtx(parent)
213
propagateCancel(parent, &c)
@@ -261,6 +268,19 @@ func parentCancelCtx(parent Context) (*cancelCtx, bool) {
268
}
269
}
270
271
+// removeChild removes a context from its parent.
272
+func removeChild(parent Context, child canceler) {
273
+ p, ok := parentCancelCtx(parent)
274
+ if !ok {
275
+ return
276
+ }
277
+ p.mu.Lock()
278
+ if p.children != nil {
279
+ delete(p.children, child)
280
+ }
281
+ p.mu.Unlock()
282
+}
283
+
284
// A canceler is a context type that can be canceled directly. The
285
// implementations are *cancelCtx and *timerCtx.
286
type canceler interface {
@@ -315,13 +335,7 @@ func (c *cancelCtx) cancel(removeFromParent bool, err error) {
335
c.mu.Unlock()
336
337
if removeFromParent {
318
- if p, ok := parentCancelCtx(c.Context); ok {
319
- p.mu.Lock()
320
- if p.children != nil {
321
- delete(p.children, c)
322
- }
323
- p.mu.Unlock()
324
- }
338
+ removeChild(c.Context, c)
339
}
340
}
341
@@ -332,9 +346,8 @@ func (c *cancelCtx) cancel(removeFromParent bool, err error) {
346
// cancel function is called, or when the parent context's Done channel is
347
// closed, whichever happens first.
348
//
335
-// Canceling this context releases resources associated with the deadline
336
-// timer, so code should call cancel as soon as the operations running in this
337
-// Context complete.
349
+// Canceling this context releases resources associated with it, so code should
350
+// call cancel as soon as the operations running in this Context complete.
351
func WithDeadline(parent Context, deadline time.Time) (Context, CancelFunc) {
352
if cur, ok := parent.Deadline(); ok && cur.Before(deadline) {
353
// The current deadline is already sooner than the new one.
@@ -379,7 +392,11 @@ func (c *timerCtx) String() string {
392
}
393
394
func (c *timerCtx) cancel(removeFromParent bool, err error) {
382
- c.cancelCtx.cancel(removeFromParent, err)
395
+ c.cancelCtx.cancel(false, err)
396
+ if removeFromParent {
397
+ // Remove this timerCtx from its parent cancelCtx's children.
398
+ removeChild(c.cancelCtx.Context, c)
399
+ }
400
c.mu.Lock()
401
if c.timer != nil {
402
c.timer.Stop()
@@ -390,9 +407,8 @@ func (c *timerCtx) cancel(removeFromParent bool, err error) {
407
408
// WithTimeout returns WithDeadline(parent, time.Now().Add(timeout)).
409
//
393
-// Canceling this context releases resources associated with the deadline
394
-// timer, so code should call cancel as soon as the operations running in this
395
-// Context complete:
410
+// Canceling this context releases resources associated with it, so code should
411
+// call cancel as soon as the operations running in this Context complete:
412
//
413
// func slowOperationWithTimeout(ctx context.Context) (Result, error) {
414
// ctx, cancel := context.WithTimeout(ctx, 100*time.Millisecond)
Godeps/_workspace/src/golang.org/x/net/context/context_test.go
renamed
+23
-1
@@ -365,7 +365,7 @@ func TestAllocs(t *testing.T) {
365
c := WithValue(bg, k1, nil)
366
c.Value(k1)
367
},
368
- limit: 1,
368
+ limit: 3,
369
gccgoLimit: 3,
370
},
371
{
@@ -551,3 +551,25 @@ func testLayers(t *testing.T, seed int64, testTimeout bool) {
551
checkValues("after cancel")
552
}
553
}
554
+
555
+func TestCancelRemoves(t *testing.T) {
556
+ checkChildren := func(when string, ctx Context, want int) {
557
+ if got := len(ctx.(*cancelCtx).children); got != want {
558
+ t.Errorf("%s: context has %d children, want %d", when, got, want)
559
+ }
560
+ }
561
+
562
+ ctx, _ := WithCancel(Background())
563
+ checkChildren("after creation", ctx, 0)
564
+ _, cancel := WithCancel(ctx)
565
+ checkChildren("with WithCancel child ", ctx, 1)
566
+ cancel()
567
+ checkChildren("after cancelling WithCancel child", ctx, 0)
568
+
569
+ ctx, _ = WithCancel(Background())
570
+ checkChildren("after creation", ctx, 0)
571
+ _, cancel = WithTimeout(ctx, 60*time.Minute)
572
+ checkChildren("with WithTimeout child ", ctx, 1)
573
+ cancel()
574
+ checkChildren("after cancelling WithTimeout child", ctx, 0)
575
+}
Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go
renamed
+1
-1
@@ -8,7 +8,7 @@ import (
8
"fmt"
9
"time"
10
11
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
11
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
12
)
13
14
func ExampleWithTimeout() {
blocks/blockstore/blockstore.go
+1
-2
@@ -5,12 +5,11 @@ package blockstore
5
import (
6
"errors"
7
8
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
9
dsns "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace"
10
dsq "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/query"
11
mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
13
-
12
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
13
blocks "github.com/jbenet/go-ipfs/blocks"
14
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
15
u "github.com/jbenet/go-ipfs/util"
blocks/blockstore/blockstore_test.go
+1
-1
@@ -5,10 +5,10 @@ import (
5
"fmt"
6
"testing"
7
8
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
9
dsq "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/query"
10
ds_sync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
11
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
12
13
blocks "github.com/jbenet/go-ipfs/blocks"
14
u "github.com/jbenet/go-ipfs/util"
blocks/blockstore/write_cache.go
+1
-2
@@ -1,9 +1,8 @@
1
package blockstore
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/hashicorp/golang-lru"
6
-
5
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
6
"github.com/jbenet/go-ipfs/blocks"
7
u "github.com/jbenet/go-ipfs/util"
8
)
blockservice/blocks_test.go
+1
-1
@@ -5,9 +5,9 @@ import (
5
"testing"
6
"time"
7
8
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
9
dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
10
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
11
blocks "github.com/jbenet/go-ipfs/blocks"
12
blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
13
blocksutil "github.com/jbenet/go-ipfs/blocks/blocksutil"
blockservice/blockservice.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"errors"
8
"fmt"
9
10
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
11
blocks "github.com/jbenet/go-ipfs/blocks"
12
"github.com/jbenet/go-ipfs/blocks/blockstore"
13
worker "github.com/jbenet/go-ipfs/blockservice/worker"
cmd/ipfs/init.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"fmt"
6
"io"
7
8
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
assets "github.com/jbenet/go-ipfs/assets"
10
cmds "github.com/jbenet/go-ipfs/commands"
11
core "github.com/jbenet/go-ipfs/core"
cmd/ipfs/main.go
+1
-2
@@ -17,7 +17,7 @@ import (
17
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
18
manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
19
20
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
20
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" // log is the command logger
21
cmds "github.com/jbenet/go-ipfs/commands"
22
cmdsCli "github.com/jbenet/go-ipfs/commands/cli"
23
cmdsHttp "github.com/jbenet/go-ipfs/commands/http"
@@ -29,7 +29,6 @@ import (
29
"github.com/jbenet/go-ipfs/util/debugerror"
30
)
31
32
-// log is the command logger
32
var log = eventlog.Logger("cmd/ipfs")
33
34
// signal to output help
cmd/ipfs_bootstrapd/main.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
"os"
9
"time"
10
11
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
11
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
12
core "github.com/jbenet/go-ipfs/core"
13
corehttp "github.com/jbenet/go-ipfs/core/corehttp"
14
corerepo "github.com/jbenet/go-ipfs/core/corerepo"
cmd/ipfs_routingd/main.go
+1
-1
@@ -9,11 +9,11 @@ import (
9
"os/signal"
10
"time"
11
12
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
12
aws "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/aws"
13
s3 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/crowdmob/goamz/s3"
14
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/fzzy/radix/redis"
15
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
16
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
17
core "github.com/jbenet/go-ipfs/core"
18
corerouting "github.com/jbenet/go-ipfs/core/corerouting"
19
config "github.com/jbenet/go-ipfs/repo/config"
cmd/ipfswatch/main.go
+1
-1
@@ -7,9 +7,9 @@ import (
7
"os/signal"
8
"path/filepath"
9
10
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
process "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
11
homedir "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir"
12
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
13
fsnotify "github.com/jbenet/go-ipfs/Godeps/_workspace/src/gopkg.in/fsnotify.v1"
14
commands "github.com/jbenet/go-ipfs/commands"
15
core "github.com/jbenet/go-ipfs/core"
commands/http/handler.go
+1
-2
@@ -8,8 +8,7 @@ import (
8
"strconv"
9
"strings"
10
11
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
12
-
11
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
12
cmds "github.com/jbenet/go-ipfs/commands"
13
u "github.com/jbenet/go-ipfs/util"
14
)
commands/request.go
+1
-2
@@ -8,8 +8,7 @@ import (
8
"reflect"
9
"strconv"
10
11
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
12
-
11
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
12
"github.com/jbenet/go-ipfs/commands/files"
13
"github.com/jbenet/go-ipfs/core"
14
"github.com/jbenet/go-ipfs/repo/config"
core/bootstrap.go
+1
-1
@@ -15,11 +15,11 @@ import (
15
math2 "github.com/jbenet/go-ipfs/thirdparty/math2"
16
lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
17
18
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
18
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
19
goprocess "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
20
procctx "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/context"
21
periodicproc "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/periodic"
22
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
23
)
24
25
// ErrNotEnoughBootstrapPeers signals that we do not have enough bootstrap
core/builder.go
+1
-2
@@ -3,10 +3,9 @@ package core
3
import (
4
"errors"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
7
dsync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
9
-
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
repo "github.com/jbenet/go-ipfs/repo"
10
)
11
core/commands/block.go
+1
-2
@@ -8,9 +8,8 @@ import (
8
"io/ioutil"
9
"strings"
10
11
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
12
-
11
mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
12
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
13
"github.com/jbenet/go-ipfs/blocks"
14
cmds "github.com/jbenet/go-ipfs/commands"
15
u "github.com/jbenet/go-ipfs/util"
core/commands/cat.go
+1
-1
@@ -8,8 +8,8 @@ import (
8
path "github.com/jbenet/go-ipfs/path"
9
uio "github.com/jbenet/go-ipfs/unixfs/io"
10
11
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
11
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/cheggaaa/pb"
12
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
13
)
14
15
const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB
core/commands/id.go
+1
-2
@@ -9,9 +9,8 @@ import (
9
"strings"
10
"time"
11
12
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
13
-
12
b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
13
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
15
cmds "github.com/jbenet/go-ipfs/commands"
16
core "github.com/jbenet/go-ipfs/core"
core/commands/ping.go
+1
-1
@@ -13,8 +13,8 @@ import (
13
peer "github.com/jbenet/go-ipfs/p2p/peer"
14
u "github.com/jbenet/go-ipfs/util"
15
16
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
16
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
17
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
18
)
19
20
const kPingTimeout = 10 * time.Second
core/commands/refs.go
+1
-2
@@ -6,8 +6,7 @@ import (
6
"strings"
7
"sync"
8
9
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
-
9
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
10
cmds "github.com/jbenet/go-ipfs/commands"
11
"github.com/jbenet/go-ipfs/core"
12
dag "github.com/jbenet/go-ipfs/merkledag"
core/commands/swarm.go
+1
-1
@@ -11,8 +11,8 @@ import (
11
errors "github.com/jbenet/go-ipfs/util/debugerror"
12
iaddr "github.com/jbenet/go-ipfs/util/ipfsaddr"
13
14
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
14
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
15
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
16
)
17
18
type stringList struct {
core/core.go
+1
-2
@@ -7,12 +7,11 @@ import (
7
"io"
8
"time"
9
10
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
11
ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
12
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
13
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
15
-
14
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
15
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
16
debugerror "github.com/jbenet/go-ipfs/util/debugerror"
17
core/core_test.go
+1
-1
@@ -3,7 +3,7 @@ package core
3
import (
4
"testing"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
"github.com/jbenet/go-ipfs/repo"
8
config "github.com/jbenet/go-ipfs/repo/config"
9
"github.com/jbenet/go-ipfs/util/testutil"
core/corehttp/gateway_handler.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"strings"
10
"time"
11
12
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
12
mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
13
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
15
core "github.com/jbenet/go-ipfs/core"
16
"github.com/jbenet/go-ipfs/importer"
core/corehttp/gateway_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"strings"
10
"testing"
11
12
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
12
b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
13
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
core "github.com/jbenet/go-ipfs/core"
15
coreunix "github.com/jbenet/go-ipfs/core/coreunix"
16
namesys "github.com/jbenet/go-ipfs/namesys"
core/corehttp/ipns_hostname.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"net/http"
5
"strings"
6
7
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
8
"github.com/jbenet/go-ipfs/core"
9
)
10
core/corenet/net.go
+1
-1
@@ -3,7 +3,7 @@ package corenet
3
import (
4
"time"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
core "github.com/jbenet/go-ipfs/core"
8
net "github.com/jbenet/go-ipfs/p2p/net"
9
peer "github.com/jbenet/go-ipfs/p2p/peer"
core/corerepo/gc.go
+1
-1
@@ -1,7 +1,7 @@
1
package corerepo
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
5
"github.com/jbenet/go-ipfs/core"
6
u "github.com/jbenet/go-ipfs/util"
7
core/corerouting/core.go
+1
-1
@@ -3,8 +3,8 @@ package corerouting
3
import (
4
"errors"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
7
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
8
core "github.com/jbenet/go-ipfs/core"
9
"github.com/jbenet/go-ipfs/p2p/host"
10
"github.com/jbenet/go-ipfs/p2p/peer"
core/coreunix/add_test.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"path"
6
"testing"
7
8
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
"github.com/jbenet/go-ipfs/core"
10
"github.com/jbenet/go-ipfs/repo"
11
"github.com/jbenet/go-ipfs/repo/config"
core/coreunix/metadata_test.go
+1
-1
@@ -5,9 +5,9 @@ import (
5
"io/ioutil"
6
"testing"
7
8
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
9
dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
10
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
11
bstore "github.com/jbenet/go-ipfs/blocks/blockstore"
12
bserv "github.com/jbenet/go-ipfs/blockservice"
13
core "github.com/jbenet/go-ipfs/core"
core/mock.go
+1
-1
@@ -1,9 +1,9 @@
1
package core
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
5
syncds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
6
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
"github.com/jbenet/go-ipfs/blocks/blockstore"
8
blockservice "github.com/jbenet/go-ipfs/blockservice"
9
"github.com/jbenet/go-ipfs/exchange/offline"
diagnostics/diag.go
+1
-2
@@ -12,11 +12,10 @@ import (
12
13
"crypto/rand"
14
15
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
15
ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
16
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
17
ctxutil "github.com/jbenet/go-ipfs/util/ctx"
19
-
18
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
19
host "github.com/jbenet/go-ipfs/p2p/host"
20
inet "github.com/jbenet/go-ipfs/p2p/net"
21
peer "github.com/jbenet/go-ipfs/p2p/peer"
exchange/bitswap/bitswap.go
+1
-2
@@ -7,9 +7,8 @@ import (
7
"sync"
8
"time"
9
10
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
process "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
12
-
11
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
12
blocks "github.com/jbenet/go-ipfs/blocks"
13
blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
14
exchange "github.com/jbenet/go-ipfs/exchange"
exchange/bitswap/bitswap_test.go
+1
-2
@@ -6,8 +6,7 @@ import (
6
"testing"
7
"time"
8
9
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
-
9
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
10
blocks "github.com/jbenet/go-ipfs/blocks"
11
blocksutil "github.com/jbenet/go-ipfs/blocks/blocksutil"
12
tn "github.com/jbenet/go-ipfs/exchange/bitswap/testnet"
exchange/bitswap/decision/engine.go
+1
-1
@@ -4,7 +4,7 @@ package decision
4
import (
5
"sync"
6
7
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
8
bstore "github.com/jbenet/go-ipfs/blocks/blockstore"
9
bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
10
wl "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
exchange/bitswap/decision/engine_test.go
+1
-1
@@ -8,9 +8,9 @@ import (
8
"sync"
9
"testing"
10
11
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
11
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
12
dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
13
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
blocks "github.com/jbenet/go-ipfs/blocks"
15
blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
16
message "github.com/jbenet/go-ipfs/exchange/bitswap/message"
exchange/bitswap/network/interface.go
+1
-2
@@ -1,8 +1,7 @@
1
package network
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5
-
4
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
5
bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
6
peer "github.com/jbenet/go-ipfs/p2p/peer"
7
protocol "github.com/jbenet/go-ipfs/p2p/protocol"
exchange/bitswap/network/ipfs_impl.go
+1
-2
@@ -1,9 +1,8 @@
1
package network
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
6
-
5
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
6
bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
7
host "github.com/jbenet/go-ipfs/p2p/host"
8
inet "github.com/jbenet/go-ipfs/p2p/net"
exchange/bitswap/notifications/notifications.go
+1
-2
@@ -1,9 +1,8 @@
1
package notifications
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
pubsub "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/maybebtc/pubsub"
6
-
5
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
6
blocks "github.com/jbenet/go-ipfs/blocks"
7
u "github.com/jbenet/go-ipfs/util"
8
)
exchange/bitswap/notifications/notifications_test.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"testing"
6
"time"
7
8
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
blocks "github.com/jbenet/go-ipfs/blocks"
10
blocksutil "github.com/jbenet/go-ipfs/blocks/blocksutil"
11
"github.com/jbenet/go-ipfs/util"
exchange/bitswap/testnet/network_test.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"sync"
5
"testing"
6
7
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
8
blocks "github.com/jbenet/go-ipfs/blocks"
9
bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
10
bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
exchange/bitswap/testnet/peernet.go
+1
-1
@@ -1,8 +1,8 @@
1
package bitswap
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
5
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
6
bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
7
mockpeernet "github.com/jbenet/go-ipfs/p2p/net/mock"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
exchange/bitswap/testnet/virtual.go
+1
-1
@@ -3,7 +3,7 @@ package bitswap
3
import (
4
"errors"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
8
bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
9
peer "github.com/jbenet/go-ipfs/p2p/peer"
exchange/bitswap/testutils.go
+1
-1
@@ -3,9 +3,9 @@ package bitswap
3
import (
4
"time"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
7
ds_sync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
10
exchange "github.com/jbenet/go-ipfs/exchange"
11
tn "github.com/jbenet/go-ipfs/exchange/bitswap/testnet"
exchange/bitswap/workers.go
+1
-1
@@ -3,9 +3,9 @@ package bitswap
3
import (
4
"time"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
inflect "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/briantigerchow/inflect"
7
process "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
)
10
11
func (bs *bitswap) startWorkers(px process.Process, ctx context.Context) {
exchange/interface.go
+1
-2
@@ -4,8 +4,7 @@ package exchange
4
import (
5
"io"
6
7
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
-
7
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
8
blocks "github.com/jbenet/go-ipfs/blocks"
9
u "github.com/jbenet/go-ipfs/util"
10
)
exchange/offline/offline.go
+1
-1
@@ -3,7 +3,7 @@
3
package offline
4
5
import (
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
blocks "github.com/jbenet/go-ipfs/blocks"
8
"github.com/jbenet/go-ipfs/blocks/blockstore"
9
exchange "github.com/jbenet/go-ipfs/exchange"
exchange/offline/offline_test.go
+1
-1
@@ -3,9 +3,9 @@ package offline
3
import (
4
"testing"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
7
ds_sync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
blocks "github.com/jbenet/go-ipfs/blocks"
10
"github.com/jbenet/go-ipfs/blocks/blockstore"
11
"github.com/jbenet/go-ipfs/blocks/blocksutil"
exchange/reprovide/reprovide.go
+1
-2
@@ -3,9 +3,8 @@ package reprovide
3
import (
4
"time"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
backoff "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/cenkalti/backoff"
8
-
7
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
8
blocks "github.com/jbenet/go-ipfs/blocks/blockstore"
9
routing "github.com/jbenet/go-ipfs/routing"
10
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
exchange/reprovide/reprovide_test.go
+1
-2
@@ -3,10 +3,9 @@ package reprovide_test
3
import (
4
"testing"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
7
dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
9
-
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
blocks "github.com/jbenet/go-ipfs/blocks"
10
blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
11
mock "github.com/jbenet/go-ipfs/routing/mock"
fuse/ipns/ipns_test.go
+1
-1
@@ -3,7 +3,7 @@ package ipns
3
import (
4
"bytes"
5
"crypto/rand"
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
"io/ioutil"
8
"os"
9
"testing"
fuse/ipns/ipns_unix.go
+1
-1
@@ -11,8 +11,8 @@ import (
11
12
fuse "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
13
fs "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
14
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
14
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
15
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
16
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
17
18
core "github.com/jbenet/go-ipfs/core"
fuse/readonly/readonly_unix.go
+1
-2
@@ -11,9 +11,8 @@ import (
11
12
fuse "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
13
fs "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
14
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
14
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
16
-
15
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
16
core "github.com/jbenet/go-ipfs/core"
17
mdag "github.com/jbenet/go-ipfs/merkledag"
18
path "github.com/jbenet/go-ipfs/path"
importer/balanced/balanced_test.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
"os"
11
"testing"
12
13
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
13
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
chunk "github.com/jbenet/go-ipfs/importer/chunk"
15
h "github.com/jbenet/go-ipfs/importer/helpers"
16
merkledag "github.com/jbenet/go-ipfs/merkledag"
importer/importer_test.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"io/ioutil"
7
"testing"
8
9
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
10
chunk "github.com/jbenet/go-ipfs/importer/chunk"
11
dag "github.com/jbenet/go-ipfs/merkledag"
12
mdtest "github.com/jbenet/go-ipfs/merkledag/test"
importer/trickle/trickle_test.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
"os"
11
"testing"
12
13
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
13
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
chunk "github.com/jbenet/go-ipfs/importer/chunk"
15
h "github.com/jbenet/go-ipfs/importer/helpers"
16
merkledag "github.com/jbenet/go-ipfs/merkledag"
merkledag/merkledag.go
+1
-2
@@ -6,8 +6,7 @@ import (
6
"sync"
7
"time"
8
9
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
-
9
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
10
blocks "github.com/jbenet/go-ipfs/blocks"
11
bserv "github.com/jbenet/go-ipfs/blockservice"
12
u "github.com/jbenet/go-ipfs/util"
merkledag/merkledag_test.go
+1
-1
@@ -8,9 +8,9 @@ import (
8
"sync"
9
"testing"
10
11
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
11
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
12
dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
13
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
bstore "github.com/jbenet/go-ipfs/blocks/blockstore"
15
blockservice "github.com/jbenet/go-ipfs/blockservice"
16
bserv "github.com/jbenet/go-ipfs/blockservice"
namesys/dns.go
+1
-1
@@ -3,10 +3,10 @@ package namesys
3
import (
4
"net"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
7
isd "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-is-domain"
8
mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
9
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
10
11
u "github.com/jbenet/go-ipfs/util"
12
)
namesys/interface.go
+1
-1
@@ -4,7 +4,7 @@ package namesys
4
import (
5
"errors"
6
7
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
8
ci "github.com/jbenet/go-ipfs/p2p/crypto"
9
u "github.com/jbenet/go-ipfs/util"
10
)
namesys/namesys.go
+1
-1
@@ -1,7 +1,7 @@
1
package namesys
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
5
ci "github.com/jbenet/go-ipfs/p2p/crypto"
6
routing "github.com/jbenet/go-ipfs/routing"
7
u "github.com/jbenet/go-ipfs/util"
namesys/proquint.go
+1
-1
@@ -3,8 +3,8 @@ package namesys
3
import (
4
"errors"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
proquint "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/bren2010/proquint"
7
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
8
u "github.com/jbenet/go-ipfs/util"
9
)
10
namesys/publisher.go
+1
-1
@@ -6,9 +6,9 @@ import (
6
"fmt"
7
"time"
8
9
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
10
mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
11
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
12
13
pb "github.com/jbenet/go-ipfs/namesys/internal/pb"
14
ci "github.com/jbenet/go-ipfs/p2p/crypto"
namesys/resolve_test.go
+1
-1
@@ -1,9 +1,9 @@
1
package namesys
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
"testing"
5
6
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
mockrouting "github.com/jbenet/go-ipfs/routing/mock"
8
u "github.com/jbenet/go-ipfs/util"
9
testutil "github.com/jbenet/go-ipfs/util/testutil"
namesys/routing.go
+1
-2
@@ -3,10 +3,9 @@ package namesys
3
import (
4
"fmt"
5
6
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
8
-
7
mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
8
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
pb "github.com/jbenet/go-ipfs/namesys/internal/pb"
10
ci "github.com/jbenet/go-ipfs/p2p/crypto"
11
routing "github.com/jbenet/go-ipfs/routing"
notifications/query.go
+1
-1
@@ -3,7 +3,7 @@ package notifications
3
import (
4
"encoding/json"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
peer "github.com/jbenet/go-ipfs/p2p/peer"
8
)
9
p2p/crypto/secio/interface.go
+1
-2
@@ -6,9 +6,8 @@ import (
6
7
ci "github.com/jbenet/go-ipfs/p2p/crypto"
8
9
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
11
-
10
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
11
peer "github.com/jbenet/go-ipfs/p2p/peer"
12
)
13
p2p/crypto/secio/protocol.go
+1
-2
@@ -7,9 +7,8 @@ import (
7
"fmt"
8
"io"
9
10
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
12
-
11
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
12
ci "github.com/jbenet/go-ipfs/p2p/crypto"
13
pb "github.com/jbenet/go-ipfs/p2p/crypto/secio/internal/pb"
14
peer "github.com/jbenet/go-ipfs/p2p/peer"
p2p/crypto/secio/rw.go
+1
-1
@@ -9,10 +9,10 @@ import (
9
10
"crypto/hmac"
11
12
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
12
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
13
msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
14
mpool "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio/mpool"
15
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
16
)
17
18
// ErrMACInvalid signals that a MAC verification failed
p2p/host/basic/basic_host.go
+1
-2
@@ -1,10 +1,9 @@
1
package basichost
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
5
goprocess "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
7
-
6
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
8
9
inet "github.com/jbenet/go-ipfs/p2p/net"
p2p/host/basic/basic_host_test.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
protocol "github.com/jbenet/go-ipfs/p2p/protocol"
10
testutil "github.com/jbenet/go-ipfs/p2p/test/util"
11
12
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
12
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
13
)
14
15
func TestHostSimple(t *testing.T) {
p2p/host/basic/natmgr.go
+1
-1
@@ -3,9 +3,9 @@ package basichost
3
import (
4
"sync"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
7
goprocess "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
10
inat "github.com/jbenet/go-ipfs/p2p/nat"
11
inet "github.com/jbenet/go-ipfs/p2p/net"
p2p/host/host.go
+1
-2
@@ -1,9 +1,8 @@
1
package host
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
6
-
5
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
6
inet "github.com/jbenet/go-ipfs/p2p/net"
7
peer "github.com/jbenet/go-ipfs/p2p/peer"
8
protocol "github.com/jbenet/go-ipfs/p2p/protocol"
p2p/host/routed/routed.go
+1
-2
@@ -4,9 +4,8 @@ import (
4
"fmt"
5
"time"
6
7
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
9
-
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
10
lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
11
p2p/net/conn/conn.go
+1
-2
@@ -6,12 +6,11 @@ import (
6
"net"
7
"time"
8
9
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
10
mpool "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio/mpool"
11
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
12
manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
14
-
13
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
ic "github.com/jbenet/go-ipfs/p2p/crypto"
15
peer "github.com/jbenet/go-ipfs/p2p/peer"
16
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
p2p/net/conn/conn_test.go
+1
-2
@@ -8,8 +8,7 @@ import (
8
"testing"
9
"time"
10
11
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
12
-
11
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
12
travis "github.com/jbenet/go-ipfs/util/testutil/ci/travis"
13
)
14
p2p/net/conn/dial.go
+1
-1
@@ -7,10 +7,10 @@ import (
7
"strings"
8
"syscall"
9
10
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
11
manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
12
reuseport "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-reuseport"
13
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
15
16
addrutil "github.com/jbenet/go-ipfs/p2p/net/swarm/addr"
p2p/net/conn/dial_test.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
11
tu "github.com/jbenet/go-ipfs/util/testutil"
12
13
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
13
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
)
15
16
func echoListen(ctx context.Context, listener Listener) {
p2p/net/conn/listen.go
+1
-1
@@ -5,12 +5,12 @@ import (
5
"io"
6
"net"
7
8
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
9
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
10
manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
11
reuseport "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-reuseport"
12
tec "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-temp-err-catcher"
13
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
15
ic "github.com/jbenet/go-ipfs/p2p/crypto"
16
peer "github.com/jbenet/go-ipfs/p2p/peer"
p2p/net/conn/secure_conn.go
+1
-1
@@ -4,9 +4,9 @@ import (
4
"net"
5
"time"
6
7
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
8
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
9
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
10
11
ic "github.com/jbenet/go-ipfs/p2p/crypto"
12
secio "github.com/jbenet/go-ipfs/p2p/crypto/secio"
p2p/net/conn/secure_conn_test.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
ic "github.com/jbenet/go-ipfs/p2p/crypto"
11
travis "github.com/jbenet/go-ipfs/util/testutil/ci/travis"
12
13
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
13
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
)
15
16
func upgradeToSecureConn(t *testing.T, ctx context.Context, sk ic.PrivKey, c Conn) (Conn, error) {
p2p/net/interface.go
+1
-1
@@ -6,9 +6,9 @@ import (
6
conn "github.com/jbenet/go-ipfs/p2p/net/conn"
7
peer "github.com/jbenet/go-ipfs/p2p/peer"
8
9
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
10
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
11
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
12
)
13
14
// MessageSizeMax is a soft (recommended) maximum for network messages.
p2p/net/mock/mock.go
+1
-1
@@ -3,7 +3,7 @@ package mocknet
3
import (
4
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
)
8
9
var log = eventlog.Logger("mocknet")
p2p/net/mock/mock_net.go
+2
-2
@@ -13,9 +13,9 @@ import (
13
p2putil "github.com/jbenet/go-ipfs/p2p/test/util"
14
testutil "github.com/jbenet/go-ipfs/util/testutil"
15
16
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
16
ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
17
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
18
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
19
)
20
21
// mocknet implements mocknet.Mocknet
@@ -69,7 +69,7 @@ func (mn *mocknet) AddPeer(k ic.PrivKey, a ma.Multiaddr) (host.Host, error) {
69
h := bhost.New(n)
70
log.Debugf("mocknet added listen addr for peer: %s -- %s", n.LocalPeer(), a)
71
72
- mn.cg.AddChildGroup(n.cg)
72
+ mn.cg.AddChild(n.cg)
73
74
mn.Lock()
75
mn.nets[n.peer] = n
p2p/net/mock/mock_notif_test.go
+1
-2
@@ -4,9 +4,8 @@ import (
4
"testing"
5
"time"
6
7
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
9
-
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
inet "github.com/jbenet/go-ipfs/p2p/net"
10
)
11
p2p/net/mock/mock_peernet.go
+1
-1
@@ -9,9 +9,9 @@ import (
9
inet "github.com/jbenet/go-ipfs/p2p/net"
10
peer "github.com/jbenet/go-ipfs/p2p/peer"
11
12
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
12
ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
13
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
14
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
15
)
16
17
// peernet implements inet.Network
p2p/net/mock/mock_test.go
+1
-1
@@ -12,7 +12,7 @@ import (
12
protocol "github.com/jbenet/go-ipfs/p2p/protocol"
13
testutil "github.com/jbenet/go-ipfs/util/testutil"
14
15
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
15
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
16
)
17
18
func randPeer(t *testing.T) peer.ID {
p2p/net/swarm/addr/addr.go
+1
-1
@@ -5,9 +5,9 @@ import (
5
6
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
7
8
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
9
manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
10
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
11
)
12
13
var log = eventlog.Logger("p2p/net/swarm/addr")
p2p/net/swarm/dial_test.go
+1
-1
@@ -14,9 +14,9 @@ import (
14
jenkins "github.com/jbenet/go-ipfs/util/testutil/ci/jenkins"
15
travis "github.com/jbenet/go-ipfs/util/testutil/ci/travis"
16
17
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
17
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
18
manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
19
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
20
)
21
22
func acceptAndHang(l net.Listener) {
p2p/net/swarm/peers_test.go
+1
-1
@@ -5,8 +5,8 @@ import (
5
6
peer "github.com/jbenet/go-ipfs/p2p/peer"
7
8
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
9
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
10
)
11
12
func TestPeers(t *testing.T) {
p2p/net/swarm/simul_test.go
+1
-1
@@ -8,8 +8,8 @@ import (
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
9
ci "github.com/jbenet/go-ipfs/util/testutil/ci"
10
11
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
11
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
12
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
13
)
14
15
func TestSimultOpen(t *testing.T) {
p2p/net/swarm/swarm.go
+1
-1
@@ -12,11 +12,11 @@ import (
12
peer "github.com/jbenet/go-ipfs/p2p/peer"
13
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
14
15
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
15
ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
16
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
17
ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
18
psy "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream/transport/yamux"
19
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
20
)
21
22
var log = eventlog.Logger("swarm2")
p2p/net/swarm/swarm_addr_test.go
+1
-1
@@ -7,8 +7,8 @@ import (
7
peer "github.com/jbenet/go-ipfs/p2p/peer"
8
testutil "github.com/jbenet/go-ipfs/util/testutil"
9
10
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
11
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
12
)
13
14
func TestFilterAddrs(t *testing.T) {
p2p/net/swarm/swarm_conn.go
+1
-1
@@ -8,9 +8,9 @@ import (
8
conn "github.com/jbenet/go-ipfs/p2p/net/conn"
9
peer "github.com/jbenet/go-ipfs/p2p/peer"
10
11
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
11
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
12
ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
13
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
)
15
16
// a Conn is a simple wrapper around a ps.Conn that also exposes
p2p/net/swarm/swarm_dial.go
+1
-1
@@ -13,11 +13,11 @@ import (
13
peer "github.com/jbenet/go-ipfs/p2p/peer"
14
lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
15
16
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
16
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
17
manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
18
process "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
19
ratelimit "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/ratelimit"
20
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
21
)
22
23
// Diagram of dial sync:
p2p/net/swarm/swarm_listen.go
+1
-1
@@ -8,9 +8,9 @@ import (
8
addrutil "github.com/jbenet/go-ipfs/p2p/net/swarm/addr"
9
lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
10
11
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
11
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
12
ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
13
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
multierr "github.com/jbenet/go-ipfs/thirdparty/multierr"
15
)
16
p2p/net/swarm/swarm_net.go
+1
-1
@@ -7,9 +7,9 @@ import (
7
8
inet "github.com/jbenet/go-ipfs/p2p/net"
9
10
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
11
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
12
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
13
)
14
15
// Network implements the inet.Network interface.
p2p/net/swarm/swarm_net_test.go
+1
-2
@@ -5,8 +5,7 @@ import (
5
"testing"
6
"time"
7
8
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
-
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
inet "github.com/jbenet/go-ipfs/p2p/net"
10
testutil "github.com/jbenet/go-ipfs/p2p/test/util"
11
)
p2p/net/swarm/swarm_notif_test.go
+1
-1
@@ -4,8 +4,8 @@ import (
4
"testing"
5
"time"
6
7
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
10
inet "github.com/jbenet/go-ipfs/p2p/net"
11
)
p2p/net/swarm/swarm_test.go
+1
-1
@@ -12,8 +12,8 @@ import (
12
errors "github.com/jbenet/go-ipfs/util/debugerror"
13
testutil "github.com/jbenet/go-ipfs/util/testutil"
14
15
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
15
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
16
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
17
)
18
19
func EchoStreamHandler(stream inet.Stream) {
p2p/peer/queue/queue_test.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
peer "github.com/jbenet/go-ipfs/p2p/peer"
10
u "github.com/jbenet/go-ipfs/util"
11
12
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
12
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
13
)
14
15
func TestQueue(t *testing.T) {
p2p/peer/queue/sync.go
+1
-2
@@ -1,8 +1,7 @@
1
package queue
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5
-
4
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
5
peer "github.com/jbenet/go-ipfs/p2p/peer"
6
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
7
)
p2p/protocol/identify/id.go
+1
-1
@@ -4,10 +4,10 @@ import (
4
"strings"
5
"sync"
6
7
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
8
semver "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
9
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
10
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
11
12
host "github.com/jbenet/go-ipfs/p2p/host"
13
inet "github.com/jbenet/go-ipfs/p2p/net"
p2p/protocol/identify/id_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
identify "github.com/jbenet/go-ipfs/p2p/protocol/identify"
10
testutil "github.com/jbenet/go-ipfs/p2p/test/util"
11
12
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
12
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
13
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
)
15
16
func subtestIDService(t *testing.T, postDialWait time.Duration) {
p2p/protocol/mux.go
+1
-2
@@ -5,8 +5,7 @@ import (
5
"io"
6
"sync"
7
8
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
-
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
inet "github.com/jbenet/go-ipfs/p2p/net"
10
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
11
lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
p2p/protocol/relay/relay_test.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
testutil "github.com/jbenet/go-ipfs/p2p/test/util"
11
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
12
13
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
13
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
)
15
16
var log = eventlog.Logger("relay_test")
p2p/test/backpressure/backpressure_test.go
+1
-1
@@ -14,7 +14,7 @@ import (
14
testutil "github.com/jbenet/go-ipfs/p2p/test/util"
15
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
16
17
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
17
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
18
)
19
20
var log = eventlog.Logger("backpressure")
p2p/test/reconnects/reconnect_test.go
+1
-1
@@ -15,8 +15,8 @@ import (
15
testutil "github.com/jbenet/go-ipfs/p2p/test/util"
16
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
17
18
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
18
ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
19
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
20
)
21
22
func init() {
p2p/test/util/util.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
peer "github.com/jbenet/go-ipfs/p2p/peer"
10
tu "github.com/jbenet/go-ipfs/util/testutil"
11
12
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
12
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
13
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
)
15
16
func GenSwarmNetwork(t *testing.T, ctx context.Context) *swarm.Network {
pin/pin.go
+1
-1
@@ -9,9 +9,9 @@ import (
9
"sync"
10
"time"
11
12
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
12
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
13
nsds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace"
14
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
15
"github.com/jbenet/go-ipfs/blocks/set"
16
mdag "github.com/jbenet/go-ipfs/merkledag"
17
"github.com/jbenet/go-ipfs/util"
routing/dht/dht.go
+2
-2
@@ -21,10 +21,10 @@ import (
21
"github.com/jbenet/go-ipfs/thirdparty/eventlog"
22
u "github.com/jbenet/go-ipfs/util"
23
24
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
24
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
25
ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
26
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
27
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
28
)
29
30
var log = eventlog.Logger("dht")
@@ -78,7 +78,7 @@ func NewDHT(ctx context.Context, h host.Host, dstore ds.ThreadSafeDatastore) *Ip
78
79
h.SetStreamHandler(ProtocolDHT, dht.handleNewStream)
80
dht.providers = NewProviderManager(dht.Context(), dht.self)
81
- dht.AddChildGroup(dht.providers)
81
+ dht.AddChild(dht.providers)
82
83
dht.routingTable = kb.NewRoutingTable(20, kb.ConvertPeerID(dht.self), time.Minute, dht.peerstore)
84
dht.birth = time.Now()
routing/dht/dht_bootstrap.go
+1
-1
@@ -12,9 +12,9 @@ import (
12
routing "github.com/jbenet/go-ipfs/routing"
13
u "github.com/jbenet/go-ipfs/util"
14
15
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
15
goprocess "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
16
periodicproc "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/periodic"
17
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
18
)
19
20
// BootstrapConfig specifies parameters used bootstrapping the DHT.
routing/dht/dht_net.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
10
ctxutil "github.com/jbenet/go-ipfs/util/ctx"
11
12
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
12
ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
13
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
)
15
16
// handleNewStream implements the inet.StreamHandler
routing/dht/dht_test.go
+1
-2
@@ -9,11 +9,10 @@ import (
9
"testing"
10
"time"
11
12
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
13
-
12
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
13
dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
14
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
15
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
16
17
peer "github.com/jbenet/go-ipfs/p2p/peer"
18
netutil "github.com/jbenet/go-ipfs/p2p/test/util"
routing/dht/ext_test.go
+2
-3
@@ -5,6 +5,7 @@ import (
5
"io/ioutil"
6
"math/rand"
7
"testing"
8
+ "time"
9
10
inet "github.com/jbenet/go-ipfs/p2p/net"
11
mocknet "github.com/jbenet/go-ipfs/p2p/net/mock"
@@ -14,12 +15,10 @@ import (
15
record "github.com/jbenet/go-ipfs/routing/record"
16
u "github.com/jbenet/go-ipfs/util"
17
17
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
18
ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
19
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
20
dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
21
-
22
- "time"
21
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
22
)
23
24
func TestGetFailures(t *testing.T) {
routing/dht/handlers.go
+1
-1
@@ -4,9 +4,9 @@ import (
4
"errors"
5
"fmt"
6
7
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
8
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
9
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
10
peer "github.com/jbenet/go-ipfs/p2p/peer"
11
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
12
u "github.com/jbenet/go-ipfs/util"
routing/dht/lookup.go
+1
-2
@@ -1,8 +1,7 @@
1
package dht
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5
-
4
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
5
notif "github.com/jbenet/go-ipfs/notifications"
6
peer "github.com/jbenet/go-ipfs/p2p/peer"
7
kb "github.com/jbenet/go-ipfs/routing/kbucket"
routing/dht/providers.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
peer "github.com/jbenet/go-ipfs/p2p/peer"
8
u "github.com/jbenet/go-ipfs/util"
9
10
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
11
)
12
13
type providerInfo struct {
routing/dht/providers_test.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
peer "github.com/jbenet/go-ipfs/p2p/peer"
7
u "github.com/jbenet/go-ipfs/util"
8
9
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
10
)
11
12
func TestProviderManager(t *testing.T) {
routing/dht/query.go
+1
-1
@@ -12,8 +12,8 @@ import (
12
pset "github.com/jbenet/go-ipfs/util/peerset"
13
todoctr "github.com/jbenet/go-ipfs/util/todocounter"
14
15
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
15
ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
16
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
17
)
18
19
var maxQueryConcurrency = AlphaValue
routing/dht/records.go
+1
-2
@@ -3,8 +3,7 @@ package dht
3
import (
4
"fmt"
5
6
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
-
6
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
ci "github.com/jbenet/go-ipfs/p2p/crypto"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
9
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
routing/dht/routing.go
+1
-2
@@ -5,8 +5,7 @@ import (
5
"sync"
6
"time"
7
8
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
-
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
notif "github.com/jbenet/go-ipfs/notifications"
10
inet "github.com/jbenet/go-ipfs/p2p/net"
11
peer "github.com/jbenet/go-ipfs/p2p/peer"
routing/mock/centralized_client.go
+1
-1
@@ -4,9 +4,9 @@ import (
4
"errors"
5
"time"
6
7
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
8
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
9
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
10
peer "github.com/jbenet/go-ipfs/p2p/peer"
11
routing "github.com/jbenet/go-ipfs/routing"
12
u "github.com/jbenet/go-ipfs/util"
routing/mock/centralized_server.go
+1
-1
@@ -5,8 +5,8 @@ import (
5
"sync"
6
"time"
7
8
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
9
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
10
peer "github.com/jbenet/go-ipfs/p2p/peer"
11
u "github.com/jbenet/go-ipfs/util"
12
"github.com/jbenet/go-ipfs/util/testutil"
routing/mock/centralized_test.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"testing"
5
"time"
6
7
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
9
delay "github.com/jbenet/go-ipfs/thirdparty/delay"
10
u "github.com/jbenet/go-ipfs/util"
routing/mock/dht.go
+1
-1
@@ -1,9 +1,9 @@
1
package mockrouting
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
5
sync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
6
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
mocknet "github.com/jbenet/go-ipfs/p2p/net/mock"
8
dht "github.com/jbenet/go-ipfs/routing/dht"
9
"github.com/jbenet/go-ipfs/util/testutil"
routing/mock/interface.go
+1
-1
@@ -5,8 +5,8 @@
5
package mockrouting
6
7
import (
8
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
9
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
10
peer "github.com/jbenet/go-ipfs/p2p/peer"
11
routing "github.com/jbenet/go-ipfs/routing"
12
delay "github.com/jbenet/go-ipfs/thirdparty/delay"
routing/offline/offline.go
+1
-1
@@ -4,9 +4,9 @@ import (
4
"errors"
5
"time"
6
7
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
8
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
9
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
10
ci "github.com/jbenet/go-ipfs/p2p/crypto"
11
"github.com/jbenet/go-ipfs/p2p/peer"
12
routing "github.com/jbenet/go-ipfs/routing"
routing/routing.go
+1
-2
@@ -5,8 +5,7 @@ import (
5
"errors"
6
"time"
7
8
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
-
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
peer "github.com/jbenet/go-ipfs/p2p/peer"
10
u "github.com/jbenet/go-ipfs/util"
11
)
routing/supernode/client.go
+1
-1
@@ -4,8 +4,8 @@ import (
4
"bytes"
5
"time"
6
7
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
"github.com/jbenet/go-ipfs/p2p/host"
10
peer "github.com/jbenet/go-ipfs/p2p/peer"
11
routing "github.com/jbenet/go-ipfs/routing"
routing/supernode/proxy/loopback.go
+1
-2
@@ -1,8 +1,8 @@
1
package proxy
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
5
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
6
inet "github.com/jbenet/go-ipfs/p2p/net"
7
peer "github.com/jbenet/go-ipfs/p2p/peer"
8
dhtpb "github.com/jbenet/go-ipfs/routing/dht/pb"
@@ -24,7 +24,6 @@ func (_ *Loopback) Bootstrap(ctx context.Context) error {
24
return nil
25
}
26
27
-
27
// SendMessage intercepts local requests, forwarding them to a local handler
28
func (lb *Loopback) SendMessage(ctx context.Context, m *dhtpb.Message) error {
29
response := lb.Handler.HandleRequest(ctx, lb.Local, m)
routing/supernode/proxy/standard.go
+1
-1
@@ -1,8 +1,8 @@
1
package proxy
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
ggio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/io"
5
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
6
host "github.com/jbenet/go-ipfs/p2p/host"
7
inet "github.com/jbenet/go-ipfs/p2p/net"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
routing/supernode/server.go
+1
-1
@@ -3,9 +3,9 @@ package supernode
3
import (
4
"fmt"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
7
datastore "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
peer "github.com/jbenet/go-ipfs/p2p/peer"
10
dhtpb "github.com/jbenet/go-ipfs/routing/dht/pb"
11
record "github.com/jbenet/go-ipfs/routing/record"
server/http/ipfs.go
+1
-1
@@ -3,7 +3,7 @@ package http
3
import (
4
"io"
5
6
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
core "github.com/jbenet/go-ipfs/core"
8
"github.com/jbenet/go-ipfs/importer"
9
chunk "github.com/jbenet/go-ipfs/importer/chunk"
test/integration/addcat_test.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"testing"
10
"time"
11
12
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
12
random "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random"
13
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
"github.com/jbenet/go-ipfs/core"
15
coreunix "github.com/jbenet/go-ipfs/core/coreunix"
16
mocknet "github.com/jbenet/go-ipfs/p2p/net/mock"
test/integration/bitswap_wo_routing_test.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"testing"
6
"time"
7
8
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
9
"github.com/jbenet/go-ipfs/blocks"
10
"github.com/jbenet/go-ipfs/core"
11
mocknet "github.com/jbenet/go-ipfs/p2p/net/mock"
test/integration/core.go
+1
-1
@@ -1,9 +1,9 @@
1
package integrationtest
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
5
syncds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
6
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
8
core "github.com/jbenet/go-ipfs/core"
9
bitswap "github.com/jbenet/go-ipfs/exchange/bitswap"
test/integration/grandcentral_test.go
+1
-1
@@ -7,9 +7,9 @@ import (
7
"math"
8
"testing"
9
10
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
11
syncds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
12
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
13
core "github.com/jbenet/go-ipfs/core"
14
"github.com/jbenet/go-ipfs/core/corerouting"
15
"github.com/jbenet/go-ipfs/core/coreunix"
test/integration/three_legged_cat_test.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"testing"
8
"time"
9
10
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
11
core "github.com/jbenet/go-ipfs/core"
12
coreunix "github.com/jbenet/go-ipfs/core/coreunix"
13
mocknet "github.com/jbenet/go-ipfs/p2p/net/mock"
test/supernode_client/main.go
+1
-1
@@ -12,9 +12,9 @@ import (
12
gopath "path"
13
"time"
14
15
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
15
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
16
random "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random"
17
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
18
"github.com/jbenet/go-ipfs/util/ipfsaddr"
19
20
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
thirdparty/eventlog/context.go
+1
-1
@@ -3,7 +3,7 @@ package eventlog
3
import (
4
"errors"
5
6
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
)
8
9
type key int
thirdparty/eventlog/context_test.go
+1
-1
@@ -3,7 +3,7 @@ package eventlog
3
import (
4
"testing"
5
6
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
)
8
9
func TestContextContainsMetadata(t *testing.T) {
thirdparty/eventlog/example_test.go
+1
-1
@@ -1,6 +1,6 @@
1
package eventlog
2
3
-import "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
3
+import "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
4
5
func ExampleEventLogger() {
6
{
thirdparty/eventlog/log.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"fmt"
5
"time"
6
7
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
8
"github.com/jbenet/go-ipfs/util" // TODO remove IPFS dependency
9
)
10
thirdparty/waitable/waitable.go
+1
-1
@@ -1,7 +1,7 @@
1
package waitable
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
5
)
6
7
type Waitable interface {
unixfs/io/dagmodifier_test.go
+1
-1
@@ -6,7 +6,6 @@ import (
6
"io/ioutil"
7
"testing"
8
9
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
10
"github.com/jbenet/go-ipfs/blocks/blockstore"
11
bs "github.com/jbenet/go-ipfs/blockservice"
@@ -19,6 +18,7 @@ import (
18
19
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
20
logging "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-logging"
21
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
22
)
23
24
func getMockDagServ(t *testing.T) mdag.DAGService {
unixfs/io/dagreader.go
+1
-2
@@ -6,9 +6,8 @@ import (
6
"io"
7
"os"
8
9
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
-
9
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
10
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
11
mdag "github.com/jbenet/go-ipfs/merkledag"
12
ft "github.com/jbenet/go-ipfs/unixfs"
13
ftpb "github.com/jbenet/go-ipfs/unixfs/pb"
unixfs/tar/reader.go
+1
-1
@@ -4,11 +4,11 @@ import (
4
"archive/tar"
5
"bytes"
6
"compress/gzip"
7
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
"io"
8
gopath "path"
9
"time"
10
11
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
12
mdag "github.com/jbenet/go-ipfs/merkledag"
13
path "github.com/jbenet/go-ipfs/path"
14
uio "github.com/jbenet/go-ipfs/unixfs/io"
util/context.go
+1
-1
@@ -1,7 +1,7 @@
1
package util
2
3
import (
4
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
4
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
5
)
6
7
// privateChanType protects the channel. Since this is a package-private type,
util/context_test.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"errors"
5
"testing"
6
7
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
8
)
9
10
func TestLogErrorDoesNotBlockWhenCtxIsNotSetUpForLogging(t *testing.T) {
util/ctx/ctxio.go
+1
-1
@@ -3,7 +3,7 @@ package ctxutil
3
import (
4
"io"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
)
8
9
type ioret struct {
util/ctx/ctxio_test.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"testing"
7
"time"
8
9
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
10
)
11
12
func TestReader(t *testing.T) {
util/ctx/fracctx.go
+1
-1
@@ -3,7 +3,7 @@ package ctxutil
3
import (
4
"time"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
)
8
9
func WithDeadlineFraction(ctx context.Context, fraction float64) (context.Context, context.CancelFunc) {
util/ctx/fracctx_test.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
7
travis "github.com/jbenet/go-ipfs/util/testutil/ci/travis"
8
9
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
10
)
11
12
// this test is on the context tool itself, not our stuff. it's for sanity on ours.
util/ctxcloser/closer.go
+1
-1
@@ -3,7 +3,7 @@ package ctxcloser
3
import (
4
"sync"
5
6
- context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
6
+ context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
7
)
8
9
// CloseFunc is a function used to close a ContextCloser
util/do.go
+1
-1
@@ -1,6 +1,6 @@
1
package util
2
3
-import "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
3
+import "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
4
5
func ContextDo(ctx context.Context, f func() error) error {
6
util/do_test.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"errors"
5
"testing"
6
7
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
8
)
9
10
func TestDoReturnsContextErr(t *testing.T) {