Bundle services needed by the adder into DataServices.

License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>

assets/assets.go

@@ -47,7 +47,7 @@ func addAssetList(nd *core.IpfsNode, l []string) (*key.Key, error) {
 			return nil, fmt.Errorf("assets: could load Asset '%s': %s", p, err)
 		}
 
-		s, err := coreunix.Add(nd, bytes.NewBuffer(d))
+		s, err := coreunix.Add(nd.DataServices(nil), bytes.NewBuffer(d))
 		if err != nil {
 			return nil, fmt.Errorf("assets: could not Add '%s': %s", p, err)
 		}

cmd/ipfswatch/main.go

@@ -130,7 +130,7 @@ func run(ipfsPath, watchPath string) error {
 						log.Println(err)
 					}
 					defer file.Close()
-					k, err := coreunix.Add(node, file)
+					k, err := coreunix.Add(node.DataServices(nil), file)
 					if err != nil {
 						log.Println(err)
 					}

core/commands/add.go

@@ -160,7 +160,7 @@ You can now refer to the added file in a gateway, like so:
 		outChan := make(chan interface{}, 8)
 		res.SetOutput((<-chan interface{})(outChan))
 
-		fileAdder, err := coreunix.NewAdder(req.Context(), n, outChan)
+		fileAdder, err := coreunix.NewAdder(n.DataServices(req.Context()), outChan)
 		if err != nil {
 			res.SetError(err, cmds.ErrNormal)
 			return

core/commands/filestore.go

@@ -163,7 +163,6 @@ func (w *chanWriterByFile) Read(p []byte) (int, error) {
 	return sz, nil
 }
 
-
 var verifyFileStore = &cmds.Command{
 	Helptext: cmds.HelpText{
 		Tagline: "Verify objects in filestore",

core/core.go

@@ -622,3 +622,17 @@ type DiscoveryOption func(p2phost.Host) (discovery.Service, error)
 
 var DHTOption RoutingOption = constructDHTRouting
 var NilRouterOption RoutingOption = nilrouting.ConstructNilRouting
+
+func (n *IpfsNode) DataServices(ctx context.Context) *DataServices {
+	if ctx == nil {
+		ctx = n.Context()
+	}
+	return &DataServices{ctx, n.Pinning, n.Blockstore, n.DAG}
+}
+
+type DataServices struct {
+	Context    context.Context
+	Pinning    pin.Pinner
+	Blockstore bstore.GCBlockstore
+	DAG        merkledag.DAGService
+}

core/corehttp/gateway_test.go

@@ -112,7 +112,7 @@ func TestGatewayGet(t *testing.T) {
 	ts, n := newTestServerAndNode(t, ns)
 	defer ts.Close()
 
-	k, err := coreunix.Add(n, strings.NewReader("fnord"))
+	k, err := coreunix.Add(n.DataServices(nil), strings.NewReader("fnord"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -168,11 +168,11 @@ func TestIPNSHostnameRedirect(t *testing.T) {
 	defer ts.Close()
 
 	// create /ipns/example.net/foo/index.html
-	_, dagn1, err := coreunix.AddWrapped(n, strings.NewReader("_"), "_")
+	_, dagn1, err := coreunix.AddWrapped(n.DataServices(nil), strings.NewReader("_"), "_")
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, dagn2, err := coreunix.AddWrapped(n, strings.NewReader("_"), "index.html")
+	_, dagn2, err := coreunix.AddWrapped(n.DataServices(nil), strings.NewReader("_"), "index.html")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -253,15 +253,15 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
 	defer ts.Close()
 
 	// create /ipns/example.net/foo/
-	_, dagn1, err := coreunix.AddWrapped(n, strings.NewReader("1"), "file.txt")
+	_, dagn1, err := coreunix.AddWrapped(n.DataServices(nil), strings.NewReader("1"), "file.txt")
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, dagn2, err := coreunix.AddWrapped(n, strings.NewReader("2"), "file.txt")
+	_, dagn2, err := coreunix.AddWrapped(n.DataServices(nil), strings.NewReader("2"), "file.txt")
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, dagn3, err := coreunix.AddWrapped(n, strings.NewReader("3"), "file.txt")
+	_, dagn3, err := coreunix.AddWrapped(n.DataServices(nil), strings.NewReader("3"), "file.txt")
 	if err != nil {
 		t.Fatal(err)
 	}

core/coreunix/add.go

@@ -2,11 +2,11 @@ package coreunix
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
-	"errors"
 	gopath "path"
 
 	ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
@@ -68,15 +68,15 @@ type AddedObject struct {
 	Bytes int64  `json:",omitempty"`
 }
 
-func NewAdder(ctx context.Context, n *core.IpfsNode, out chan interface{}) (*Adder, error) {
-	mr, err := mfs.NewRoot(ctx, n.DAG, newDirNode(), nil)
+func NewAdder(n *core.DataServices, out chan interface{}) (*Adder, error) {
+	mr, err := mfs.NewRoot(n.Context, n.DAG, newDirNode(), nil)
 	if err != nil {
 		return nil, err
 	}
 
 	return &Adder{
 		mr:       mr,
-		ctx:      ctx,
+		ctx:      n.Context,
 		node:     n,
 		out:      out,
 		Progress: false,
@@ -91,7 +91,7 @@ func NewAdder(ctx context.Context, n *core.IpfsNode, out chan interface{}) (*Add
 // Internal structure for holding the switches passed to the `add` call
 type Adder struct {
 	ctx      context.Context
-	node     *core.IpfsNode
+	node     *core.DataServices
 	out      chan interface{}
 	Progress bool
 	Hidden   bool
@@ -259,10 +259,10 @@ func (adder *Adder) outputDirs(path string, fs mfs.FSNode) error {
 
 // Add builds a merkledag from the a reader, pinning all objects to the local
 // datastore. Returns a key representing the root node.
-func Add(n *core.IpfsNode, r io.Reader) (string, error) {
+func Add(n *core.DataServices, r io.Reader) (string, error) {
 	defer n.Blockstore.PinLock().Unlock()
 
-	fileAdder, err := NewAdder(n.Context(), n, nil)
+	fileAdder, err := NewAdder(n, nil)
 	if err != nil {
 		return "", err
 	}
@@ -282,7 +282,7 @@ func Add(n *core.IpfsNode, r io.Reader) (string, error) {
 }
 
 // AddR recursively adds files in |path|.
-func AddR(n *core.IpfsNode, root string) (key string, err error) {
+func AddR(n *core.DataServices, root string) (key string, err error) {
 	n.Blockstore.PinLock().Unlock()
 
 	stat, err := os.Lstat(root)
@@ -296,7 +296,7 @@ func AddR(n *core.IpfsNode, root string) (key string, err error) {
 	}
 	defer f.Close()
 
-	fileAdder, err := NewAdder(n.Context(), n, nil)
+	fileAdder, err := NewAdder(n, nil)
 	if err != nil {
 		return "", err
 	}
@@ -323,9 +323,9 @@ func AddR(n *core.IpfsNode, root string) (key string, err error) {
 // to preserve the filename.
 // Returns the path of the added file ("<dir hash>/filename"), the DAG node of
 // the directory, and and error if any.
-func AddWrapped(n *core.IpfsNode, r io.Reader, filename string) (string, *dag.Node, error) {
+func AddWrapped(n *core.DataServices, r io.Reader, filename string) (string, *dag.Node, error) {
 	file := files.NewReaderFile(filename, filename, ioutil.NopCloser(r), nil)
-	fileAdder, err := NewAdder(n.Context(), n, nil)
+	fileAdder, err := NewAdder(n, nil)
 	if err != nil {
 		return "", nil, err
 	}

core/coreunix/add_test.go

@@ -31,7 +31,7 @@ func TestAddRecursive(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if k, err := AddR(node, "test_data"); err != nil {
+	if k, err := AddR(node.DataServices(nil), "test_data"); err != nil {
 		t.Fatal(err)
 	} else if k != "QmWCCga8AbTyfAQ7pTnGT6JgmRMAB3Qp8ZmTEFi5q5o8jC" {
 		t.Fatal("keys do not match: ", k)
@@ -54,7 +54,7 @@ func TestAddGCLive(t *testing.T) {
 
 	errs := make(chan error)
 	out := make(chan interface{})
-	adder, err := NewAdder(context.Background(), node, out)
+	adder, err := NewAdder(node.DataServices(context.Background()), out)
 	if err != nil {
 		t.Fatal(err)
 	}

test/integration/addcat_test.go

@@ -133,7 +133,7 @@ func DirectAddCat(data []byte, conf testutil.LatencyConfig) error {
 		return err
 	}
 
-	added, err := coreunix.Add(adder, bytes.NewReader(data))
+	added, err := coreunix.Add(adder.DataServices(nil), bytes.NewReader(data))
 	if err != nil {
 		return err
 	}

test/integration/bench_cat_test.go

@@ -78,7 +78,7 @@ func benchCat(b *testing.B, data []byte, conf testutil.LatencyConfig) error {
 		return err
 	}
 
-	added, err := coreunix.Add(adder, bytes.NewReader(data))
+	added, err := coreunix.Add(adder.DataServices(nil), bytes.NewReader(data))
 	if err != nil {
 		return err
 	}

test/integration/grandcentral_test.go

@@ -57,7 +57,7 @@ func RunSupernodeBootstrappedAddCat(data []byte, conf testutil.LatencyConfig) er
 	log.Info("adder is", adder.Identity)
 	log.Info("catter is", catter.Identity)
 
-	keyAdded, err := coreunix.Add(adder, bytes.NewReader(data))
+	keyAdded, err := coreunix.Add(adder.DataServices(nil), bytes.NewReader(data))
 	if err != nil {
 		return err
 	}

test/integration/three_legged_cat_test.go

@@ -112,7 +112,7 @@ func RunThreeLeggedCat(data []byte, conf testutil.LatencyConfig) error {
 		return err
 	}
 
-	added, err := coreunix.Add(adder, bytes.NewReader(data))
+	added, err := coreunix.Add(adder.DataServices(nil), bytes.NewReader(data))
 	if err != nil {
 		return err
 	}

test/supernode_client/main.go

@@ -153,7 +153,7 @@ func runFileAddingWorker(n *core.IpfsNode) error {
 					errs <- err
 				}
 			}()
-			k, err := coreunix.Add(n, piper)
+			k, err := coreunix.Add(n.DataServices(nil), piper)
 			if err != nil {
 				errs <- err
 			}
@@ -201,7 +201,7 @@ func runFileCattingWorker(ctx context.Context, n *core.IpfsNode) error {
 				errs <- err
 			}
 			// add to a dummy node to discover the key
-			k, err := coreunix.Add(dummy, bytes.NewReader(buf.Bytes()))
+			k, err := coreunix.Add(dummy.DataServices(nil), bytes.NewReader(buf.Bytes()))
 			if err != nil {
 				errs <- err
 			}