From 95906d3201bef63b463fef72d0461599d915bf20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Mon, 25 Mar 2019 19:00:51 +0100
Subject: [PATCH] coreapi: remove Unixfs.Wrap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
---
 core/coreapi/unixfs.go |  1 -
 core/coreunix/add.go   | 27 +++------------------------
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/core/coreapi/unixfs.go b/core/coreapi/unixfs.go
index ce0ecf8fe..e4fb0f2e2 100644
--- a/core/coreapi/unixfs.go
+++ b/core/coreapi/unixfs.go
@@ -87,7 +87,6 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
 		fileAdder.Out = settings.Events
 		fileAdder.Progress = settings.Progress
 	}
-	fileAdder.Wrap = settings.Wrap
 	fileAdder.Pin = settings.Pin && !settings.OnlyHash
 	fileAdder.Silent = settings.Silent
 	fileAdder.RawLeaves = settings.RawLeaves
diff --git a/core/coreunix/add.go b/core/coreunix/add.go
index 4fc749c06..9ecc8a4f5 100644
--- a/core/coreunix/add.go
+++ b/core/coreunix/add.go
@@ -51,7 +51,6 @@ func NewAdder(ctx context.Context, p pin.Pinner, bs bstore.GCLocker, ds ipld.DAG
 		Progress:   false,
 		Pin:        true,
 		Trickle:    false,
-		Wrap:       false,
 		Chunker:    "",
 	}, nil
 }
@@ -69,7 +68,6 @@ type Adder struct {
 	Trickle    bool
 	RawLeaves  bool
 	Silent     bool
-	Wrap       bool
 	NoCopy     bool
 	Chunker    string
 	root       ipld.Node
@@ -144,8 +142,8 @@ func (adder *Adder) curRootNode() (ipld.Node, error) {
 		return nil, err
 	}
 
-	// if not wrapping, AND one root file, use that hash as root.
-	if !adder.Wrap && len(root.Links()) == 1 {
+	// if one root file, use that hash as root.
+	if len(root.Links()) == 1 {
 		nd, err := root.Links()[0].GetNode(adder.ctx, adder.dagService)
 		if err != nil {
 			return nil, err
@@ -288,7 +286,7 @@ func (adder *Adder) AddAllAndPin(file files.Node) (ipld.Node, error) {
 	// directory, mfs root is the directory)
 	_, dir := file.(files.Directory)
 	var name string
-	if !adder.Wrap && !dir {
+	if !dir {
 		children, err := rootdir.ListNames(adder.ctx)
 		if err != nil {
 			return nil, err
@@ -316,25 +314,6 @@ func (adder *Adder) AddAllAndPin(file files.Node) (ipld.Node, error) {
 		return nil, err
 	}
 
-	// when adding wrapped directory, manually wrap here
-	if adder.Wrap && dir {
-		name = nd.Cid().String()
-
-		end := unixfs.EmptyDirNode()
-		if err := end.AddNodeLink(nd.Cid().String(), nd); err != nil {
-			return nil, err
-		}
-		nd = end
-
-		if err := adder.dagService.Add(adder.ctx, end); err != nil {
-			return nil, err
-		}
-
-		if err := outputDagnode(adder.Out, "", nd); err != nil {
-			return nil, err
-		}
-	}
-
 	// output directory events
 	err = adder.outputDirs(name, root)
 	if err != nil {