@cryptotaxi247 / kubo / commits / bf804cca6

update to final cmds1.0

License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>

Jeromy committed Jan 8, 2018 at 18:37 UTC bf804cca669f40d8a28fade4e11949a5eaf533ae
29 files changed +57 -57
cmd/ipfs/daemon.go
+2 -2
@@ -23,11 +23,11 @@ import (
23
24 "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net"
25 mprome "gx/ipfs/QmSk46nSD78YiuNojYMS8NW6hSCjH95JajqqzzoychZgef/go-metrics-prometheus"
26 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
26 ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr"
27 "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus"
28 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
29 iconn "gx/ipfs/Qmf82zCaYV8bkztRRoGwwSHVkaYtP2UKBnhpjJz1uFGJjQ/go-libp2p-interface-conn"
30 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
31 )
32
33 const (
@@ -182,7 +182,7 @@ func defaultMux(path string) corehttp.ServeOption {
182 }
183 }
184
185 -func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) {
185 +func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) {
186 // Inject metrics before we do anything
187 err := mprome.Inject()
188 if err != nil {
cmd/ipfs/ipfs.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 commands "github.com/ipfs/go-ipfs/core/commands"
7
8 lgc "github.com/ipfs/go-ipfs/commands/legacy"
9 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
9 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
10 )
11
12 // This is the CLI root, used for executing commands accessible to CLI clients.
cmd/ipfs/main.go
+4 -4
@@ -31,11 +31,11 @@ import (
31 manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net"
32 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
33 loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables"
34 - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
35 - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds/cli"
36 - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds/http"
34 ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr"
35 osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper"
36 + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
37 + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds/cli"
38 + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds/http"
39 )
40
41 // log is the command logger
@@ -105,7 +105,7 @@ func mainRet() int {
105 // so we need to make sure it's stable
106 os.Args[0] = "ipfs"
107
108 - buildEnv := func(ctx context.Context, req *cmds.Request) (interface{}, error) {
108 + buildEnv := func(ctx context.Context, req *cmds.Request) (cmds.Environment, error) {
109 repoPath, err := getRepoPath(req)
110 if err != nil {
111 return nil, err
commands/command.go
+1 -1
@@ -17,8 +17,8 @@ import (
17 "github.com/ipfs/go-ipfs/path"
18
19 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
20 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
20 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
21 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
22 )
23
24 var log = logging.Logger("command")
commands/command_test.go
+1 -1
@@ -3,8 +3,8 @@ package commands
3 import (
4 "testing"
5
6 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
6 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
7 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
8 )
9
10 func noop(req Request, res Response) {
commands/legacy/command.go
+3 -3
@@ -3,7 +3,7 @@ package legacy
3 import (
4 "io"
5
6 - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
6 + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
7
8 oldcmds "github.com/ipfs/go-ipfs/commands"
9 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
@@ -29,7 +29,7 @@ func NewCommand(oldcmd *oldcmds.Command) *cmds.Command {
29 }
30
31 if oldcmd.Run != nil {
32 - cmd.Run = func(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) {
32 + cmd.Run = func(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) {
33 oldReq := &requestWrapper{req, OldContext(env)}
34 res := &fakeResponse{req: oldReq, re: re, wait: make(chan struct{})}
35
@@ -44,7 +44,7 @@ func NewCommand(oldcmd *oldcmds.Command) *cmds.Command {
44 }
45
46 if oldcmd.PreRun != nil {
47 - cmd.PreRun = func(req *cmds.Request, env interface{}) error {
47 + cmd.PreRun = func(req *cmds.Request, env cmds.Environment) error {
48 oldReq := &requestWrapper{req, OldContext(env)}
49 return oldcmd.PreRun(oldReq)
50 }
commands/legacy/legacy.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "io"
5 "runtime/debug"
6
7 - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
7 + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
8
9 oldcmds "github.com/ipfs/go-ipfs/commands"
10 )
commands/legacy/legacy_test.go
+1 -1
@@ -7,8 +7,8 @@ import (
7 "testing"
8
9 oldcmds "github.com/ipfs/go-ipfs/commands"
10 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
10 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
11 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
12 )
13
14 type WriteNopCloser struct {
commands/legacy/request.go
+1 -1
@@ -7,9 +7,9 @@ import (
7 "os"
8 "reflect"
9
10 - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
10 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
11 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files"
12 + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
13
14 oldcmds "github.com/ipfs/go-ipfs/commands"
15 )
commands/legacy/response.go
+1 -1
@@ -7,8 +7,8 @@ import (
7 "reflect"
8 "sync"
9
10 - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
10 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
11 + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
12
13 oldcmds "github.com/ipfs/go-ipfs/commands"
14 )
commands/request.go
+2 -2
@@ -16,9 +16,9 @@ import (
16 "github.com/ipfs/go-ipfs/repo/config"
17 u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util"
18
19 - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
19 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
20 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files"
21 + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
22 )
23
24 type Context struct {
@@ -66,7 +66,7 @@ func (c *Context) NodeWithoutConstructing() *core.IpfsNode {
66 }
67
68 // RootContext returns the node's context.
69 -func (c *Context) RootContext() context.Context {
69 +func (c *Context) Context() context.Context {
70 n, err := c.GetNode()
71 if err != nil {
72 log.Debug("error getting node: ", err)
commands/response.go
+1 -1
@@ -9,8 +9,8 @@ import (
9 "os"
10 "strings"
11
12 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
12 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
13 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
14 )
15
16 // ErrorType signfies a category of errors
commands/response_test.go
+1 -1
@@ -6,8 +6,8 @@ import (
6 "strings"
7 "testing"
8
9 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
9 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
10 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
11 )
12
13 type TestOutput struct {
core/commands/add.go
+3 -3
@@ -18,11 +18,11 @@ import (
18 mfs "github.com/ipfs/go-ipfs/mfs"
19 ft "github.com/ipfs/go-ipfs/unixfs"
20
21 - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
21 mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash"
22 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
23 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files"
24 "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb"
25 + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
26 )
27
28 // ErrDepthLimitExceeded indicates that the max depth has been exceded.
@@ -121,7 +121,7 @@ You can now check what blocks have been created by:
121 cmdkit.IntOption(cidVersionOptionName, "Cid version. Non-zero value will change default of 'raw-leaves' to true. (experimental)").WithDefault(0),
122 cmdkit.StringOption(hashOptionName, "Hash function to use. Will set Cid version to 1 if used. (experimental)").WithDefault("sha2-256"),
123 },
124 - PreRun: func(req *cmds.Request, env interface{}) error {
124 + PreRun: func(req *cmds.Request, env cmds.Environment) error {
125 quiet, _ := req.Options[quietOptionName].(bool)
126 quieter, _ := req.Options[quieterOptionName].(bool)
127 quiet = quiet || quieter
@@ -162,7 +162,7 @@ You can now check what blocks have been created by:
162
163 return nil
164 },
165 - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) {
165 + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
166 n, err := GetNode(env)
167 if err != nil {
168 res.SetError(err, cmdkit.ErrNormal)
core/commands/bitswap.go
+2 -2
@@ -12,10 +12,10 @@ import (
12 decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision"
13
14 "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
15 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
15 peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer"
16 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
17 cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
18 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
19 )
20
21 var BitswapCmd = &cmds.Command{
@@ -139,7 +139,7 @@ var bitswapStatCmd = &cmds.Command{
139 ShortDescription: ``,
140 },
141 Type: bitswap.Stat{},
142 - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) {
142 + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
143 nd, err := GetNode(env)
144 if err != nil {
145 res.SetError(err, cmdkit.ErrNormal)
core/commands/block.go
+6 -6
@@ -11,11 +11,11 @@ import (
11 util "github.com/ipfs/go-ipfs/blocks/blockstore/util"
12 e "github.com/ipfs/go-ipfs/core/commands/e"
13
14 - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
14 mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash"
15 blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format"
16 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
17 cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
18 + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
19 )
20
21 type BlockStat struct {
@@ -61,7 +61,7 @@ on raw IPFS blocks. It outputs the following to stdout:
61 Arguments: []cmdkit.Argument{
62 cmdkit.StringArg("key", true, false, "The base58 multihash of an existing block to stat.").EnableStdin(),
63 },
64 - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) {
64 + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
65 b, err := getBlockForKey(req.Context, env, req.Arguments[0])
66 if err != nil {
67 res.SetError(err, cmdkit.ErrNormal)
@@ -101,7 +101,7 @@ It outputs to stdout, and <key> is a base58 encoded multihash.
101 Arguments: []cmdkit.Argument{
102 cmdkit.StringArg("key", true, false, "The base58 multihash of an existing block to get.").EnableStdin(),
103 },
104 - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) {
104 + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
105 b, err := getBlockForKey(req.Context, env, req.Arguments[0])
106 if err != nil {
107 res.SetError(err, cmdkit.ErrNormal)
@@ -132,7 +132,7 @@ It reads from stdin, and <key> is a base58 encoded multihash.
132 cmdkit.StringOption("mhtype", "multihash hash function").WithDefault("sha2-256"),
133 cmdkit.IntOption("mhlen", "multihash hash length").WithDefault(-1),
134 },
135 - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) {
135 + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
136 n, err := GetNode(env)
137 if err != nil {
138 res.SetError(err, cmdkit.ErrNormal)
@@ -226,7 +226,7 @@ It reads from stdin, and <key> is a base58 encoded multihash.
226 Type: BlockStat{},
227 }
228
229 -func getBlockForKey(ctx context.Context, env interface{}, skey string) (blocks.Block, error) {
229 +func getBlockForKey(ctx context.Context, env cmds.Environment, skey string) (blocks.Block, error) {
230 if len(skey) == 0 {
231 return nil, fmt.Errorf("zero length cid invalid")
232 }
@@ -264,7 +264,7 @@ It takes a list of base58 encoded multihashs to remove.
264 cmdkit.BoolOption("force", "f", "Ignore nonexistent blocks."),
265 cmdkit.BoolOption("quiet", "q", "Write minimal output."),
266 },
267 - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) {
267 + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
268 n, err := GetNode(env)
269 if err != nil {
270 res.SetError(err, cmdkit.ErrNormal)
core/commands/cat.go
+2 -2
@@ -9,8 +9,8 @@ import (
9 core "github.com/ipfs/go-ipfs/core"
10 coreunix "github.com/ipfs/go-ipfs/core/coreunix"
11
12 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
12 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
13 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
14 )
15
16 const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB
@@ -28,7 +28,7 @@ var CatCmd = &cmds.Command{
28 cmdkit.IntOption("offset", "o", "Byte offset to begin reading from."),
29 cmdkit.IntOption("length", "l", "Maximum number of bytes to read."),
30 },
31 - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) {
31 + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
32 node, err := GetNode(env)
33 if err != nil {
34 res.SetError(err, cmdkit.ErrNormal)
core/commands/commands.go
+2 -2
@@ -13,8 +13,8 @@ import (
13
14 e "github.com/ipfs/go-ipfs/core/commands/e"
15
16 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
16 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
17 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
18 )
19
20 type commandEncoder struct {
@@ -68,7 +68,7 @@ func CommandsCmd(root *cmds.Command) *cmds.Command {
68 Options: []cmdkit.Option{
69 cmdkit.BoolOption(flagsOptionName, "f", "Show command flags"),
70 },
71 - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) {
71 + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
72 rootCmd := cmd2outputCmd("ipfs", root)
73 rootCmd.showOpts, _ = req.Options[flagsOptionName].(bool)
74 err := res.Emit(&rootCmd)
core/commands/commands_test.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "strings"
5 "testing"
6
7 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
7 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
8 )
9
10 func collectPaths(prefix string, cmd *cmds.Command, out map[string]struct{}) {
core/commands/filestore.go
+2 -2
@@ -12,9 +12,9 @@ import (
12 "github.com/ipfs/go-ipfs/filestore"
13
14 lgc "github.com/ipfs/go-ipfs/commands/legacy"
15 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
15 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
16 cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
17 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
18 )
19
20 var FileStoreCmd = &cmds.Command{
@@ -53,7 +53,7 @@ The output is:
53 Options: []cmdkit.Option{
54 cmdkit.BoolOption("file-order", "sort the results based on the path of the backing file"),
55 },
56 - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) {
56 + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
57 _, fs, err := getFilestore(env.(*oldCmds.Context))
58 if err != nil {
59 res.SetError(err, cmdkit.ErrNormal)
core/commands/get.go
+3 -3
@@ -16,9 +16,9 @@ import (
16 tar "github.com/ipfs/go-ipfs/thirdparty/tar"
17 uarchive "github.com/ipfs/go-ipfs/unixfs/archive"
18
19 - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
19 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
20 "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb"
21 + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
22 )
23
24 var ErrInvalidCompressionLevel = errors.New("Compression level must be between 1 and 9")
@@ -48,11 +48,11 @@ may also specify the level of compression by specifying '-l=<1-9>'.
48 cmdkit.BoolOption("compress", "C", "Compress the output with GZIP compression."),
49 cmdkit.IntOption("compression-level", "l", "The level of compression (1-9).").WithDefault(-1),
50 },
51 - PreRun: func(req *cmds.Request, env interface{}) error {
51 + PreRun: func(req *cmds.Request, env cmds.Environment) error {
52 _, err := getCompressOptions(req)
53 return err
54 },
55 - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) {
55 + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
56 if len(req.Arguments) == 0 {
57 res.SetError(errors.New("not enough arugments provided"), cmdkit.ErrClient)
58 return
core/commands/get_test.go
+1 -1
@@ -4,8 +4,8 @@ import (
4 "context"
5 "testing"
6
7 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
7 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
8 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
9 )
10
11 func TestGetOutputPath(t *testing.T) {
core/commands/helptext_test.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "strings"
5 "testing"
6
7 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
7 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
8 )
9
10 func checkHelptextRecursive(t *testing.T, name []string, c *cmds.Command) {
core/commands/pubsub.go
+5 -5
@@ -12,11 +12,11 @@ import (
12 core "github.com/ipfs/go-ipfs/core"
13
14 floodsub "gx/ipfs/QmP1T1SGU6276R2MHKP2owbck37Fnzd6ZkpyNJvnG2LoTG/go-libp2p-floodsub"
15 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
15 pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore"
16 blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format"
17 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
18 cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
19 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
20 )
21
22 var PubsubCmd = &cmds.Command{
@@ -70,7 +70,7 @@ This command outputs data in the following encodings:
70 Options: []cmdkit.Option{
71 cmdkit.BoolOption("discover", "try to discover other peers subscribed to the same topic"),
72 },
73 - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) {
73 + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
74 n, err := GetNode(env)
75 if err != nil {
76 res.SetError(err, cmdkit.ErrNormal)
@@ -203,7 +203,7 @@ To use, the daemon must be run with '--enable-pubsub-experiment'.
203 cmdkit.StringArg("topic", true, false, "Topic to publish to."),
204 cmdkit.StringArg("data", true, true, "Payload of message to publish.").EnableStdin(),
205 },
206 - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) {
206 + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
207 n, err := GetNode(env)
208 if err != nil {
209 res.SetError(err, cmdkit.ErrNormal)
@@ -244,7 +244,7 @@ to be used in a production environment.
244 To use, the daemon must be run with '--enable-pubsub-experiment'.
245 `,
246 },
247 - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) {
247 + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
248 n, err := GetNode(env)
249 if err != nil {
250 res.SetError(err, cmdkit.ErrNormal)
@@ -286,7 +286,7 @@ To use, the daemon must be run with '--enable-pubsub-experiment'.
286 Arguments: []cmdkit.Argument{
287 cmdkit.StringArg("topic", false, false, "topic to list connected peers of"),
288 },
289 - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) {
289 + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
290 n, err := GetNode(env)
291 if err != nil {
292 res.SetError(err, cmdkit.ErrNormal)
core/commands/repo.go
+2 -2
@@ -18,9 +18,9 @@ import (
18 lockfile "github.com/ipfs/go-ipfs/repo/fsrepo/lock"
19
20 lgc "github.com/ipfs/go-ipfs/commands/legacy"
21 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
21 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
22 cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
23 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
24 )
25
26 type RepoVersion struct {
@@ -159,7 +159,7 @@ RepoSize int Size in bytes that the repo is currently taking.
159 Version string The repo version.
160 `,
161 },
162 - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) {
162 + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
163 n, err := GetNode(env)
164 if err != nil {
165 res.SetError(err, cmdkit.ErrNormal)
core/commands/root.go
+1 -1
@@ -13,8 +13,8 @@ import (
13
14 lgc "github.com/ipfs/go-ipfs/commands/legacy"
15 logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
16 - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
16 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
17 + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
18 )
19
20 var log = logging.Logger("core/commands")
core/commands/stat.go
+2 -2
@@ -8,11 +8,11 @@ import (
8 "time"
9
10 humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
11 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
11 peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer"
12 protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
13 metrics "gx/ipfs/QmaL2WYJGbWKqHoLujoi9GQ5jj4JVFrBqHUBWmEYzJPVWT/go-libp2p-metrics"
14 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
15 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
16 )
17
18 var StatsCmd = &cmds.Command{
@@ -79,7 +79,7 @@ Example:
79 "ns", "us" (or "µs"), "ms", "s", "m", "h".`).WithDefault("1s"),
80 },
81
82 - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) {
82 + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
83 nd, err := GetNode(env)
84 if err != nil {
85 res.SetError(err, cmdkit.ErrNormal)
core/corehttp/commands.go
+2 -2
@@ -15,8 +15,8 @@ import (
15 path "github.com/ipfs/go-ipfs/path"
16 config "github.com/ipfs/go-ipfs/repo/config"
17
18 - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds"
19 - cmdsHttp "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds/http"
18 + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds"
19 + cmdsHttp "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds/http"
20 )
21
22 var (
package.json
+2 -2
@@ -414,9 +414,9 @@
414 "version": "2.1.2"
415 },
416 {
417 - "hash": "QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr",
417 + "hash": "QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM",
418 "name": "go-ipfs-cmds",
419 - "version": "1.0.0-dev"
419 + "version": "1.0.0"
420 },
421 {
422 "hash": "QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM",