Unverified 提交 5fa1ea22 作者: Whyrusleeping 提交者: GitHub

Merge pull request #4629 from ipfs/nit/hmm

minor drive-by code cleanup
...@@ -657,24 +657,28 @@ func deserializeNode(nd *Node, dataFieldEncoding string) (*dag.ProtoNode, error) ...@@ -657,24 +657,28 @@ func deserializeNode(nd *Node, dataFieldEncoding string) (*dag.ProtoNode, error)
case "text": case "text":
dagnode.SetData([]byte(nd.Data)) dagnode.SetData([]byte(nd.Data))
case "base64": case "base64":
data, _ := base64.StdEncoding.DecodeString(nd.Data) data, err := base64.StdEncoding.DecodeString(nd.Data)
if err != nil {
return nil, err
}
dagnode.SetData(data) dagnode.SetData(data)
default: default:
return nil, fmt.Errorf("Unkown data field encoding") return nil, fmt.Errorf("Unkown data field encoding")
} }
dagnode.SetLinks(make([]*ipld.Link, len(nd.Links))) links := make([]*ipld.Link, len(nd.Links))
for i, link := range nd.Links { for i, link := range nd.Links {
c, err := cid.Decode(link.Hash) c, err := cid.Decode(link.Hash)
if err != nil { if err != nil {
return nil, err return nil, err
} }
dagnode.Links()[i] = &ipld.Link{ links[i] = &ipld.Link{
Name: link.Name, Name: link.Name,
Size: link.Size, Size: link.Size,
Cid: c, Cid: c,
} }
} }
dagnode.SetLinks(links)
return dagnode, nil return dagnode, nil
} }
......
...@@ -297,24 +297,28 @@ func deserializeNode(nd *Node, dataFieldEncoding string) (*dag.ProtoNode, error) ...@@ -297,24 +297,28 @@ func deserializeNode(nd *Node, dataFieldEncoding string) (*dag.ProtoNode, error)
case "text": case "text":
dagnode.SetData([]byte(nd.Data)) dagnode.SetData([]byte(nd.Data))
case "base64": case "base64":
data, _ := base64.StdEncoding.DecodeString(nd.Data) data, err := base64.StdEncoding.DecodeString(nd.Data)
if err != nil {
return nil, err
}
dagnode.SetData(data) dagnode.SetData(data)
default: default:
return nil, fmt.Errorf("Unkown data field encoding") return nil, fmt.Errorf("Unkown data field encoding")
} }
dagnode.SetLinks(make([]*ipld.Link, len(nd.Links))) links := make([]*ipld.Link, len(nd.Links))
for i, link := range nd.Links { for i, link := range nd.Links {
c, err := cid.Decode(link.Hash) c, err := cid.Decode(link.Hash)
if err != nil { if err != nil {
return nil, err return nil, err
} }
dagnode.Links()[i] = &ipld.Link{ links[i] = &ipld.Link{
Name: link.Name, Name: link.Name,
Size: link.Size, Size: link.Size,
Cid: c, Cid: c,
} }
} }
dagnode.SetLinks(links)
return dagnode, nil return dagnode, nil
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论