Skip to content

Commit e36a40d

Browse files
kevinawhyrusleeping
authored andcommitted
Refactor.
License: MIT Signed-off-by: Kevin Atkinson <[email protected]>
1 parent 0b228a7 commit e36a40d

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

filestore/fsrefstore.go

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,20 @@ func (f *FileManager) DeleteBlock(c *cid.Cid) error {
8484
}
8585

8686
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) {
87101
o, err := f.ds.Get(dshelp.CidToDsKey(c))
88102
switch err {
89103
case ds.ErrNotFound:
@@ -104,12 +118,7 @@ func (f *FileManager) Get(c *cid.Cid) (blocks.Block, error) {
104118
return nil, err
105119
}
106120

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
113122
}
114123

115124
// reads and verifies the block

0 commit comments

Comments
 (0)