cmds/pin: fix pin imports
* Name them. Unfortunately, This makes the *actual* package names clear. I know this isn't "idiomatic go" but it's idiomatic go-ipfs. * Remove the duplicate import. License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
Jan 29, 2019 at 11:27 UTC
e2ab620f81f9fc374775159991842d8d814924e8
1 file changed
+15
-16
core/commands/pin.go
+15
-16
@@ -7,22 +7,21 @@ import (
7
"os"
8
"time"
9
10
- "github.com/ipfs/go-ipfs/core"
11
- "github.com/ipfs/go-ipfs/core/commands/cmdenv"
12
- "github.com/ipfs/go-ipfs/core/commands/e"
13
- "github.com/ipfs/go-ipfs/core/coreapi/interface"
10
+ core "github.com/ipfs/go-ipfs/core"
11
+ cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
12
+ e "github.com/ipfs/go-ipfs/core/commands/e"
13
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
15
- "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
16
- "github.com/ipfs/go-ipfs/pin"
14
+ options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
15
+ pin "github.com/ipfs/go-ipfs/pin"
16
18
- "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
17
+ cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
18
bserv "gx/ipfs/QmVKQHuzni68SWByzJgBUCwHvvr4TWiXfutNWWwpZpp4rE/go-blockservice"
20
- "gx/ipfs/QmWGm4AbZEbnmdgVTza52MSNpEmBdFVqzmAysRbjrRyGbH/go-ipfs-cmds"
21
- "gx/ipfs/QmYMQuypUbgsdNHmuCBSUJV6wdQVsBHRivNAp3efHJwZJD/go-verifcid"
22
- "gx/ipfs/QmYZwey1thDTynSrvd6qQkX24UpTka6TFhQ2v569UpoqxD/go-ipfs-exchange-offline"
19
+ cmds "gx/ipfs/QmWGm4AbZEbnmdgVTza52MSNpEmBdFVqzmAysRbjrRyGbH/go-ipfs-cmds"
20
+ verifcid "gx/ipfs/QmYMQuypUbgsdNHmuCBSUJV6wdQVsBHRivNAp3efHJwZJD/go-verifcid"
21
+ offline "gx/ipfs/QmYZwey1thDTynSrvd6qQkX24UpTka6TFhQ2v569UpoqxD/go-ipfs-exchange-offline"
22
dag "gx/ipfs/Qmb2UEG2TAeVrEJSjqsZF7Y2he7wRDkrdt6c3bECxwZf4k/go-merkledag"
24
- "gx/ipfs/QmdPQx9fvN5ExVwMhRmh7YpCQJzJrFhd1AjVBwJmRMFJeX/go-cidutil/cidenc"
25
- "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
23
+ cidenc "gx/ipfs/QmdPQx9fvN5ExVwMhRmh7YpCQJzJrFhd1AjVBwJmRMFJeX/go-cidutil/cidenc"
24
+ cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
25
)
26
27
var PinCmd = &cmds.Command{
@@ -418,12 +417,12 @@ new pin and removing the old one.
417
418
unpin, _ := req.Options[pinUnpinOptionName].(bool)
419
421
- from, err := iface.ParsePath(req.Arguments[0])
420
+ from, err := coreiface.ParsePath(req.Arguments[0])
421
if err != nil {
422
return err
423
}
424
426
- to, err := iface.ParsePath(req.Arguments[1])
425
+ to, err := coreiface.ParsePath(req.Arguments[1])
426
if err != nil {
427
return err
428
}
@@ -505,7 +504,7 @@ type RefKeyList struct {
504
Keys map[string]RefKeyObject
505
}
506
508
-func pinLsKeys(ctx context.Context, args []string, typeStr string, n *core.IpfsNode, api iface.CoreAPI) (map[cid.Cid]RefKeyObject, error) {
507
+func pinLsKeys(ctx context.Context, args []string, typeStr string, n *core.IpfsNode, api coreiface.CoreAPI) (map[cid.Cid]RefKeyObject, error) {
508
509
mode, ok := pin.StringToMode(typeStr)
510
if !ok {
@@ -515,7 +514,7 @@ func pinLsKeys(ctx context.Context, args []string, typeStr string, n *core.IpfsN
514
keys := make(map[cid.Cid]RefKeyObject)
515
516
for _, p := range args {
518
- pth, err := iface.ParsePath(p)
517
+ pth, err := coreiface.ParsePath(p)
518
if err != nil {
519
return nil, err
520
}