From f8ae7474c707d1891f6fe1ada92e8e6cf49616e1 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Sat, 17 Mar 2018 12:22:20 -0700 Subject: [PATCH] pre-populate required arguments from request body This way, we can always assume that indexing a required argument works. Also: * test that the command tree doesn't have any obvious bugs (duplicate options, arguments in the wrong order, etc). * simplify the usage ParseBodyArgs. fixes #4823 License: MIT Signed-off-by: Steven Allen --- cmd/ipfs/daemon.go | 2 +- cmd/ipfs/ipfs.go | 2 +- cmd/ipfs/main.go | 6 +++--- commands/legacy/command.go | 2 +- commands/legacy/legacy.go | 2 +- commands/legacy/legacy_test.go | 2 +- commands/legacy/request.go | 2 +- commands/legacy/response.go | 2 +- commands/request.go | 2 +- core/commands/add.go | 2 +- core/commands/bitswap.go | 2 +- core/commands/block.go | 2 +- core/commands/cat.go | 4 ++-- core/commands/commands.go | 2 +- core/commands/commands_test.go | 2 +- core/commands/files.go | 2 +- core/commands/filestore.go | 2 +- core/commands/get.go | 2 +- core/commands/get_test.go | 2 +- core/commands/helptext_test.go | 2 +- core/commands/object/object.go | 2 +- core/commands/object/patch.go | 2 +- core/commands/pubsub.go | 4 ++-- core/commands/repo.go | 2 +- core/commands/root.go | 2 +- core/commands/root_test.go | 22 ++++++++++++++++++++++ core/commands/stat.go | 2 +- core/corehttp/commands.go | 4 ++-- package.json | 4 ++-- 29 files changed, 56 insertions(+), 34 deletions(-) create mode 100644 core/commands/root_test.go diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 9bb1eaebbc2..3c5cec63609 100644 --- a/cmd/ipfs/daemon.go +++ b/cmd/ipfs/daemon.go @@ -24,9 +24,9 @@ import ( "gx/ipfs/QmRK2LxanhK2gZq6k6R7vk5ZoYZk8ULSSTB7FzDsMUX6CB/go-multiaddr-net" mprome "gx/ipfs/QmSTf3wJXBQk2fxdmXtodvyczrCPgJaK1B1maY78qeebNX/go-metrics-prometheus" iconn "gx/ipfs/QmToCvh5eJtoDheMggre7b2zeFCJ6tAyB82YVs457cqoUE/go-libp2p-interface-conn" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" ma "gx/ipfs/QmWWQ2Txc2c6tqjsBpzg5Ar652cHPGNsQQp2SejkNmkUMb/go-multiaddr" "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus" - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) diff --git a/cmd/ipfs/ipfs.go b/cmd/ipfs/ipfs.go index f03812bedee..0595b1e2a2d 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/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/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 a1497f65424..6e7899f28d9 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -30,11 +30,11 @@ import ( u "gx/ipfs/QmNiJuT8Ja3hMVpBHXv3Q6dwmperaQ6JjLtpMQgMCD7xvx/go-ipfs-util" manet "gx/ipfs/QmRK2LxanhK2gZq6k6R7vk5ZoYZk8ULSSTB7FzDsMUX6CB/go-multiaddr-net" logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log" + "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" + "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds/cli" + "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds/http" ma "gx/ipfs/QmWWQ2Txc2c6tqjsBpzg5Ar652cHPGNsQQp2SejkNmkUMb/go-multiaddr" osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper" - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds/cli" - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds/http" loggables "gx/ipfs/Qmf9JgVLz46pxPXwG2eWSJpkqVCcjD4rp7zCRi2KP6GTNB/go-libp2p-loggables" ) diff --git a/commands/legacy/command.go b/commands/legacy/command.go index f6a042101fa..5018e9992c5 100644 --- a/commands/legacy/command.go +++ b/commands/legacy/command.go @@ -3,7 +3,7 @@ package legacy import ( "io" - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" oldcmds "github.com/ipfs/go-ipfs/commands" logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log" diff --git a/commands/legacy/legacy.go b/commands/legacy/legacy.go index 84683e34150..39636d6fbac 100644 --- a/commands/legacy/legacy.go +++ b/commands/legacy/legacy.go @@ -4,7 +4,7 @@ import ( "io" "runtime/debug" - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/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 efcbae5a9fd..3df2fd1acb7 100644 --- a/commands/legacy/legacy_test.go +++ b/commands/legacy/legacy_test.go @@ -7,7 +7,7 @@ import ( "testing" oldcmds "github.com/ipfs/go-ipfs/commands" - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) diff --git a/commands/legacy/request.go b/commands/legacy/request.go index 01a8d5a71e7..f7dd7d35e9e 100644 --- a/commands/legacy/request.go +++ b/commands/legacy/request.go @@ -7,7 +7,7 @@ import ( "os" "reflect" - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" diff --git a/commands/legacy/response.go b/commands/legacy/response.go index aa55ab189ce..ca848f0e9a9 100644 --- a/commands/legacy/response.go +++ b/commands/legacy/response.go @@ -7,7 +7,7 @@ import ( "reflect" "sync" - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" oldcmds "github.com/ipfs/go-ipfs/commands" diff --git a/commands/request.go b/commands/request.go index ebacbd6773d..d4ee8e88d00 100644 --- a/commands/request.go +++ b/commands/request.go @@ -9,7 +9,7 @@ import ( "github.com/ipfs/go-ipfs/core" "github.com/ipfs/go-ipfs/repo/config" - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" ) diff --git a/core/commands/add.go b/core/commands/add.go index 71c4515c2fe..4a82f6e3a04 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -17,8 +17,8 @@ import ( ft "github.com/ipfs/go-ipfs/unixfs" bstore "gx/ipfs/QmTVDM4LCSUMFNQzbDLL9zQwp8usE6QHymFdh3h8vL9v6b/go-ipfs-blockstore" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" mh "gx/ipfs/QmZyZDi491cCNTLfAhwcaDii2Kg4pwKRkhqQzURGDvY6ua/go-multihash" - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" files "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files" pb "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go index d5d58f7dea7..cbd0cd9c499 100644 --- a/core/commands/bitswap.go +++ b/core/commands/bitswap.go @@ -12,8 +12,8 @@ import ( decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision" "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer" - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) diff --git a/core/commands/block.go b/core/commands/block.go index b593f562306..729d535925a 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -11,8 +11,8 @@ import ( util "github.com/ipfs/go-ipfs/blocks/blockstoreutil" e "github.com/ipfs/go-ipfs/core/commands/e" + "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" mh "gx/ipfs/QmZyZDi491cCNTLfAhwcaDii2Kg4pwKRkhqQzURGDvY6ua/go-multihash" - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format" diff --git a/core/commands/cat.go b/core/commands/cat.go index 87c1ec4a8f3..9f45edffafb 100644 --- a/core/commands/cat.go +++ b/core/commands/cat.go @@ -9,7 +9,7 @@ import ( core "github.com/ipfs/go-ipfs/core" coreunix "github.com/ipfs/go-ipfs/core/coreunix" - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) @@ -62,7 +62,7 @@ var CatCmd = &cmds.Command{ } err = req.ParseBodyArgs() - if err != nil && !cmds.IsAllArgsAlreadyCovered(err) { + if err != nil { res.SetError(err, cmdkit.ErrNormal) return } diff --git a/core/commands/commands.go b/core/commands/commands.go index 46f5da1a4c3..34f65a2f7c8 100644 --- a/core/commands/commands.go +++ b/core/commands/commands.go @@ -13,7 +13,7 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) diff --git a/core/commands/commands_test.go b/core/commands/commands_test.go index 40d24fa3751..2ff7db54574 100644 --- a/core/commands/commands_test.go +++ b/core/commands/commands_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" ) func collectPaths(prefix string, cmd *cmds.Command, out map[string]struct{}) { diff --git a/core/commands/files.go b/core/commands/files.go index 349ca6417ee..1a2a135b7a9 100644 --- a/core/commands/files.go +++ b/core/commands/files.go @@ -25,8 +25,8 @@ import ( humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" mh "gx/ipfs/QmZyZDi491cCNTLfAhwcaDii2Kg4pwKRkhqQzURGDvY6ua/go-multihash" - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format" diff --git a/core/commands/filestore.go b/core/commands/filestore.go index d8fccb9b8cf..2f4ae272add 100644 --- a/core/commands/filestore.go +++ b/core/commands/filestore.go @@ -12,7 +12,7 @@ import ( "github.com/ipfs/go-ipfs/filestore" lgc "github.com/ipfs/go-ipfs/commands/legacy" - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) diff --git a/core/commands/get.go b/core/commands/get.go index e8716f580b4..6baaa2c7ca4 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -16,7 +16,7 @@ import ( tar "github.com/ipfs/go-ipfs/thirdparty/tar" uarchive "github.com/ipfs/go-ipfs/unixfs/archive" - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb" ) diff --git a/core/commands/get_test.go b/core/commands/get_test.go index fed427f9721..61bead8c01c 100644 --- a/core/commands/get_test.go +++ b/core/commands/get_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) diff --git a/core/commands/helptext_test.go b/core/commands/helptext_test.go index 039aec89b8c..1585cea0e16 100644 --- a/core/commands/helptext_test.go +++ b/core/commands/helptext_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" ) func checkHelptextRecursive(t *testing.T, name []string, c *cmds.Command) { diff --git a/core/commands/object/object.go b/core/commands/object/object.go index bd3012fbf7d..9dd49a0ff14 100644 --- a/core/commands/object/object.go +++ b/core/commands/object/object.go @@ -22,7 +22,7 @@ import ( pin "github.com/ipfs/go-ipfs/pin" ft "github.com/ipfs/go-ipfs/unixfs" - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format" diff --git a/core/commands/object/patch.go b/core/commands/object/patch.go index 1b7d60189cf..3c3b80c69b8 100644 --- a/core/commands/object/patch.go +++ b/core/commands/object/patch.go @@ -16,7 +16,7 @@ import ( ft "github.com/ipfs/go-ipfs/unixfs" logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log" - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) diff --git a/core/commands/pubsub.go b/core/commands/pubsub.go index 0b50c42cd26..5596e75e0c6 100644 --- a/core/commands/pubsub.go +++ b/core/commands/pubsub.go @@ -14,8 +14,8 @@ import ( e "github.com/ipfs/go-ipfs/core/commands/e" floodsub "gx/ipfs/QmSFihvoND3eDaAYRCeLgLPt62yCPgMZs1NSZmKFEtJQQw/go-libp2p-floodsub" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" pstore "gx/ipfs/QmXauCuJzmzapetmC6W4TuDJLL1yFFrVzSHoWv8YdbmnxH/go-libp2p-peerstore" - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format" @@ -226,7 +226,7 @@ To use, the daemon must be run with '--enable-pubsub-experiment'. topic := req.Arguments[0] err = req.ParseBodyArgs() - if err != nil && !cmds.IsAllArgsAlreadyCovered(err) { + if err != nil { res.SetError(err, cmdkit.ErrNormal) return } diff --git a/core/commands/repo.go b/core/commands/repo.go index a2a0bb71a94..db9eaa3b724 100644 --- a/core/commands/repo.go +++ b/core/commands/repo.go @@ -18,7 +18,7 @@ import ( lockfile "github.com/ipfs/go-ipfs/repo/fsrepo/lock" bstore "gx/ipfs/QmTVDM4LCSUMFNQzbDLL9zQwp8usE6QHymFdh3h8vL9v6b/go-ipfs-blockstore" - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) diff --git a/core/commands/root.go b/core/commands/root.go index 434f1e55911..17e99f8df61 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -12,7 +12,7 @@ import ( lgc "github.com/ipfs/go-ipfs/commands/legacy" logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log" - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" + "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" ) diff --git a/core/commands/root_test.go b/core/commands/root_test.go new file mode 100644 index 00000000000..f5e5c248bda --- /dev/null +++ b/core/commands/root_test.go @@ -0,0 +1,22 @@ +package commands + +import ( + "testing" +) + +func TestCommandTree(t *testing.T) { + printErrors := func(errs map[string][]error) { + if errs == nil { + return + } + t.Error("In Root command tree:") + for cmd, err := range errs { + t.Errorf(" In X command %s:", cmd) + for _, e := range err { + t.Errorf(" %s", e) + } + } + } + printErrors(Root.DebugValidate()) + printErrors(RootRO.DebugValidate()) +} diff --git a/core/commands/stat.go b/core/commands/stat.go index e25b0c6910a..587d1cce6f0 100644 --- a/core/commands/stat.go +++ b/core/commands/stat.go @@ -8,9 +8,9 @@ import ( "time" humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer" - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit" metrics "gx/ipfs/QmdeBtQGXjSt7cb97nx9JyLHHv5va2LyEAue7Q5tDFzpLy/go-libp2p-metrics" ) diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go index 168667c4c80..f4f44739a47 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/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds" - cmdsHttp "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds/http" + cmds "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds" + cmdsHttp "gx/ipfs/QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy/go-ipfs-cmds/http" ) var ( diff --git a/package.json b/package.json index 134c3eb68e0..b3a79a02ea8 100644 --- a/package.json +++ b/package.json @@ -408,9 +408,9 @@ "version": "2.1.5" }, { - "hash": "QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3", + "hash": "QmU9RepnA8QW2qtFkYUJYfWrydg3Ez7EkgoHkqt5qZgecy", "name": "go-ipfs-cmds", - "version": "1.0.8" + "version": "1.0.9" }, { "hash": "QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM",