cmd: use go-ipfs-cmds

License: MIT
Signed-off-by: keks <keks@cryptoscope.co>

caching.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 
 	context "context"
+
 	"gx/ipfs/QmRg1gKTHzc3CZXSKzem8aR4E3TubFhbgXwfVuWnSK5CC5/go-metrics-interface"
 )
 

util/remove.go

@@ -85,12 +85,17 @@ func FilterPinned(pins pin.Pinner, out chan<- interface{}, cids []*cid.Cid) []*c
 	return stillOkay
 }
 
-// ProcRmOutput takes the channel returned by RmBlocks and writes
-// to stdout/stderr according to the RemovedBlock objects received in
-// that channel.
-func ProcRmOutput(in <-chan interface{}, sout io.Writer, serr io.Writer) error {
+// ProcRmOutput takes a function which returns a result from RmBlocks or EOF if there is no input.
+// It then writes to stdout/stderr according to the RemovedBlock object returned from the function.
+func ProcRmOutput(next func() (interface{}, error), sout io.Writer, serr io.Writer) error {
 	someFailed := false
-	for res := range in {
+	for {
+		res, err := next()
+		if err == io.EOF {
+			break
+		} else if err != nil {
+			return err
+		}
 		r := res.(*RemovedBlock)
 		if r.Hash == "" && r.Error != "" {
 			return fmt.Errorf("aborted: %s", r.Error)