Merge pull request #4433 from ipfs/fix/coreunix-add/ctx

whyrusleeping · web-flow · commit abe8ced8c781 · 2017-12-01T17:26:21.000+01:00
AddWithContext wraps custom context
diff --git a/core/coreunix/add.go b/core/coreunix/add.go
@@ -307,7 +307,7 @@ func Add(n *core.IpfsNode, r io.Reader) (string, error) {
 func AddWithContext(ctx context.Context, n *core.IpfsNode, r io.Reader) (string, error) {
 	defer n.Blockstore.PinLock().Unlock()
 
-	fileAdder, err := NewAdder(n.Context(), n.Pinning, n.Blockstore, n.DAG)
+	fileAdder, err := NewAdder(ctx, n.Pinning, n.Blockstore, n.DAG)
 	if err != nil {
 		return "", err
 	}

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ func Add(n *core.IpfsNode, r io.Reader) (string, error) {`
`307`	`307`	`func AddWithContext(ctx context.Context, n *core.IpfsNode, r io.Reader) (string, error) {`
`308`	`308`	`defer n.Blockstore.PinLock().Unlock()`
`309`	`309`
`310`		`- fileAdder, err := NewAdder(n.Context(), n.Pinning, n.Blockstore, n.DAG)`
	`310`	`+ fileAdder, err := NewAdder(ctx, n.Pinning, n.Blockstore, n.DAG)`
`311`	`311`	`if err != nil {`
`312`	`312`	`return "", err`
`313`	`313`	`}`