minor drive-by code cleanup
We'll dedup the code later, for now: 1. Don't drop errors on the floor. 2. Don't modify anything returned by `Links()` directly... License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
Jan 30, 2018 at 14:40 UTC
41d9daf653a13473baeb7899e33322b752f21633
2 files changed
+14
-6
core/commands/object/object.go
+7
-3
@@ -657,24 +657,28 @@ func deserializeNode(nd *Node, dataFieldEncoding string) (*dag.ProtoNode, error)
657
case "text":
658
dagnode.SetData([]byte(nd.Data))
659
case "base64":
660
- data, _ := base64.StdEncoding.DecodeString(nd.Data)
660
+ data, err := base64.StdEncoding.DecodeString(nd.Data)
661
+ if err != nil {
662
+ return nil, err
663
+ }
664
dagnode.SetData(data)
665
default:
666
return nil, fmt.Errorf("Unkown data field encoding")
667
}
668
666
- dagnode.SetLinks(make([]*ipld.Link, len(nd.Links)))
669
+ links := make([]*ipld.Link, len(nd.Links))
670
for i, link := range nd.Links {
671
c, err := cid.Decode(link.Hash)
672
if err != nil {
673
return nil, err
674
}
672
- dagnode.Links()[i] = &ipld.Link{
675
+ links[i] = &ipld.Link{
676
Name: link.Name,
677
Size: link.Size,
678
Cid: c,
679
}
680
}
681
+ dagnode.SetLinks(links)
682
683
return dagnode, nil
684
}
core/coreapi/object.go
+7
-3
@@ -297,24 +297,28 @@ func deserializeNode(nd *Node, dataFieldEncoding string) (*dag.ProtoNode, error)
297
case "text":
298
dagnode.SetData([]byte(nd.Data))
299
case "base64":
300
- data, _ := base64.StdEncoding.DecodeString(nd.Data)
300
+ data, err := base64.StdEncoding.DecodeString(nd.Data)
301
+ if err != nil {
302
+ return nil, err
303
+ }
304
dagnode.SetData(data)
305
default:
306
return nil, fmt.Errorf("Unkown data field encoding")
307
}
308
306
- dagnode.SetLinks(make([]*ipld.Link, len(nd.Links)))
309
+ links := make([]*ipld.Link, len(nd.Links))
310
for i, link := range nd.Links {
311
c, err := cid.Decode(link.Hash)
312
if err != nil {
313
return nil, err
314
}
312
- dagnode.Links()[i] = &ipld.Link{
315
+ links[i] = &ipld.Link{
316
Name: link.Name,
317
Size: link.Size,
318
Cid: c,
319
}
320
}
321
+ dagnode.SetLinks(links)
322
323
return dagnode, nil
324
}