Remove unpin option from pin.Update

License: MIT Signed-off-by: Iaroslav Gridin <voker57@gmail.com>
ipfs · Mar 3, 2018 · 9536f12 · 9536f12
1 parent 0f2288e
commit 9536f12
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git a/core/commands/pin.go b/core/commands/pin.go
@@ -372,11 +372,10 @@ new pin and removing the old one.
 	},
 
 	Arguments: []cmdkit.Argument{
-		cmdkit.StringArg("from-path", true, false, "Path to old object."),
+		cmdkit.StringArg("pinpath", true, false, "Pin path of the old object."),
 		cmdkit.StringArg("to-path", true, false, "Path to new object to be pinned."),
 	},
 	Options: []cmdkit.Option{
-		cmdkit.BoolOption("unpin", "Remove the old pin.").WithDefault(true),
 	},
 	Type: PinOutput{},
 	Run: func(req cmds.Request, res cmds.Response) {
@@ -386,12 +385,6 @@ new pin and removing the old one.
 			return
 		}
 
-		unpin, _, err := req.Option("unpin").Bool()
-		if err != nil {
-			res.SetError(err, cmdkit.ErrNormal)
-			return
-		}
-
 		from := req.Arguments()[0]
 
 		to, err := path.ParsePath(req.Arguments()[1])
@@ -411,7 +404,7 @@ new pin and removing the old one.
 			return
 		}
 
-		err = n.Pinning.Update(req.Context(), from, toc, unpin)
+		err = n.Pinning.Update(req.Context(), from, toc)
 		if err != nil {
 			res.SetError(err, cmdkit.ErrNormal)
 			return

diff --git a/core/coreapi/interface/options/pin.go b/core/coreapi/interface/options/pin.go
@@ -10,7 +10,6 @@ type PinLsSettings struct {
 }
 
 type PinUpdateSettings struct {
-	Unpin bool
 }
 
 type PinAddOption func(*PinAddSettings) error
@@ -49,9 +48,7 @@ func PinLsOptions(opts ...PinLsOption) (*PinLsSettings, error) {
 }
 
 func PinUpdateOptions(opts ...PinUpdateOption) (*PinUpdateSettings, error) {
-	options := &PinUpdateSettings{
-		Unpin: true,
-	}
+	options := &PinUpdateSettings{}
 
 	for _, opt := range opts {
 		err := opt(options)
@@ -80,8 +77,7 @@ func (api *PinOptions) WithType(t string) PinLsOption {
 }
 
 func (api *PinOptions) WithUnpin(unpin bool) PinUpdateOption {
-	return func(settings *PinUpdateSettings) error {
-		settings.Unpin = unpin
+	return func(_ *PinUpdateSettings) error {
 		return nil
 	}
 }
diff --git a/core/coreapi/pin.go b/core/coreapi/pin.go
@@ -62,12 +62,12 @@ func (api *PinAPI) Rm(ctx context.Context, p string) error {
 }
 
 func (api *PinAPI) Update(ctx context.Context, from string, to coreiface.Path, opts ...caopts.PinUpdateOption) error {
-	settings, err := caopts.PinUpdateOptions(opts...)
+	_, err := caopts.PinUpdateOptions(opts...)
 	if err != nil {
 		return err
 	}
 
-	return api.node.Pinning.Update(ctx, from, to.Cid(), settings.Unpin)
+	return api.node.Pinning.Update(ctx, from, to.Cid())
 }
 
 type pinStatus struct {

diff --git a/pin/pin.go b/pin/pin.go
@@ -67,7 +67,7 @@ type Pinner interface {
 	// Update updates a recursive pin from one cid to another
 	// this is more efficient than simply pinning the new one and unpinning the
 	// old one
-	Update(ctx context.Context, path string, to *cid.Cid, unpin bool) error
+	Update(ctx context.Context, path string, to *cid.Cid) error
 
 	// Check if given cid is pinned with given mode, return pin path
 	IsPinPresent(cid *cid.Cid, recursive bool) (string, error)
@@ -367,7 +367,7 @@ func (p *pinner) PrefixedPins(prefix string, recursive bool) (map[string]*cid.Ci
 // Update updates a recursive pin from one cid to another
 // this is more efficient than simply pinning the new one and unpinning the
 // old one
-func (p *pinner) Update(ctx context.Context, path string, to *cid.Cid, unpin bool) error {
+func (p *pinner) Update(ctx context.Context, path string, to *cid.Cid) error {
 
 	c, err := p.GetPin(path, true)
 	if err != nil {