Removes write flag from Finalize
License: MIT Signed-off-by: Stephen Whitmore <noffle@ipfs.io>
Stephen Whitmore committed
Apr 8, 2016 at 14:58 UTC
8fcb585cfbc203c2bf157b1d36b3998c83c1293e
2 files changed
+7
-9
core/commands/add.go
+1
-1
@@ -164,7 +164,7 @@ MerkleDAG.
164
}
165
166
// copy intermediary nodes from editor to our actual dagservice
167
- _, err := fileAdder.Finalize(hash)
167
+ _, err := fileAdder.Finalize()
168
if err != nil {
169
return err
170
}
core/coreunix/add.go
+6
-8
@@ -173,7 +173,7 @@ func (adder *Adder) PinRoot() error {
173
return adder.node.Pinning.Flush()
174
}
175
176
-func (adder *Adder) Finalize(write bool) (*dag.Node, error) {
176
+func (adder *Adder) Finalize() (*dag.Node, error) {
177
root := adder.mr.GetValue()
178
179
// cant just call adder.RootNode() here as we need the name for printing
@@ -202,11 +202,9 @@ func (adder *Adder) Finalize(write bool) (*dag.Node, error) {
202
return nil, err
203
}
204
205
- if write {
206
- err = adder.mr.Close()
207
- if err != nil {
208
- return nil, err
209
- }
205
+ err = adder.mr.Close()
206
+ if err != nil {
207
+ return nil, err
208
}
209
210
rootNode, err = root.GetNode()
@@ -293,7 +291,7 @@ func AddR(n *core.IpfsNode, root string) (key string, err error) {
291
return "", err
292
}
293
296
- nd, err := fileAdder.Finalize(true)
294
+ nd, err := fileAdder.Finalize()
295
if err != nil {
296
return "", err
297
}
@@ -325,7 +323,7 @@ func AddWrapped(n *core.IpfsNode, r io.Reader, filename string) (string, *dag.No
323
return "", nil, err
324
}
325
328
- dagnode, err := fileAdder.Finalize(true)
326
+ dagnode, err := fileAdder.Finalize()
327
if err != nil {
328
return "", nil, err
329
}