fmt
License: MIT Signed-off-by: keks <keks@cryptoscope.co>
keks committed
Nov 30, 2017 at 17:11 UTC
9965861b867492e6cbff4180ec258b06bcc8c303
9 files changed
+6
-15
cmd/ipfs/daemon.go
+4
-3
@@ -12,8 +12,9 @@ import (
12
"sync"
13
14
utilmain "github.com/ipfs/go-ipfs/cmd/ipfs/util"
15
+ oldcmds "github.com/ipfs/go-ipfs/commands"
16
"github.com/ipfs/go-ipfs/core"
16
- oldcmds "github.com/ipfs/go-ipfs/core/commands"
17
+ commands "github.com/ipfs/go-ipfs/core/commands"
18
corehttp "github.com/ipfs/go-ipfs/core/corehttp"
19
corerepo "github.com/ipfs/go-ipfs/core/corerepo"
20
nodeMount "github.com/ipfs/go-ipfs/fuse/node"
@@ -279,7 +280,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) {
280
}
281
282
offline, _ := req.Options[offlineKwd].(bool)
282
- ipnsps, _, _ := req.Options[enableIPNSPubSubKwd].(bool)
283
+ ipnsps, _ := req.Options[enableIPNSPubSubKwd].(bool)
284
pubsub, _ := req.Options[enableFloodSubKwd].(bool)
285
mplex, _ := req.Options[enableMultiplexKwd].(bool)
286
@@ -403,7 +404,7 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error
404
return fmt.Errorf("serveHTTPApi: GetConfig() failed: %s", err), nil
405
}
406
406
- apiAddr, _ := req.Options[oldcmds.ApiOption].(string)
407
+ apiAddr, _ := req.Options[commands.ApiOption].(string)
408
if apiAddr == "" {
409
apiAddr = cfg.Addresses.API
410
}
cmd/ipfs/main.go
-4
@@ -26,11 +26,7 @@ import (
26
config "github.com/ipfs/go-ipfs/repo/config"
27
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
28
29
- "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds"
30
- "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds/cli"
31
- "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds/http"
29
u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util"
33
- "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit"
30
manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net"
31
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
32
loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables"
cmd/ipfswatch/main.go
-1
@@ -18,7 +18,6 @@ import (
18
19
homedir "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir"
20
21
- commands "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds"
21
process "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
22
fsnotify "gx/ipfs/QmczzCMvJ3HV57WBKDy8b4ucp7quT325JjDbixYRS5Pwvv/fsnotify.v1"
23
)
core/commands/add.go
-1
@@ -18,7 +18,6 @@ import (
18
mfs "github.com/ipfs/go-ipfs/mfs"
19
ft "github.com/ipfs/go-ipfs/unixfs"
20
21
- "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit/files"
21
"gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds"
22
"gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit"
23
"gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit/files"
core/commands/bitswap.go
-1
@@ -11,7 +11,6 @@ import (
11
bitswap "github.com/ipfs/go-ipfs/exchange/bitswap"
12
decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision"
13
14
- cmds "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds"
14
"gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
15
cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds"
16
cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit"
core/commands/id.go
-1
@@ -16,7 +16,6 @@ import (
16
b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58"
17
"gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit"
18
"gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer"
19
- "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
19
pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore"
20
identify "gx/ipfs/Qma23bpHwQrQyvKeBemaeJh7sAoRHggPkgnge1B9489ff5/go-libp2p/p2p/protocol/identify"
21
ic "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto"
core/commands/ipnsps.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
e "github.com/ipfs/go-ipfs/core/commands/e"
11
ns "github.com/ipfs/go-ipfs/namesys"
12
13
- cmdkit "gx/ipfs/QmQp2a2Hhb7F6eK2A5hN8f9aJy4mtkEikL9Zj4cgB7d1dD/go-ipfs-cmdkit"
13
+ "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit"
14
)
15
16
type ipnsPubsubState struct {
core/commands/pin.go
+1
-2
@@ -16,9 +16,8 @@ import (
16
pin "github.com/ipfs/go-ipfs/pin"
17
uio "github.com/ipfs/go-ipfs/unixfs/io"
18
19
- cid "gx/ipfs/QmNp85zy9RLrQ5oQD4hPyS39ezrrXpcaa7R4Y9kxdWQLLQ/go-cid"
19
u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util"
21
- u "gx/ipfs/QmSU6eubNdhXjFBJBSksTp8kv8YRub8mGAPv8tVJHmL2EU/go-ipfs-util"
20
+ "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit"
21
cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
22
)
23
core/commands/stat.go
-1
@@ -7,7 +7,6 @@ import (
7
"os"
8
"time"
9
10
- cmds "gx/ipfs/QmP9vZfc5WSjfGTXmwX2EcicMFzmZ6fXn7HTdKYat6ccmH/go-ipfs-cmds"
10
humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
11
cmds "gx/ipfs/QmTwKPLyeRKuDawuy6CAn1kRj1FVoqBEM8sviAUWN7NW9K/go-ipfs-cmds"
12
cmdkit "gx/ipfs/QmVD1W3MC8Hk1WZgFQPWWmBECJ3X72BgUYf9eCQ4PGzPps/go-ipfs-cmdkit"