Rename prefix to CidBuilder in names when a cid.Builder is used.
License: MIT Signed-off-by: Kevin Atkinson <k@kevina.org>
Kevin Atkinson committed
Aug 12, 2018 at 20:49 UTC
fda3d8824517c25745e412a269ce96817712e437
5 files changed
+35
-35
core/commands/add.go
+2
-2
@@ -279,13 +279,13 @@ You can now check what blocks have been created by:
279
fileAdder.Silent = silent
280
fileAdder.RawLeaves = rawblks
281
fileAdder.NoCopy = nocopy
282
- fileAdder.Prefix = &prefix
282
+ fileAdder.CidBuilder = &prefix
283
284
if hash {
285
md := dagtest.Mock()
286
emptyDirNode := ft.EmptyDirNode()
287
// Use the same prefix for the "empty" MFS root as for the file adder.
288
- emptyDirNode.SetCidBuilder(fileAdder.Prefix)
288
+ emptyDirNode.SetCidBuilder(fileAdder.CidBuilder)
289
mr, err := mfs.NewRoot(req.Context, md, emptyDirNode, nil)
290
if err != nil {
291
res.SetError(err, cmdkit.ErrNormal)
core/commands/files.go
+10
-10
@@ -868,9 +868,9 @@ Examples:
868
root := n.FilesRoot
869
870
err = mfs.Mkdir(root, dirtomake, mfs.MkdirOpts{
871
- Mkparents: dashp,
872
- Flush: flush,
873
- Prefix: prefix,
871
+ Mkparents: dashp,
872
+ Flush: flush,
873
+ CidBuilder: prefix,
874
})
875
if err != nil {
876
res.SetError(err, cmdkit.ErrNormal)
@@ -958,8 +958,8 @@ Change the cid version or hash function of the root node of a given path.
958
},
959
}
960
961
-func updatePath(rt *mfs.Root, pth string, prefix cid.Builder, flush bool) error {
962
- if prefix == nil {
961
+func updatePath(rt *mfs.Root, pth string, builder cid.Builder, flush bool) error {
962
+ if builder == nil {
963
return nil
964
}
965
@@ -970,7 +970,7 @@ func updatePath(rt *mfs.Root, pth string, prefix cid.Builder, flush bool) error
970
971
switch n := nd.(type) {
972
case *mfs.Directory:
973
- n.SetPrefix(prefix)
973
+ n.SetCidBuilder(builder)
974
default:
975
return fmt.Errorf("can only update directories")
976
}
@@ -1146,7 +1146,7 @@ func getPrefix(req oldcmds.Request) (cid.Builder, error) {
1146
return &prefix, nil
1147
}
1148
1149
-func getFileHandle(r *mfs.Root, path string, create bool, prefix cid.Builder) (*mfs.File, error) {
1149
+func getFileHandle(r *mfs.Root, path string, create bool, builder cid.Builder) (*mfs.File, error) {
1150
target, err := mfs.Lookup(r, path)
1151
switch err {
1152
case nil:
@@ -1172,12 +1172,12 @@ func getFileHandle(r *mfs.Root, path string, create bool, prefix cid.Builder) (*
1172
if !ok {
1173
return nil, fmt.Errorf("%s was not a directory", dirname)
1174
}
1175
- if prefix == nil {
1176
- prefix = pdir.GetPrefix()
1175
+ if builder == nil {
1176
+ builder = pdir.GetCidBuilder()
1177
}
1178
1179
nd := dag.NodeWithData(ft.FilePBData(nil, 0))
1180
- nd.SetCidBuilder(prefix)
1180
+ nd.SetCidBuilder(builder)
1181
err = pdir.AddChild(fname, nd)
1182
if err != nil {
1183
return nil, err
core/coreunix/add.go
+10
-10
@@ -89,7 +89,7 @@ type Adder struct {
89
mroot *mfs.Root
90
unlocker bstore.Unlocker
91
tempRoot *cid.Cid
92
- Prefix cid.Builder
92
+ CidBuilder cid.Builder
93
liveNodes uint64
94
}
95
@@ -98,7 +98,7 @@ func (adder *Adder) mfsRoot() (*mfs.Root, error) {
98
return adder.mroot, nil
99
}
100
rnode := unixfs.EmptyDirNode()
101
- rnode.SetCidBuilder(adder.Prefix)
101
+ rnode.SetCidBuilder(adder.CidBuilder)
102
mr, err := mfs.NewRoot(adder.ctx, adder.dagService, rnode, nil)
103
if err != nil {
104
return nil, err
@@ -124,7 +124,7 @@ func (adder *Adder) add(reader io.Reader) (ipld.Node, error) {
124
RawLeaves: adder.RawLeaves,
125
Maxlinks: ihelper.DefaultLinksPerBlock,
126
NoCopy: adder.NoCopy,
127
- CidBuilder: adder.Prefix,
127
+ CidBuilder: adder.CidBuilder,
128
}
129
130
if adder.Trickle {
@@ -384,9 +384,9 @@ func (adder *Adder) addNode(node ipld.Node, path string) error {
384
dir := gopath.Dir(path)
385
if dir != "." {
386
opts := mfs.MkdirOpts{
387
- Mkparents: true,
388
- Flush: false,
389
- Prefix: adder.Prefix,
387
+ Mkparents: true,
388
+ Flush: false,
389
+ CidBuilder: adder.CidBuilder,
390
}
391
if err := mfs.Mkdir(mr, dir, opts); err != nil {
392
return err
@@ -449,7 +449,7 @@ func (adder *Adder) addFile(file files.File) error {
449
}
450
451
dagnode := dag.NodeWithData(sdata)
452
- dagnode.SetCidBuilder(adder.Prefix)
452
+ dagnode.SetCidBuilder(adder.CidBuilder)
453
err = adder.dagService.Add(adder.ctx, dagnode)
454
if err != nil {
455
return err
@@ -488,9 +488,9 @@ func (adder *Adder) addDir(dir files.File) error {
488
return err
489
}
490
err = mfs.Mkdir(mr, dir.FileName(), mfs.MkdirOpts{
491
- Mkparents: true,
492
- Flush: false,
493
- Prefix: adder.Prefix,
491
+ Mkparents: true,
492
+ Flush: false,
493
+ CidBuilder: adder.CidBuilder,
494
})
495
if err != nil {
496
return err
mfs/dir.go
+6
-6
@@ -63,14 +63,14 @@ func NewDirectory(ctx context.Context, name string, node ipld.Node, parent child
63
}, nil
64
}
65
66
-// GetPrefix gets the CID prefix of the root node
67
-func (d *Directory) GetPrefix() cid.Builder {
66
+// GetCidBuilder gets the CID builder of the root node
67
+func (d *Directory) GetCidBuilder() cid.Builder {
68
return d.unixfsDir.GetCidBuilder()
69
}
70
71
-// SetPrefix sets the CID prefix
72
-func (d *Directory) SetPrefix(prefix cid.Builder) {
73
- d.unixfsDir.SetCidBuilder(prefix)
71
+// SetCidBuilder sets the CID builder
72
+func (d *Directory) SetCidBuilder(b cid.Builder) {
73
+ d.unixfsDir.SetCidBuilder(b)
74
}
75
76
// closeChild updates the child by the given name to the dag node 'nd'
@@ -307,7 +307,7 @@ func (d *Directory) Mkdir(name string) (*Directory, error) {
307
}
308
309
ndir := ft.EmptyDirNode()
310
- ndir.SetCidBuilder(d.GetPrefix())
310
+ ndir.SetCidBuilder(d.GetCidBuilder())
311
312
err = d.dserv.Add(d.ctx, ndir)
313
if err != nil {
mfs/ops.go
+7
-7
@@ -99,9 +99,9 @@ func PutNode(r *Root, path string, nd ipld.Node) error {
99
100
// MkdirOpts is used by Mkdir
101
type MkdirOpts struct {
102
- Mkparents bool
103
- Flush bool
104
- Prefix cid.Builder
102
+ Mkparents bool
103
+ Flush bool
104
+ CidBuilder cid.Builder
105
}
106
107
// Mkdir creates a directory at 'path' under the directory 'd', creating
@@ -136,8 +136,8 @@ func Mkdir(r *Root, pth string, opts MkdirOpts) error {
136
if err != nil {
137
return err
138
}
139
- if opts.Prefix != nil {
140
- mkd.SetPrefix(opts.Prefix)
139
+ if opts.CidBuilder != nil {
140
+ mkd.SetCidBuilder(opts.CidBuilder)
141
}
142
fsn = mkd
143
} else if err != nil {
@@ -157,8 +157,8 @@ func Mkdir(r *Root, pth string, opts MkdirOpts) error {
157
return err
158
}
159
}
160
- if opts.Prefix != nil {
161
- final.SetPrefix(opts.Prefix)
160
+ if opts.CidBuilder != nil {
161
+ final.SetCidBuilder(opts.CidBuilder)
162
}
163
164
if opts.Flush {