Remove unpin option from pin.Update

License: MIT
Signed-off-by: Iaroslav Gridin <[email protected]>

Author: Voker57

core/commands/pin.go

@@ -372,26 +372,18 @@ 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{},
+	Options: []cmdkit.Option{},
+	Type:    PinOutput{},
 	Run: func(req cmds.Request, res cmds.Response) {
 		n, err := req.InvocContext().GetNode()
 		if err != nil {
 			res.SetError(err, cmdkit.ErrNormal)
 			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 +403,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

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)
@@ -119,12 +116,3 @@ func (pinOpts) pinType(t string) PinLsOption {
 		return nil
 	}
 }
-
-// Unpin is an option for Pin.Update which specifies whether to remove the old pin.
-// Default is true.
-func (pinOpts) Unpin(unpin bool) PinUpdateOption {
-	return func(settings *PinUpdateSettings) error {
-		settings.Unpin = unpin
-		return nil
-	}
-}

core/coreapi/interface/pin.go

@@ -53,7 +53,7 @@ type PinAPI interface {
 
 	// Update changes one pin to another, skipping checks for matching paths in
 	// the old tree
-	Update(ctx context.Context, from Path, to Path, opts ...options.PinUpdateOption) error
+	Update(ctx context.Context, from string, to Path) error
 
 	// Verify verifies the integrity of pinned objects
 	Verify(context.Context) (<-chan PinStatus, error)

core/coreapi/pin.go

@@ -62,18 +62,12 @@ func (api *PinAPI) Rm(ctx context.Context, p string) error {
 	return nil
 }
 
-func (api *PinAPI) Update(ctx context.Context, from string, to coreiface.Path, opts ...caopts.PinUpdateOption) error {
-	settings, err := caopts.PinUpdateOptions(opts...)
-	if err != nil {
-		return err
-	}
-
+func (api *PinAPI) Update(ctx context.Context, from string, to coreiface.Path) error {
 	tp, err := api.core().ResolvePath(ctx, to)
 	if err != nil {
 		return err
 	}
-
-	return api.node.Pinning.Update(ctx, from, tp.Cid(), settings.Unpin)
+	return api.node.Pinning.Update(ctx, from, tp.Cid())
 }
 
 type pinStatus struct {

pin/pin.go

@@ -65,7 +65,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)
@@ -357,7 +357,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 {