merkledag: Rename Get() methods to GetPB()

License: MIT
Signed-off-by: Mildred Ki'Lya <mildred-pub.git@mildred.fr>

core/commands/object/patch.go

@@ -291,7 +291,7 @@ a file containing 'bar', and returns the hash of the new object.
 
 		e := dagutils.NewDagEditor(root, nd.DAG)
 
-		childnd, err := nd.DAG.Get(req.Context(), childk)
+		childnd, err := nd.DAG.GetPB(req.Context(), childk)
 		if err != nil {
 			res.SetError(err, cmds.ErrNormal)
 			return

core/commands/pin.go

@@ -324,7 +324,7 @@ func pinLsAll(typeStr string, ctx context.Context, n *core.IpfsNode) (map[string
 	if typeStr == "indirect" || typeStr == "all" {
 		ks := key.NewKeySet()
 		for _, k := range n.Pinning.RecursiveKeys() {
-			nd, err := n.DAG.Get(ctx, k)
+			nd, err := n.DAG.GetPB(ctx, k)
 			if err != nil {
 				return nil, err
 			}

core/commands/refs.go

@@ -243,7 +243,7 @@ func (rw *RefWriter) writeRefsRecursive(n *dag.Node) (int, error) {
 			return count, err
 		}
 
-		nd, err := ng.Get(rw.Ctx)
+		nd, err := ng.GetPB(rw.Ctx)
 		if err != nil {
 			return count, err
 		}

core/core.go

@@ -489,7 +489,7 @@ func (n *IpfsNode) loadFilesRoot() error {
 		}
 	case err == nil:
 		k := key.Key(val.([]byte))
-		nd, err = n.DAG.Get(n.Context(), k)
+		nd, err = n.DAG.GetPB(n.Context(), k)
 		if err != nil {
 			return fmt.Errorf("error loading filesroot from DAG: %s", err)
 		}

core/corehttp/gateway_handler.go

@@ -360,7 +360,7 @@ func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
 		// ev.Node < node where resolve failed
 		// ev.Name < new link
 		// but we need to patch from the root
-		rnode, err := i.node.DAG.Get(ctx, key.B58KeyDecode(rsegs[1]))
+		rnode, err := i.node.DAG.GetPB(ctx, key.B58KeyDecode(rsegs[1]))
 		if err != nil {
 			webError(w, "putHandler: Could not create DAG from request", err, http.StatusInternalServerError)
 			return
@@ -433,7 +433,7 @@ func (i *gatewayHandler) deleteHandler(w http.ResponseWriter, r *http.Request) {
 
 	tctx, cancel := context.WithTimeout(ctx, time.Minute)
 	defer cancel()
-	rootnd, err := i.node.Resolver.DAG.Get(tctx, key.Key(h))
+	rootnd, err := i.node.Resolver.DAG.GetPB(tctx, key.Key(h))
 	if err != nil {
 		webError(w, "Could not resolve root object", err, http.StatusBadRequest)
 		return

core/coreunix/add_test.go

@@ -149,7 +149,7 @@ func TestAddGCLive(t *testing.T) {
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
 	defer cancel()
-	root, err := node.DAG.Get(ctx, last)
+	root, err := node.DAG.GetPB(ctx, last)
 	if err != nil {
 		t.Fatal(err)
 	}

core/coreunix/metadata.go

@@ -10,7 +10,7 @@ import (
 func AddMetadataTo(n *core.IpfsNode, skey string, m *ft.Metadata) (string, error) {
 	ukey := key.B58KeyDecode(skey)
 
-	nd, err := n.DAG.Get(n.Context(), ukey)
+	nd, err := n.DAG.GetPB(n.Context(), ukey)
 	if err != nil {
 		return "", err
 	}
@@ -37,7 +37,7 @@ func AddMetadataTo(n *core.IpfsNode, skey string, m *ft.Metadata) (string, error
 func Metadata(n *core.IpfsNode, skey string) (*ft.Metadata, error) {
 	ukey := key.B58KeyDecode(skey)
 
-	nd, err := n.DAG.Get(n.Context(), ukey)
+	nd, err := n.DAG.GetPB(n.Context(), ukey)
 	if err != nil {
 		return nil, err
 	}

core/coreunix/metadata_test.go

@@ -65,7 +65,7 @@ func TestMetadata(t *testing.T) {
 		t.Fatalf("something went wrong in conversion: '%s' != '%s'", rec.MimeType, m.MimeType)
 	}
 
-	retnode, err := ds.Get(ctx, key.B58KeyDecode(mdk))
+	retnode, err := ds.GetPB(ctx, key.B58KeyDecode(mdk))
 	if err != nil {
 		t.Fatal(err)
 	}

merkledag/merkledag.go

@@ -18,7 +18,7 @@ var ErrNotFound = fmt.Errorf("merkledag: not found")
 // DAGService is an IPFS Merkle DAG service.
 type DAGService interface {
 	Add(*Node) (key.Key, error)
-	Get(context.Context, key.Key) (*Node, error)
+	GetPB(context.Context, key.Key) (*Node, error)
 	Remove(*Node) error
 
 	// GetDAG returns, in order, all the single leve child
@@ -66,8 +66,9 @@ func (n *dagService) Batch() *Batch {
 	return &Batch{ds: n, MaxSize: 8 * 1024 * 1024}
 }
 
-// Get retrieves a node from the dagService, fetching the block in the BlockService
-func (n *dagService) Get(ctx context.Context, k key.Key) (*Node, error) {
+// GetPB retrieves a Protocol Buffer node from the dagService, fetching the
+// block in the BlockService
+func (n *dagService) GetPB(ctx context.Context, k key.Key) (*Node, error) {
 	if n == nil {
 		return nil, fmt.Errorf("dagService is nil")
 	}
@@ -249,10 +250,10 @@ type nodePromise struct {
 // from its internal channels, subsequent calls will return the
 // cached node.
 type NodeGetter interface {
-	Get(context.Context) (*Node, error)
+	GetPB(context.Context) (*Node, error)
 }
 
-func (np *nodePromise) Get(ctx context.Context) (*Node, error) {
+func (np *nodePromise) GetPB(ctx context.Context) (*Node, error) {
 	if np.cache != nil {
 		return np.cache, nil
 	}
@@ -314,7 +315,7 @@ func EnumerateChildren(ctx context.Context, ds DAGService, root *Node, set key.K
 		k := key.Key(lnk.Hash)
 		if !set.Has(k) {
 			set.Add(k)
-			child, err := ds.Get(ctx, k)
+			child, err := ds.GetPB(ctx, k)
 			if err != nil {
 				return err
 			}

merkledag/merkledag_test.go

@@ -200,7 +200,7 @@ func runBatchFetchTest(t *testing.T, read io.Reader) {
 		wg.Add(1)
 		go func(i int) {
 			defer wg.Done()
-			first, err := dagservs[i].Get(ctx, k)
+			first, err := dagservs[i].GetPB(ctx, k)
 			if err != nil {
 				errs <- err
 			}
@@ -239,7 +239,7 @@ func assertCanGet(t *testing.T, ds DAGService, n *Node) {
 		t.Fatal(err)
 	}
 
-	if _, err := ds.Get(context.Background(), k); err != nil {
+	if _, err := ds.GetPB(context.Background(), k); err != nil {
 		t.Fatal(err)
 	}
 }
@@ -253,7 +253,7 @@ func TestCantGet(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	_, err = dsp.ds.Get(context.Background(), k)
+	_, err = dsp.ds.GetPB(context.Background(), k)
 	if !strings.Contains(err.Error(), "not found") {
 		t.Fatal("expected err not found, got: ", err)
 	}
@@ -313,7 +313,7 @@ func TestEnumerateChildren(t *testing.T) {
 			if !ks.Has(k) {
 				t.Fatal("missing key in set!")
 			}
-			child, err := ds.Get(context.Background(), k)
+			child, err := ds.GetPB(context.Background(), k)
 			if err != nil {
 				t.Fatal(err)
 			}

merkledag/node.go

@@ -75,7 +75,7 @@ func MakeLink(n *Node) (*Link, error) {
 
 // GetNode returns the MDAG Node that this link points to
 func (l *Link) GetNode(ctx context.Context, serv DAGService) (*Node, error) {
-	return serv.Get(ctx, key.Key(l.Hash))
+	return serv.GetPB(ctx, key.Key(l.Hash))
 }
 
 // AddNodeLink adds a link to another node.

merkledag/utils/diff.go

@@ -41,7 +41,7 @@ func ApplyChange(ctx context.Context, ds dag.DAGService, nd *dag.Node, cs []*Cha
 	for _, c := range cs {
 		switch c.Type {
 		case Add:
-			child, err := ds.Get(ctx, c.After)
+			child, err := ds.GetPB(ctx, c.After)
 			if err != nil {
 				return nil, err
 			}
@@ -61,7 +61,7 @@ func ApplyChange(ctx context.Context, ds dag.DAGService, nd *dag.Node, cs []*Cha
 			if err != nil {
 				return nil, err
 			}
-			child, err := ds.Get(ctx, c.After)
+			child, err := ds.GetPB(ctx, c.After)
 			if err != nil {
 				return nil, err
 			}

path/resolver.go

@@ -87,7 +87,7 @@ func (s *Resolver) ResolvePathComponents(ctx context.Context, fpath Path) ([]*me
 	}
 
 	log.Debug("Resolve dag get.")
-	nd, err := s.DAG.Get(ctx, key.Key(h))
+	nd, err := s.DAG.GetPB(ctx, key.Key(h))
 	if err != nil {
 		return nil, err
 	}

pin/gc/gc.go

@@ -72,7 +72,7 @@ func GC(ctx context.Context, bs bstore.GCBlockstore, pn pin.Pinner) (<-chan key.
 func Descendants(ctx context.Context, ds dag.DAGService, set key.KeySet, roots []key.Key) error {
 	for _, k := range roots {
 		set.Add(k)
-		nd, err := ds.Get(ctx, k)
+		nd, err := ds.GetPB(ctx, k)
 		if err != nil {
 			return err
 		}

pin/pin.go

@@ -110,7 +110,7 @@ func (p *pinner) Pin(ctx context.Context, node *mdag.Node, recurse bool) error {
 
 		p.recursePin.AddBlock(k)
 	} else {
-		if _, err := p.dserv.Get(ctx, k); err != nil {
+		if _, err := p.dserv.GetPB(ctx, k); err != nil {
 			return err
 		}
 
@@ -203,7 +203,7 @@ func (p *pinner) isPinnedWithType(k key.Key, typeStr string) (string, bool, erro
 
 	// Default is "indirect"
 	for _, rk := range p.recursePin.GetKeys() {
-		rnd, err := p.dserv.Get(context.Background(), rk)
+		rnd, err := p.dserv.GetPB(context.Background(), rk)
 		if err != nil {
 			return "", false, err
 		}
@@ -251,7 +251,7 @@ func LoadPinner(d ds.Datastore, dserv mdag.DAGService) (Pinner, error) {
 	ctx, cancel := context.WithTimeout(context.TODO(), time.Second*5)
 	defer cancel()
 
-	root, err := dserv.Get(ctx, rootKey)
+	root, err := dserv.GetPB(ctx, rootKey)
 	if err != nil {
 		return nil, fmt.Errorf("cannot find pinning root object: %v", err)
 	}
@@ -380,7 +380,7 @@ func hasChild(ds mdag.DAGService, root *mdag.Node, child key.Key) (bool, error)
 			return true, nil
 		}
 
-		nd, err := ds.Get(context.Background(), k)
+		nd, err := ds.GetPB(context.Background(), k)
 		if err != nil {
 			return false, err
 		}

unixfs/archive/tar/writer.go

@@ -40,7 +40,7 @@ func (w *Writer) writeDir(nd *mdag.Node, fpath string) error {
 	}
 
 	for i, ng := range mdag.GetDAG(w.ctx, w.Dag, nd) {
-		child, err := ng.Get(w.ctx)
+		child, err := ng.GetPB(w.ctx)
 		if err != nil {
 			return err
 		}

unixfs/io/dagreader.go

@@ -110,7 +110,7 @@ func (dr *DagReader) precalcNextBuf(ctx context.Context) error {
 		return io.EOF
 	}
 
-	nxt, err := dr.promises[dr.linkPosition].Get(ctx)
+	nxt, err := dr.promises[dr.linkPosition].GetPB(ctx)
 	if err != nil {
 		return err
 	}

unixfs/io/dirbuilder.go

@@ -28,7 +28,7 @@ func NewDirectory(dserv mdag.DAGService) *directoryBuilder {
 
 // AddChild adds a (name, key)-pair to the root node.
 func (d *directoryBuilder) AddChild(ctx context.Context, name string, k key.Key) error {
-	cnode, err := d.dserv.Get(ctx, k)
+	cnode, err := d.dserv.GetPB(ctx, k)
 	if err != nil {
 		return err
 	}

unixfs/mod/dagmodifier.go

@@ -175,7 +175,7 @@ func (dm *DagModifier) Sync() error {
 		return err
 	}
 
-	nd, err := dm.dagserv.Get(dm.ctx, thisk)
+	nd, err := dm.dagserv.GetPB(dm.ctx, thisk)
 	if err != nil {
 		return err
 	}