Refactor.
License: MIT Signed-off-by: Kevin Atkinson <k@kevina.org>
Kevin Atkinson committed
Feb 3, 2017 at 16:33 UTC
8e1a03dd96428051651a07ab189b03834b834e38
1 file changed
+15
-6
filestore/fsrefstore.go
+15
-6
@@ -84,6 +84,20 @@ func (f *FileManager) DeleteBlock(c *cid.Cid) error {
84
}
85
86
func (f *FileManager) Get(c *cid.Cid) (blocks.Block, error) {
87
+ dobj, err := f.getDataObj(c)
88
+ if err != nil {
89
+ return nil, err
90
+ }
91
+
92
+ out, err := f.readDataObj(c, dobj)
93
+ if err != nil {
94
+ return nil, err
95
+ }
96
+
97
+ return blocks.NewBlockWithCid(out, c)
98
+}
99
+
100
+func (f *FileManager) getDataObj(c *cid.Cid) (*pb.DataObj, error) {
101
o, err := f.ds.Get(dshelp.CidToDsKey(c))
102
switch err {
103
case ds.ErrNotFound:
@@ -104,12 +118,7 @@ func (f *FileManager) Get(c *cid.Cid) (blocks.Block, error) {
118
return nil, err
119
}
120
107
- out, err := f.readDataObj(c, &dobj)
108
- if err != nil {
109
- return nil, err
110
- }
111
-
112
- return blocks.NewBlockWithCid(out, c)
121
+ return &dobj, nil
122
}
123
124
// reads and verifies the block