remove connection and channel handshake cli commands (#109)

* remove connection handshake cli commands

* add changelog entry

* remove channel handshake commands

* update gomod

Author: colin-axner

CHANGELOG.md

@@ -36,8 +36,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
 
-### API Breaking 
+### API Breaking
 
+* (modules/core) [\#109](https://github.com/cosmos/ibc-go/pull/109) Remove connection and channel handshake CLI commands.
 * (modules) [\#107](https://github.com/cosmos/ibc-go/pull/107) Modify OnRecvPacket callback to return an acknowledgement which indicates if it is successful or not. Callback state changes are discarded for unsuccessful acknowledgements only. 
 * (modules) [\#108](https://github.com/cosmos/ibc-go/pull/108) All message constructors take the signer as a string to prevent upstream bugs. The `String()` function for an SDK Acc Address relies on external context.
 

go.mod

@@ -16,7 +16,6 @@ require (
 	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cast v1.3.1
 	github.com/spf13/cobra v1.1.3
-	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.7.1
 	github.com/stretchr/testify v1.7.0
 	github.com/tendermint/tendermint v0.34.8

modules/core/03-connection/client/cli/cli.go

@@ -3,7 +3,6 @@ package cli
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/ibc-go/modules/core/03-connection/types"
 )
 
@@ -24,23 +23,3 @@ func GetQueryCmd() *cobra.Command {
 
 	return queryCmd
 }
-
-// NewTxCmd returns a CLI command handler for all x/ibc connection transaction commands.
-func NewTxCmd() *cobra.Command {
-	txCmd := &cobra.Command{
-		Use:                        types.SubModuleName,
-		Short:                      "IBC connection transaction subcommands",
-		DisableFlagParsing:         true,
-		SuggestionsMinimumDistance: 2,
-		RunE:                       client.ValidateCmd,
-	}
-
-	txCmd.AddCommand(
-		NewConnectionOpenInitCmd(),
-		NewConnectionOpenTryCmd(),
-		NewConnectionOpenAckCmd(),
-		NewConnectionOpenConfirmCmd(),
-	)
-
-	return txCmd
-}

modules/core/03-connection/client/cli/tx.go

@@ -13,11 +13,6 @@ func Name() string {
 	return types.SubModuleName
 }
 
-// GetTxCmd returns the root tx command for the IBC connections.
-func GetTxCmd() *cobra.Command {
-	return cli.NewTxCmd()
-}
-
 // GetQueryCmd returns the root query command for the IBC connections.
 func GetQueryCmd() *cobra.Command {
 	return cli.GetQueryCmd()

modules/core/03-connection/module.go

@@ -45,14 +45,7 @@ func NewTxCmd() *cobra.Command {
 		RunE:                       client.ValidateCmd,
 	}
 
-	txCmd.AddCommand(
-		NewChannelOpenInitCmd(),
-		NewChannelOpenTryCmd(),
-		NewChannelOpenAckCmd(),
-		NewChannelOpenConfirmCmd(),
-		NewChannelCloseInitCmd(),
-		NewChannelCloseConfirmCmd(),
-	)
+	txCmd.AddCommand()
 
 	return txCmd
 }

modules/core/04-channel/client/cli/cli.go

@@ -22,7 +22,6 @@ func GetTxCmd() *cobra.Command {
 
 	ibcTxCmd.AddCommand(
 		ibcclient.GetTxCmd(),
-		connection.GetTxCmd(),
 		channel.GetTxCmd(),
 	)
 

modules/core/04-channel/client/cli/tx.go

@@ -29,7 +29,6 @@ import (
 	dbm "github.com/tendermint/tm-db"
 
 	ibcclientcli "github.com/cosmos/ibc-go/modules/core/02-client/client/cli"
-	ibccli "github.com/cosmos/ibc-go/modules/core/04-channel/client/cli"
 	"github.com/cosmos/ibc-go/testing/simapp"
 )
 
@@ -202,6 +201,11 @@ func (s *IntegrationTestSuite) TestLegacyRestErrMessages() {
 		`{"@type":"/ibc.lightclients.solomachine.v1.ClientState","sequence":"1","frozen_sequence":"0","consensus_state":{"public_key":{"@type":"/cosmos.crypto.secp256k1.PubKey","key":"AtK50+5pJOoaa04qqAqrnyAqsYrwrR/INnA6UPIaYZlp"},"diversifier":"testing","timestamp":"10"},"allow_update_after_proposal":false}`,
 	)
 
+	badClientStateJSON := testutil.WriteToNewTempFile(
+		s.T(),
+		`{"@type":"/ibc.lightclients.solomachine.v1.ClientState","sequence":"1","frozen_sequence":"0","consensus_state":{"public_key":{"@type":"/cosmos.crypto.secp256k1.PubKey","key":"AtK50+5pJOoaa04qqAqrnyAqsYrwrR/INnA6UPIaYZlp"},"diversifier":"DIFFERENT","timestamp":"10"},"allow_update_after_proposal":false}`,
+	)
+
 	// Write consensus json to temp file, used for an IBC message.
 	// Generated by printing the result of cdc.MarshalIntefaceJSON on
 	// a solo machine consensus state
@@ -218,18 +222,18 @@ func (s *IntegrationTestSuite) TestLegacyRestErrMessages() {
 	}{
 		{
 			"Failing IBC message",
-			ibccli.NewChannelCloseInitCmd(),
+			ibcclientcli.NewCreateClientCmd(),
 			[]string{
-				"121",       // dummy port-id
-				"channel-0", // dummy channel-id
+				badClientStateJSON.Name(), // path to client state json
+				consensusJSON.Name(),      // path to consensus json,
 				fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
 				fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock),
 				fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
 				fmt.Sprintf("--gas=%d", flags.DefaultGasLimit),
 				fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()),
 				fmt.Sprintf("--%s=foobar", flags.FlagMemo),
 			},
-			uint32(7),
+			uint32(8),
 		},
 		{
 			"Successful IBC message",