mirror of
https://github.com/ipfs/kubo.git
synced 2025-07-30 16:01:06 +08:00
merkledag: change 'Node' to be an interface
Also change existing 'Node' type to 'ProtoNode' and use that most everywhere for now. As we move forward with the integration we will try and use the Node interface in more places that we're currently using ProtoNode. License: MIT Signed-off-by: Jeromy <why@ipfs.io>
This commit is contained in:
@ -27,7 +27,7 @@ func GetDAGServ() mdag.DAGService {
|
||||
return mdagmock.Mock()
|
||||
}
|
||||
|
||||
func GetNode(t testing.TB, dserv mdag.DAGService, data []byte) *mdag.Node {
|
||||
func GetNode(t testing.TB, dserv mdag.DAGService, data []byte) *mdag.ProtoNode {
|
||||
in := bytes.NewReader(data)
|
||||
node, err := imp.BuildTrickleDagFromReader(dserv, SizeSplitterGen(500)(in))
|
||||
if err != nil {
|
||||
@ -37,11 +37,11 @@ func GetNode(t testing.TB, dserv mdag.DAGService, data []byte) *mdag.Node {
|
||||
return node
|
||||
}
|
||||
|
||||
func GetEmptyNode(t testing.TB, dserv mdag.DAGService) *mdag.Node {
|
||||
func GetEmptyNode(t testing.TB, dserv mdag.DAGService) *mdag.ProtoNode {
|
||||
return GetNode(t, dserv, []byte{})
|
||||
}
|
||||
|
||||
func GetRandomNode(t testing.TB, dserv mdag.DAGService, size int64) ([]byte, *mdag.Node) {
|
||||
func GetRandomNode(t testing.TB, dserv mdag.DAGService, size int64) ([]byte, *mdag.ProtoNode) {
|
||||
in := io.LimitReader(u.NewTimeSeededRand(), size)
|
||||
buf, err := ioutil.ReadAll(in)
|
||||
if err != nil {
|
||||
@ -64,7 +64,7 @@ func ArrComp(a, b []byte) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func PrintDag(nd *mdag.Node, ds mdag.DAGService, indent int) {
|
||||
func PrintDag(nd *mdag.ProtoNode, ds mdag.DAGService, indent int) {
|
||||
pbd, err := ft.FromBytes(nd.Data())
|
||||
if err != nil {
|
||||
panic(err)
|
||||
@ -74,17 +74,17 @@ func PrintDag(nd *mdag.Node, ds mdag.DAGService, indent int) {
|
||||
fmt.Print(" ")
|
||||
}
|
||||
fmt.Printf("{size = %d, type = %s, children = %d", pbd.GetFilesize(), pbd.GetType().String(), len(pbd.GetBlocksizes()))
|
||||
if len(nd.Links) > 0 {
|
||||
if len(nd.Links()) > 0 {
|
||||
fmt.Println()
|
||||
}
|
||||
for _, lnk := range nd.Links {
|
||||
for _, lnk := range nd.Links() {
|
||||
child, err := lnk.GetNode(context.Background(), ds)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
PrintDag(child, ds, indent+1)
|
||||
PrintDag(child.(*mdag.ProtoNode), ds, indent+1)
|
||||
}
|
||||
if len(nd.Links) > 0 {
|
||||
if len(nd.Links()) > 0 {
|
||||
for i := 0; i < indent; i++ {
|
||||
fmt.Print(" ")
|
||||
}
|
||||
|
Reference in New Issue
Block a user