coreapi: remove Unixfs.Wrap
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Mar 25, 2019 at 19:00 UTC
95906d3201bef63b463fef72d0461599d915bf20
2 files changed
+3
-25
core/coreapi/unixfs.go
-1
@@ -87,7 +87,6 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
87
fileAdder.Out = settings.Events
88
fileAdder.Progress = settings.Progress
89
}
90
- fileAdder.Wrap = settings.Wrap
90
fileAdder.Pin = settings.Pin && !settings.OnlyHash
91
fileAdder.Silent = settings.Silent
92
fileAdder.RawLeaves = settings.RawLeaves
core/coreunix/add.go
+3
-24
@@ -51,7 +51,6 @@ func NewAdder(ctx context.Context, p pin.Pinner, bs bstore.GCLocker, ds ipld.DAG
51
Progress: false,
52
Pin: true,
53
Trickle: false,
54
- Wrap: false,
54
Chunker: "",
55
}, nil
56
}
@@ -69,7 +68,6 @@ type Adder struct {
68
Trickle bool
69
RawLeaves bool
70
Silent bool
72
- Wrap bool
71
NoCopy bool
72
Chunker string
73
root ipld.Node
@@ -144,8 +142,8 @@ func (adder *Adder) curRootNode() (ipld.Node, error) {
142
return nil, err
143
}
144
147
- // if not wrapping, AND one root file, use that hash as root.
148
- if !adder.Wrap && len(root.Links()) == 1 {
145
+ // if one root file, use that hash as root.
146
+ if len(root.Links()) == 1 {
147
nd, err := root.Links()[0].GetNode(adder.ctx, adder.dagService)
148
if err != nil {
149
return nil, err
@@ -288,7 +286,7 @@ func (adder *Adder) AddAllAndPin(file files.Node) (ipld.Node, error) {
286
// directory, mfs root is the directory)
287
_, dir := file.(files.Directory)
288
var name string
291
- if !adder.Wrap && !dir {
289
+ if !dir {
290
children, err := rootdir.ListNames(adder.ctx)
291
if err != nil {
292
return nil, err
@@ -316,25 +314,6 @@ func (adder *Adder) AddAllAndPin(file files.Node) (ipld.Node, error) {
314
return nil, err
315
}
316
319
- // when adding wrapped directory, manually wrap here
320
- if adder.Wrap && dir {
321
- name = nd.Cid().String()
322
-
323
- end := unixfs.EmptyDirNode()
324
- if err := end.AddNodeLink(nd.Cid().String(), nd); err != nil {
325
- return nil, err
326
- }
327
- nd = end
328
-
329
- if err := adder.dagService.Add(adder.ctx, end); err != nil {
330
- return nil, err
331
- }
332
-
333
- if err := outputDagnode(adder.Out, "", nd); err != nil {
334
- return nil, err
335
- }
336
- }
337
-
317
// output directory events
318
err = adder.outputDirs(name, root)
319
if err != nil {