From 84faa010ce5dbb944845c22658025f4a0523ab6d Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 22 Mar 2019 15:05:41 -0700
Subject: [PATCH] remove Wrap

This can be trivially implemented by the end-user if desired. The best the
CoreAPI can do is name the file with it's own hash so this isn't really all that
helpful either.

Note: This differs from js-ipfs because _there_, all files have paths (even
outside directories).


This commit was moved from ipfs/interface-go-ipfs-core@ac37dde21aaeea010bbe50c8c37155e4471c0000

This commit was moved from ipfs/boxo@a0c8ed395649c7fcda2ceaccdd65aa13feb2d2ae
---
 core/coreiface/options/unixfs.go | 13 ------------
 core/coreiface/tests/unixfs.go   | 36 --------------------------------
 2 files changed, 49 deletions(-)

diff --git a/core/coreiface/options/unixfs.go b/core/coreiface/options/unixfs.go
index 578eb5320..3fd96f772 100644
--- a/core/coreiface/options/unixfs.go
+++ b/core/coreiface/options/unixfs.go
@@ -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.
 //
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index c27826b51..0fd494f66 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -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",