From bf804cca669f40d8a28fade4e11949a5eaf533ae Mon Sep 17 00:00:00 2001 From: Jeromy Date: Mon, 8 Jan 2018 18:37:46 -0800 Subject: [PATCH] update to final cmds1.0 License: MIT Signed-off-by: Jeromy --- cmd/ipfs/daemon.go | 4 ++-- cmd/ipfs/ipfs.go | 2 +- cmd/ipfs/main.go | 8 ++++---- commands/command.go | 2 +- commands/command_test.go | 2 +- commands/legacy/command.go | 6 +++--- commands/legacy/legacy.go | 2 +- commands/legacy/legacy_test.go | 2 +- commands/legacy/request.go | 2 +- commands/legacy/response.go | 2 +- commands/request.go | 4 ++-- commands/response.go | 2 +- commands/response_test.go | 2 +- core/commands/add.go | 6 +++--- core/commands/bitswap.go | 4 ++-- core/commands/block.go | 12 ++++++------ core/commands/cat.go | 4 ++-- core/commands/commands.go | 4 ++-- core/commands/commands_test.go | 2 +- core/commands/filestore.go | 4 ++-- core/commands/get.go | 6 +++--- core/commands/get_test.go | 2 +- core/commands/helptext_test.go | 2 +- core/commands/pubsub.go | 10 +++++----- core/commands/repo.go | 4 ++-- core/commands/root.go | 2 +- core/commands/stat.go | 4 ++-- core/corehttp/commands.go | 4 ++-- package.json | 4 ++-- 29 files changed, 57 insertions(+), 57 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 92bac0f98..65e2a8155 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -23,11 +23,11 @@ import ( "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" mprome "gx/ipfs/QmSk46nSD78YiuNojYMS8NW6hSCjH95JajqqzzoychZgef/go-metrics-prometheus" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" iconn "gx/ipfs/Qmf82zCaYV8bkztRRoGwwSHVkaYtP2UKBnhpjJz1uFGJjQ/go-libp2p-interface-conn" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) const ( @@ -182,7 +182,7 @@ func defaultMux(path string) corehttp.ServeOption { } } -func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) { +func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) { // Inject metrics before we do anything err := mprome.Inject() if err != nil { diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index 2350091bc..38fa59427 100644 --- a/cmd/ipfs/ipfs.go +++ b/cmd/ipfs/ipfs.go @@ -6,7 +6,7 @@ import ( commands "github.com/ipfs/go-ipfs/core/commands" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) // This is the CLI root, used for executing commands accessible to CLI clients. diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 7cf9af65d..88e5a1913 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -31,11 +31,11 @@ import ( manet "gx/ipfs/QmSGL5Uoa6gKHgBBwQG8u1CWKUC8ZnwaZiLgFVTFBR2bxr/go-multiaddr-net" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" loggables "gx/ipfs/QmSvcDkiRwB8LuMhUtnvhum2C851Mproo75ZDD19jx43tD/go-libp2p-loggables" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds/cli" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds/http" ma "gx/ipfs/QmW8s4zTsUoX1Q6CeYxVKPyqSKbF7H1YDUyTostBtZ8DaG/go-multiaddr" osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds/cli" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds/http" ) // log is the command logger @@ -105,7 +105,7 @@ func mainRet() int { // so we need to make sure it's stable os.Args[0] = "ipfs" - buildEnv := func(ctx context.Context, req *cmds.Request) (interface{}, error) { + buildEnv := func(ctx context.Context, req *cmds.Request) (cmds.Environment, error) { repoPath, err := getRepoPath(req) if err != nil { return nil, err diff --git a/commands/command.go b/commands/command.go index 0150b00aa..769dca39c 100644 --- a/commands/command.go +++ b/commands/command.go @@ -17,8 +17,8 @@ import ( "github.com/ipfs/go-ipfs/path" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var log = logging.Logger("command") diff --git a/commands/command_test.go b/commands/command_test.go index 966d642e9..37ddb6987 100644 --- a/commands/command_test.go +++ b/commands/command_test.go @@ -3,8 +3,8 @@ package commands import ( "testing" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) func noop(req Request, res Response) { diff --git a/commands/legacy/command.go b/commands/legacy/command.go index aec620cdd..055ac3d0d 100644 --- a/commands/legacy/command.go +++ b/commands/legacy/command.go @@ -3,7 +3,7 @@ package legacy import ( "io" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" @@ -29,7 +29,7 @@ func NewCommand(oldcmd *oldcmds.Command) *cmds.Command { } if oldcmd.Run != nil { - cmd.Run = func(req *cmds.Request, re cmds.ResponseEmitter, env interface{}) { + cmd.Run = func(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) { oldReq := &requestWrapper{req, OldContext(env)} res := &fakeResponse{req: oldReq, re: re, wait: make(chan struct{})} @@ -44,7 +44,7 @@ func NewCommand(oldcmd *oldcmds.Command) *cmds.Command { } if oldcmd.PreRun != nil { - cmd.PreRun = func(req *cmds.Request, env interface{}) error { + cmd.PreRun = func(req *cmds.Request, env cmds.Environment) error { oldReq := &requestWrapper{req, OldContext(env)} return oldcmd.PreRun(oldReq) } diff --git a/commands/legacy/legacy.go b/commands/legacy/legacy.go index 9051ce318..449eccb75 100644 --- a/commands/legacy/legacy.go +++ b/commands/legacy/legacy.go @@ -4,7 +4,7 @@ import ( "io" "runtime/debug" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/legacy_test.go b/commands/legacy/legacy_test.go index bf7b6a8bb..27738b70a 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -7,8 +7,8 @@ import ( "testing" oldcmds "github.com/ipfs/go-ipfs/commands" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) type WriteNopCloser struct { diff --git a/commands/legacy/request.go b/commands/legacy/request.go index 705d7756f..0005176a6 100644 --- a/commands/legacy/request.go +++ b/commands/legacy/request.go @@ -7,9 +7,9 @@ import ( "os" "reflect" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/legacy/response.go b/commands/legacy/response.go index f1b7d2438..64ef34850 100644 --- a/commands/legacy/response.go +++ b/commands/legacy/response.go @@ -7,8 +7,8 @@ import ( "reflect" "sync" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" ) diff --git a/commands/request.go b/commands/request.go index 0991199b9..0962e0080 100644 --- a/commands/request.go +++ b/commands/request.go @@ -16,9 +16,9 @@ import ( "github.com/ipfs/go-ipfs/repo/config" u "gx/ipfs/QmPsAfmDBnZN3kZGSuNwvCNDZiHneERSKmRcFyG3UkvcT3/go-ipfs-util" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) type Context struct { @@ -66,7 +66,7 @@ func (c *Context) NodeWithoutConstructing() *core.IpfsNode { } // RootContext returns the node's context. -func (c *Context) RootContext() context.Context { +func (c *Context) Context() context.Context { n, err := c.GetNode() if err != nil { log.Debug("error getting node: ", err) diff --git a/commands/response.go b/commands/response.go index 0872b37af..114136755 100644 --- a/commands/response.go +++ b/commands/response.go @@ -9,8 +9,8 @@ import ( "os" "strings" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) // ErrorType signfies a category of errors diff --git a/commands/response_test.go b/commands/response_test.go index a6a58f1d7..2a6c84d9f 100644 --- a/commands/response_test.go +++ b/commands/response_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) type TestOutput struct { diff --git a/core/commands/add.go b/core/commands/add.go index 5db31c8a2..aa2b50bb1 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -18,11 +18,11 @@ import ( mfs "github.com/ipfs/go-ipfs/mfs" ft "github.com/ipfs/go-ipfs/unixfs" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) // ErrDepthLimitExceeded indicates that the max depth has been exceded. @@ -121,7 +121,7 @@ You can now check what blocks have been created by: cmdkit.IntOption(cidVersionOptionName, "Cid version. Non-zero value will change default of 'raw-leaves' to true. (experimental)").WithDefault(0), cmdkit.StringOption(hashOptionName, "Hash function to use. Will set Cid version to 1 if used. (experimental)").WithDefault("sha2-256"), }, - PreRun: func(req *cmds.Request, env interface{}) error { + PreRun: func(req *cmds.Request, env cmds.Environment) error { quiet, _ := req.Options[quietOptionName].(bool) quieter, _ := req.Options[quieterOptionName].(bool) quiet = quiet || quieter @@ -162,7 +162,7 @@ You can now check what blocks have been created by: return nil }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index 72d744177..e0dd6a227 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -12,10 +12,10 @@ import ( decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision" "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var BitswapCmd = &cmds.Command{ @@ -139,7 +139,7 @@ var bitswapStatCmd = &cmds.Command{ ShortDescription: ``, }, Type: bitswap.Stat{}, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { nd, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/commands/block.go b/core/commands/block.go index caccac309..a15136d8e 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -11,11 +11,11 @@ import ( util "github.com/ipfs/go-ipfs/blocks/blockstore/util" e "github.com/ipfs/go-ipfs/core/commands/e" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" mh "gx/ipfs/QmYeKnKpubCMRiq3PGZcTREErthbb5Q9cXsCoSkD9bjEBd/go-multihash" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) type BlockStat struct { @@ -61,7 +61,7 @@ on raw IPFS blocks. It outputs the following to stdout: Arguments: []cmdkit.Argument{ cmdkit.StringArg("key", true, false, "The base58 multihash of an existing block to stat.").EnableStdin(), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { b, err := getBlockForKey(req.Context, env, req.Arguments[0]) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -101,7 +101,7 @@ It outputs to stdout, and is a base58 encoded multihash. Arguments: []cmdkit.Argument{ cmdkit.StringArg("key", true, false, "The base58 multihash of an existing block to get.").EnableStdin(), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { b, err := getBlockForKey(req.Context, env, req.Arguments[0]) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -132,7 +132,7 @@ It reads from stdin, and is a base58 encoded multihash. cmdkit.StringOption("mhtype", "multihash hash function").WithDefault("sha2-256"), cmdkit.IntOption("mhlen", "multihash hash length").WithDefault(-1), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -226,7 +226,7 @@ It reads from stdin, and is a base58 encoded multihash. Type: BlockStat{}, } -func getBlockForKey(ctx context.Context, env interface{}, skey string) (blocks.Block, error) { +func getBlockForKey(ctx context.Context, env cmds.Environment, skey string) (blocks.Block, error) { if len(skey) == 0 { return nil, fmt.Errorf("zero length cid invalid") } @@ -264,7 +264,7 @@ It takes a list of base58 encoded multihashs to remove. cmdkit.BoolOption("force", "f", "Ignore nonexistent blocks."), cmdkit.BoolOption("quiet", "q", "Write minimal output."), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/commands/cat.go b/core/commands/cat.go index 5ac043ac0..b1a282298 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -9,8 +9,8 @@ import ( core "github.com/ipfs/go-ipfs/core" coreunix "github.com/ipfs/go-ipfs/core/coreunix" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) const progressBarMinSize = 1024 * 1024 * 8 // show progress bar for outputs > 8MiB @@ -28,7 +28,7 @@ var CatCmd = &cmds.Command{ cmdkit.IntOption("offset", "o", "Byte offset to begin reading from."), cmdkit.IntOption("length", "l", "Maximum number of bytes to read."), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { node, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/commands/commands.go b/core/commands/commands.go index 02ca2266d..d50a9e32e 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -13,8 +13,8 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) type commandEncoder struct { @@ -68,7 +68,7 @@ func CommandsCmd(root *cmds.Command) *cmds.Command { Options: []cmdkit.Option{ cmdkit.BoolOption(flagsOptionName, "f", "Show command flags"), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { rootCmd := cmd2outputCmd("ipfs", root) rootCmd.showOpts, _ = req.Options[flagsOptionName].(bool) err := res.Emit(&rootCmd) diff --git a/core/commands/commands_test.go b/core/commands/commands_test.go index db5ec744a..b16a48a07 100644 --- a/core/commands/commands_test.go +++ b/core/commands/commands_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) func collectPaths(prefix string, cmd *cmds.Command, out map[string]struct{}) { diff --git a/core/commands/filestore.go b/core/commands/filestore.go index e8a5dd795..916f8d439 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -12,9 +12,9 @@ import ( "github.com/ipfs/go-ipfs/filestore" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var FileStoreCmd = &cmds.Command{ @@ -53,7 +53,7 @@ The output is: Options: []cmdkit.Option{ cmdkit.BoolOption("file-order", "sort the results based on the path of the backing file"), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { _, fs, err := getFilestore(env.(*oldCmds.Context)) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/commands/get.go b/core/commands/get.go index 84f72ac8e..2706447d9 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -16,9 +16,9 @@ import ( tar "github.com/ipfs/go-ipfs/thirdparty/tar" uarchive "github.com/ipfs/go-ipfs/unixfs/archive" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) 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>'. cmdkit.BoolOption("compress", "C", "Compress the output with GZIP compression."), cmdkit.IntOption("compression-level", "l", "The level of compression (1-9).").WithDefault(-1), }, - PreRun: func(req *cmds.Request, env interface{}) error { + PreRun: func(req *cmds.Request, env cmds.Environment) error { _, err := getCompressOptions(req) return err }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { if len(req.Arguments) == 0 { res.SetError(errors.New("not enough arugments provided"), cmdkit.ErrClient) return diff --git a/core/commands/get_test.go b/core/commands/get_test.go index bf838dc3f..2cf930725 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) func TestGetOutputPath(t *testing.T) { diff --git a/core/commands/helptext_test.go b/core/commands/helptext_test.go index 0ec2b2929..d3ea78d7e 100644 --- a/core/commands/helptext_test.go +++ b/core/commands/helptext_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) func checkHelptextRecursive(t *testing.T, name []string, c *cmds.Command) { diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index 6fbf971a8..84f6670ae 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -12,11 +12,11 @@ import ( core "github.com/ipfs/go-ipfs/core" floodsub "gx/ipfs/QmP1T1SGU6276R2MHKP2owbck37Fnzd6ZkpyNJvnG2LoTG/go-libp2p-floodsub" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" pstore "gx/ipfs/QmYijbtjCxFEjSXaudaQAUz3LN5VKLssm8WCUsRoqzXmQR/go-libp2p-peerstore" blocks "gx/ipfs/QmYsEQydGrsxNZfAiskvQ76N2xE9hDQtSAkRSynwMiUK3c/go-block-format" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var PubsubCmd = &cmds.Command{ @@ -70,7 +70,7 @@ This command outputs data in the following encodings: Options: []cmdkit.Option{ cmdkit.BoolOption("discover", "try to discover other peers subscribed to the same topic"), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -203,7 +203,7 @@ To use, the daemon must be run with '--enable-pubsub-experiment'. cmdkit.StringArg("topic", true, false, "Topic to publish to."), cmdkit.StringArg("data", true, true, "Payload of message to publish.").EnableStdin(), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -244,7 +244,7 @@ to be used in a production environment. To use, the daemon must be run with '--enable-pubsub-experiment'. `, }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) @@ -286,7 +286,7 @@ To use, the daemon must be run with '--enable-pubsub-experiment'. Arguments: []cmdkit.Argument{ cmdkit.StringArg("topic", false, false, "topic to list connected peers of"), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/commands/repo.go b/core/commands/repo.go index 4e1de94e8..b2e419347 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -18,9 +18,9 @@ import ( lockfile "github.com/ipfs/go-ipfs/repo/fsrepo/lock" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) type RepoVersion struct { @@ -159,7 +159,7 @@ RepoSize int Size in bytes that the repo is currently taking. Version string The repo version. `, }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { n, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/commands/root.go b/core/commands/root.go index d39fae5c1..03a10f803 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -13,8 +13,8 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var log = logging.Logger("core/commands") diff --git a/core/commands/stat.go b/core/commands/stat.go index 3832d9652..1350be497 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -8,11 +8,11 @@ import ( "time" humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" peer "gx/ipfs/QmWNY7dV54ZDYmTA1ykVdwNCqC11mpU4zSUp6XDpLTH9eG/go-libp2p-peer" protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" metrics "gx/ipfs/QmaL2WYJGbWKqHoLujoi9GQ5jj4JVFrBqHUBWmEYzJPVWT/go-libp2p-metrics" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" ) var StatsCmd = &cmds.Command{ @@ -79,7 +79,7 @@ Example: "ns", "us" (or "µs"), "ms", "s", "m", "h".`).WithDefault("1s"), }, - Run: func(req *cmds.Request, res cmds.ResponseEmitter, env interface{}) { + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) { nd, err := GetNode(env) if err != nil { res.SetError(err, cmdkit.ErrNormal) diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index 8c245ca8e..b299a437d 100644 --- a/core/corehttp/commands.go +++ b/core/corehttp/commands.go @@ -15,8 +15,8 @@ import ( path "github.com/ipfs/go-ipfs/path" config "github.com/ipfs/go-ipfs/repo/config" - cmds "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds" - cmdsHttp "gx/ipfs/QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr/go-ipfs-cmds/http" + cmds "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds" + cmdsHttp "gx/ipfs/QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM/go-ipfs-cmds/http" ) var ( diff --git a/package.json b/package.json index 63786352f..77ea65efb 100644 --- a/package.json +++ b/package.json @@ -414,9 +414,9 @@ "version": "2.1.2" }, { - "hash": "QmVs8An1faiQrNXtY8e51o5ssnrQs3YYBUfPbCMo34onJr", + "hash": "QmfVXM8xWBJZZMC3mJkv64dkWUeoqGKTcKDSMtiJ6AdZXM", "name": "go-ipfs-cmds", - "version": "1.0.0-dev" + "version": "1.0.0" }, { "hash": "QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM",