Move sign and verify to a message subcommand

CHANGELOG.md

@@ -9,6 +9,7 @@
 - [446](https://github.com/vegaprotocol/vegawallet/pull/446) - Field `mnemonic` in HTTP response for wallet creation has been removed in favor of `recoveryPhrase`
 - [446](https://github.com/vegaprotocol/vegawallet/pull/446) - Field `mnemonic` in HTTP request for wallet import has been removed in favor of `recoveryPhrase`
 - [446](https://github.com/vegaprotocol/vegawallet/pull/446) - The key printed on the JSON output for the `key generate` command is now at the root of the response, just like the output of the `key describe` command.
+- [450](https://github.com/vegaprotocol/vegawallet/pull/450) - Move `sign` and `verify` commands to a a `message` subcommand, e.g. `message sign` and `message verify`
 
 ### 🗑️  Deprecation
 - [](https://github.com/vegaprotocol/vegawallet/pull/) -

cmd/message.go

@@ -0,0 +1,19 @@
+package cmd
+
+import (
+	"io"
+
+	"github.com/spf13/cobra"
+)
+
+func NewCmdMessage(w io.Writer, rf *RootFlags) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "message",
+		Short: "Sign and verify messages",
+		Long:  "Sign and verify messages",
+	}
+
+	cmd.AddCommand(NewCmdSignMessage(w, rf))
+	cmd.AddCommand(NewCmdVerifyMessage(w, rf))
+	return cmd
+}

cmd/sign.go → cmd/message_sign.go

@@ -21,7 +21,7 @@ var (
 
 	signMessageExample = cli.Examples(`
 		# Sign a message
-		vegawallet sign --message MESSAGE --wallet WALLET --pubkey PUBKEY
+		vegawallet message sign --message MESSAGE --wallet WALLET --pubkey PUBKEY
 	`)
 )
 

cmd/verify.go → cmd/message_verify.go

@@ -22,7 +22,7 @@ var (
 
 	verifyMessageExample = cli.Examples(`
 		# Verify the signature of a message
-		vegawallet verify --message MESSAGE --signature SIGNATURE --pubkey PUBKEY
+		vegawallet message verify --message MESSAGE --signature SIGNATURE --pubkey PUBKEY
 	`)
 )
 

cmd/root.go

@@ -118,8 +118,6 @@ func BuildCmdRoot(w io.Writer, vh CheckVersionHandler) *cobra.Command {
 	// Root commands
 	cmd.AddCommand(NewCmdInit(w, f))
 	cmd.AddCommand(NewCmdCompletion(w))
-	cmd.AddCommand(NewCmdSignMessage(w, f))
-	cmd.AddCommand(NewCmdVerifyMessage(w, f))
 	cmd.AddCommand(NewCmdVersion(w, f))
 
 	// Sub-commands
@@ -128,6 +126,7 @@ func BuildCmdRoot(w io.Writer, vh CheckVersionHandler) *cobra.Command {
 	cmd.AddCommand(NewCmdNetwork(w, f))
 	cmd.AddCommand(NewCmdService(w, f))
 	cmd.AddCommand(NewCmdTx(w, f))
+	cmd.AddCommand(NewCmdMessage(w, f))
 
 	// Wallet commands
 	// We don't have a wrapper sub-command for wallet commands.

tests/commands_for_test.go

@@ -614,7 +614,7 @@ type SignMessageResponse struct {
 
 func SignMessage(t *testing.T, args []string) (*SignMessageResponse, error) {
 	t.Helper()
-	argsWithCmd := []string{"sign"}
+	argsWithCmd := []string{"message", "sign"}
 	argsWithCmd = append(argsWithCmd, args...)
 	output, err := ExecuteCmd(t, argsWithCmd)
 	if err != nil {
@@ -655,7 +655,7 @@ type VerifyMessageResponse struct {
 
 func VerifyMessage(t *testing.T, args []string) (*VerifyMessageResponse, error) {
 	t.Helper()
-	argsWithCmd := []string{"verify"}
+	argsWithCmd := []string{"message", "verify"}
 	argsWithCmd = append(argsWithCmd, args...)
 	output, err := ExecuteCmd(t, argsWithCmd)
 	if err != nil {