mirror of
https://github.com/ipfs/kubo.git
synced 2026-03-10 02:40:11 +08:00
Merge pull request ipfs/boxoipfs/interface-go-ipfs-core#21 from ipfs/feat/remove-wrap
remove Wrap This commit was moved from ipfs/interface-go-ipfs-core@c35356b231 This commit was moved from ipfs/boxo@a6129a824f
This commit is contained in:
commit
52c10ba876
@ -33,8 +33,6 @@ type UnixfsAddSettings struct {
|
||||
FsCache bool
|
||||
NoCopy bool
|
||||
|
||||
Wrap bool
|
||||
|
||||
Events chan<- interface{}
|
||||
Silent bool
|
||||
Progress bool
|
||||
@ -65,8 +63,6 @@ func UnixfsAddOptions(opts ...UnixfsAddOption) (*UnixfsAddSettings, cid.Prefix,
|
||||
FsCache: false,
|
||||
NoCopy: false,
|
||||
|
||||
Wrap: false,
|
||||
|
||||
Events: nil,
|
||||
Silent: false,
|
||||
Progress: false,
|
||||
@ -234,15 +230,6 @@ func (unixfsOpts) HashOnly(hashOnly bool) UnixfsAddOption {
|
||||
}
|
||||
}
|
||||
|
||||
// Wrap tells the adder to wrap the added file structure with an additional
|
||||
// directory.
|
||||
func (unixfsOpts) Wrap(wrap bool) UnixfsAddOption {
|
||||
return func(settings *UnixfsAddSettings) error {
|
||||
settings.Wrap = wrap
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// Events specifies channel which will be used to report events about ongoing
|
||||
// Add operation.
|
||||
//
|
||||
|
||||
@ -248,13 +248,6 @@ func (tp *provider) TestAdd(t *testing.T) {
|
||||
data: flatDir,
|
||||
path: "/ipfs/QmRKGpFfR32FVXdvJiHfo4WJ5TDYBsM1P9raAp1p6APWSp",
|
||||
},
|
||||
{
|
||||
name: "simpleDirWrap",
|
||||
data: flatDir,
|
||||
expect: wrapped("QmRKGpFfR32FVXdvJiHfo4WJ5TDYBsM1P9raAp1p6APWSp"),
|
||||
path: "/ipfs/QmXxCaQkC8Z6Qws1nTkTQfCsL9y4XvWXnrPokp9bhmjC1L",
|
||||
opts: []options.UnixfsAddOption{options.Unixfs.Wrap(true)},
|
||||
},
|
||||
{
|
||||
name: "simpleDir",
|
||||
data: flatDir,
|
||||
@ -279,35 +272,6 @@ func (tp *provider) TestAdd(t *testing.T) {
|
||||
wrap: "foo",
|
||||
expect: wrapped("foo"),
|
||||
},
|
||||
{
|
||||
name: "stdinWrapped",
|
||||
path: "/ipfs/QmU3r81oZycjHS9oaSHw37ootMFuFUw1DvMLKXPsezdtqU",
|
||||
data: func() files.Node {
|
||||
return files.NewBytesFile([]byte(helloStr))
|
||||
},
|
||||
expect: func(files.Node) files.Node {
|
||||
return files.NewMapDirectory(map[string]files.Node{
|
||||
"QmQy2Dw4Wk7rdJKjThjYXzfFJNaRKRHhHP5gHHXroJMYxk": files.NewBytesFile([]byte(helloStr)),
|
||||
})
|
||||
},
|
||||
opts: []options.UnixfsAddOption{options.Unixfs.Wrap(true)},
|
||||
},
|
||||
{
|
||||
name: "twoLevelDirWrapped",
|
||||
data: twoLevelDir(),
|
||||
wrap: "t",
|
||||
expect: wrapped("QmPwsL3T5sWhDmmAWZHAzyjKtMVDS9a11aHNRqb3xoVnmg", "t"),
|
||||
path: "/ipfs/QmXzZwAh34pmNjuKsVGZfpbByis5S5qeZjCCUxa1ajZqzH",
|
||||
opts: []options.UnixfsAddOption{options.Unixfs.Wrap(true)},
|
||||
},
|
||||
{
|
||||
name: "twoLevelInlineHash",
|
||||
data: twoLevelDir(),
|
||||
wrap: "t",
|
||||
expect: wrapped("zBunoruKoyCHKkALNSWxDvj4L7yuQnMgQ4hUa9j1Z64tVcDEcu6Zdetyu7eeFCxMPfxb7YJvHeFHoFoHMkBUQf6vfdhmi", "t"),
|
||||
path: "/ipfs/QmUX6GykDGHTMtLmDkfjqs48QwQK82vou51xwaY9TSU7Zo",
|
||||
opts: []options.UnixfsAddOption{options.Unixfs.Wrap(true), options.Unixfs.Inline(true), options.Unixfs.RawLeaves(true), options.Unixfs.Hash(mh.SHA3)},
|
||||
},
|
||||
// hidden
|
||||
{
|
||||
name: "hiddenFilesAdded",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user