Commit 939ac997 authored by Jeromy's avatar Jeromy

fix issue with blocks not actually being stored via dagservice

parent 9dd615bb
...@@ -55,6 +55,7 @@ func (n *Node) AddNodeLink(name string, that *Node) error { ...@@ -55,6 +55,7 @@ func (n *Node) AddNodeLink(name string, that *Node) error {
Name: name, Name: name,
Size: s, Size: s,
Hash: h, Hash: h,
Node: that,
}) })
return nil return nil
} }
...@@ -97,8 +98,10 @@ type DAGService struct { ...@@ -97,8 +98,10 @@ type DAGService struct {
Blocks *bserv.BlockService Blocks *bserv.BlockService
} }
// Put adds a node to the DAGService, storing the block in the BlockService // Add adds a node to the DAGService, storing the block in the BlockService
func (n *DAGService) Put(nd *Node) (u.Key, error) { func (n *DAGService) Add(nd *Node) (u.Key, error) {
k, _ := nd.Key()
u.DOut("DagService Add [%s]\n", k.Pretty())
if n == nil { if n == nil {
return "", fmt.Errorf("DAGService is nil") return "", fmt.Errorf("DAGService is nil")
} }
...@@ -116,6 +119,26 @@ func (n *DAGService) Put(nd *Node) (u.Key, error) { ...@@ -116,6 +119,26 @@ func (n *DAGService) Put(nd *Node) (u.Key, error) {
return n.Blocks.AddBlock(b) return n.Blocks.AddBlock(b)
} }
func (n *DAGService) AddRecursive(nd *Node) error {
_, err := n.Add(nd)
if err != nil {
return err
}
for _, link := range nd.Links {
fmt.Println("Adding link.")
if link.Node == nil {
panic("Why does this node have a nil link?\n")
}
err := n.AddRecursive(link.Node)
if err != nil {
return err
}
}
return nil
}
// Get retrieves a node from the DAGService, fetching the block in the BlockService // Get retrieves a node from the DAGService, fetching the block in the BlockService
func (n *DAGService) Get(k u.Key) (*Node, error) { func (n *DAGService) Get(k u.Key) (*Node, error) {
if n == nil { if n == nil {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment