refactor!: remove some legacy amino stuff needed for #11275

client/tx/legacy_test.go

@@ -1,23 +1,10 @@
 package tx_test
 
 import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
-
-	"cosmossdk.io/depinject"
-	"github.com/cosmos/cosmos-sdk/client"
-	clienttestutil "github.com/cosmos/cosmos-sdk/client/testutil"
-	tx2 "github.com/cosmos/cosmos-sdk/client/tx"
-	"github.com/cosmos/cosmos-sdk/codec"
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	"github.com/cosmos/cosmos-sdk/types"
 	typestx "github.com/cosmos/cosmos-sdk/types/tx"
 	signing2 "github.com/cosmos/cosmos-sdk/types/tx/signing"
-	"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
-	"github.com/cosmos/cosmos-sdk/x/auth/tx"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 )
 
@@ -45,120 +32,3 @@ var (
 	chainID = "test-chain"
 	tip     = &typestx.Tip{Tipper: addr1.String(), Amount: testdata.NewTestFeeAmount()}
 )
-
-func buildTestTx(t *testing.T, builder client.TxBuilder) {
-	builder.SetMemo(memo)
-	builder.SetGasLimit(gas)
-	builder.SetFeeAmount(fee)
-	err := builder.SetMsgs(msg0, msg1)
-	require.NoError(t, err)
-	err = builder.SetSignatures(sig)
-	require.NoError(t, err)
-	builder.SetTimeoutHeight(timeoutHeight)
-}
-
-type TestSuite struct {
-	suite.Suite
-	amino    *codec.LegacyAmino
-	protoCfg client.TxConfig
-	aminoCfg client.TxConfig
-}
-
-func (s *TestSuite) SetupSuite() {
-	var (
-		reg   codectypes.InterfaceRegistry
-		amino *codec.LegacyAmino
-	)
-	err := depinject.Inject(clienttestutil.TestConfig, &reg, &amino)
-	require.NoError(s.T(), err)
-
-	s.protoCfg = tx.NewTxConfig(codec.NewProtoCodec(reg), tx.DefaultSignModes)
-	s.aminoCfg = legacytx.StdTxConfig{Cdc: amino}
-}
-
-func (s *TestSuite) TestCopyTx() {
-	// proto -> amino -> proto
-	protoBuilder := s.protoCfg.NewTxBuilder()
-	buildTestTx(s.T(), protoBuilder)
-	aminoBuilder := s.aminoCfg.NewTxBuilder()
-	err := tx2.CopyTx(protoBuilder.GetTx(), aminoBuilder, false)
-	s.Require().NoError(err)
-	protoBuilder2 := s.protoCfg.NewTxBuilder()
-	err = tx2.CopyTx(aminoBuilder.GetTx(), protoBuilder2, false)
-	s.Require().NoError(err)
-	// Check sigs, signers and msgs.
-	sigsV2_1, err := protoBuilder.GetTx().GetSignaturesV2()
-	s.Require().NoError(err)
-	sigsV2_2, err := protoBuilder2.GetTx().GetSignaturesV2()
-	s.Require().NoError(err)
-	s.Require().Equal(sigsV2_1, sigsV2_2)
-	s.Require().Equal(protoBuilder.GetTx().GetSigners(), protoBuilder2.GetTx().GetSigners())
-	s.Require().Equal(protoBuilder.GetTx().GetMsgs()[0], protoBuilder2.GetTx().GetMsgs()[0])
-	s.Require().Equal(protoBuilder.GetTx().GetMsgs()[1], protoBuilder2.GetTx().GetMsgs()[1])
-
-	// amino -> proto -> amino
-	aminoBuilder = s.aminoCfg.NewTxBuilder()
-	buildTestTx(s.T(), aminoBuilder)
-	protoBuilder = s.protoCfg.NewTxBuilder()
-	err = tx2.CopyTx(aminoBuilder.GetTx(), protoBuilder, false)
-	s.Require().NoError(err)
-	aminoBuilder2 := s.aminoCfg.NewTxBuilder()
-	err = tx2.CopyTx(protoBuilder.GetTx(), aminoBuilder2, false)
-	s.Require().NoError(err)
-	// Check sigs, signers, and msgs
-	sigsV2_1, err = aminoBuilder.GetTx().GetSignaturesV2()
-	s.Require().NoError(err)
-	sigsV2_2, err = aminoBuilder2.GetTx().GetSignaturesV2()
-	s.Require().NoError(err)
-	s.Require().Equal(sigsV2_1, sigsV2_2)
-	s.Require().Equal(aminoBuilder.GetTx().GetSigners(), aminoBuilder2.GetTx().GetSigners())
-	s.Require().Equal(aminoBuilder.GetTx().GetMsgs()[0], aminoBuilder2.GetTx().GetMsgs()[0])
-	s.Require().Equal(aminoBuilder.GetTx().GetMsgs()[1], aminoBuilder2.GetTx().GetMsgs()[1])
-}
-
-func (s *TestSuite) TestConvertTxToStdTx() {
-	// proto tx
-	protoBuilder := s.protoCfg.NewTxBuilder()
-	buildTestTx(s.T(), protoBuilder)
-	stdTx, err := tx2.ConvertTxToStdTx(s.amino, protoBuilder.GetTx())
-	s.Require().NoError(err)
-	s.Require().Equal(memo, stdTx.Memo)
-	s.Require().Equal(gas, stdTx.Fee.Gas)
-	s.Require().Equal(fee, stdTx.Fee.Amount)
-	s.Require().Equal(msg0, stdTx.Msgs[0])
-	s.Require().Equal(msg1, stdTx.Msgs[1])
-	s.Require().Equal(timeoutHeight, stdTx.TimeoutHeight)
-	s.Require().Equal(sig.PubKey, stdTx.Signatures[0].PubKey)
-	s.Require().Equal(sig.Data.(*signing2.SingleSignatureData).Signature, stdTx.Signatures[0].Signature)
-
-	// SIGN_MODE_DIRECT should fall back to an unsigned tx
-	err = protoBuilder.SetSignatures(signing2.SignatureV2{
-		PubKey: pub1,
-		Data: &signing2.SingleSignatureData{
-			SignMode:  signing2.SignMode_SIGN_MODE_DIRECT,
-			Signature: []byte("dummy"),
-		},
-	})
-	s.Require().NoError(err)
-	stdTx, err = tx2.ConvertTxToStdTx(s.amino, protoBuilder.GetTx())
-	s.Require().NoError(err)
-	s.Require().Equal(memo, stdTx.Memo)
-	s.Require().Equal(gas, stdTx.Fee.Gas)
-	s.Require().Equal(fee, stdTx.Fee.Amount)
-	s.Require().Equal(msg0, stdTx.Msgs[0])
-	s.Require().Equal(msg1, stdTx.Msgs[1])
-	s.Require().Equal(timeoutHeight, stdTx.TimeoutHeight)
-	s.Require().Empty(stdTx.Signatures)
-
-	// std tx
-	aminoBuilder := s.aminoCfg.NewTxBuilder()
-	buildTestTx(s.T(), aminoBuilder)
-	stdTx = aminoBuilder.GetTx().(legacytx.StdTx)
-	stdTx2, err := tx2.ConvertTxToStdTx(s.amino, stdTx)
-	s.Require().NoError(err)
-	s.Require().Equal(stdTx, stdTx2)
-}
-
-func TestTestSuite(t *testing.T) {
-	suite.Run(t, new(TestSuite))
-}

x/auth/ante/setup.go

@@ -9,11 +9,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
 )
 
-var _ GasTx = (*legacytx.StdTx)(nil) // assert StdTx implements GasTx
-
 // GasTx defines a Tx with a GetGas() method which is needed to use SetUpContextDecorator
 type GasTx interface {
 	sdk.Tx

x/auth/ante/sigverify.go

@@ -18,7 +18,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
-	"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
 	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 )
@@ -28,8 +27,6 @@ var (
 	key                = make([]byte, secp256k1.PubKeySize)
 	simSecp256k1Pubkey = &secp256k1.PubKey{Key: key}
 	simSecp256k1Sig    [64]byte
-
-	_ authsigning.SigVerifiableTx = (*legacytx.StdTx)(nil) // assert StdTx implements SigVerifiableTx
 )
 
 func init() {

x/auth/ante/sigverify_test.go

@@ -9,7 +9,6 @@ import (
 
 	storetypes "cosmossdk.io/store/types"
 
-	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	kmultisig "github.com/cosmos/cosmos-sdk/crypto/keys/multisig"
@@ -228,100 +227,6 @@ func TestSigVerification(t *testing.T) {
 	}
 }
 
-// This test is exactly like the one above, but we set the codec explicitly to
-// Amino.
-// Once https://github.com/cosmos/cosmos-sdk/issues/6190 is in, we can remove
-// this, since it'll be handled by the test matrix.
-// In the meantime, we want to make double-sure amino compatibility works.
-// ref: https://github.com/cosmos/cosmos-sdk/issues/7229
-func TestSigVerification_ExplicitAmino(t *testing.T) {
-	suite := SetupTestSuite(t, true)
-	// Set up TxConfig.
-	aminoCdc := codec.NewLegacyAmino()
-	// We're using TestMsg amino encoding in some tests, so register it here.
-	txConfig := legacytx.StdTxConfig{Cdc: aminoCdc}
-
-	suite.clientCtx = client.Context{}.
-		WithTxConfig(txConfig)
-
-	anteHandler, err := ante.NewAnteHandler(
-		ante.HandlerOptions{
-			AccountKeeper:   suite.accountKeeper,
-			BankKeeper:      suite.bankKeeper,
-			FeegrantKeeper:  suite.feeGrantKeeper,
-			SignModeHandler: txConfig.SignModeHandler(),
-			SigGasConsumer:  ante.DefaultSigVerificationGasConsumer,
-		},
-	)
-
-	require.NoError(t, err)
-	suite.anteHandler = anteHandler
-
-	suite.txBuilder = suite.clientCtx.TxConfig.NewTxBuilder()
-
-	// make block height non-zero to ensure account numbers part of signBytes
-	suite.ctx = suite.ctx.WithBlockHeight(1)
-
-	// keys and addresses
-	priv1, _, addr1 := testdata.KeyTestPubAddr()
-	priv2, _, addr2 := testdata.KeyTestPubAddr()
-	priv3, _, addr3 := testdata.KeyTestPubAddr()
-
-	addrs := []sdk.AccAddress{addr1, addr2, addr3}
-
-	msgs := make([]sdk.Msg, len(addrs))
-	// set accounts and create msg for each address
-	for i, addr := range addrs {
-		acc := suite.accountKeeper.NewAccountWithAddress(suite.ctx, addr)
-		require.NoError(t, acc.SetAccountNumber(uint64(i)))
-		suite.accountKeeper.SetAccount(suite.ctx, acc)
-		msgs[i] = testdata.NewTestMsg(addr)
-	}
-
-	feeAmount := testdata.NewTestFeeAmount()
-	gasLimit := testdata.NewTestGasLimit()
-
-	spkd := ante.NewSetPubKeyDecorator(suite.accountKeeper)
-	svd := ante.NewSigVerificationDecorator(suite.accountKeeper, suite.clientCtx.TxConfig.SignModeHandler())
-	antehandler := sdk.ChainAnteDecorators(spkd, svd)
-
-	type testCase struct {
-		name      string
-		privs     []cryptotypes.PrivKey
-		accNums   []uint64
-		accSeqs   []uint64
-		recheck   bool
-		shouldErr bool
-	}
-	testCases := []testCase{
-		{"no signers", []cryptotypes.PrivKey{}, []uint64{}, []uint64{}, false, true},
-		{"not enough signers", []cryptotypes.PrivKey{priv1, priv2}, []uint64{0, 1}, []uint64{0, 0}, false, true},
-		{"wrong order signers", []cryptotypes.PrivKey{priv3, priv2, priv1}, []uint64{2, 1, 0}, []uint64{0, 0, 0}, false, true},
-		{"wrong accnums", []cryptotypes.PrivKey{priv1, priv2, priv3}, []uint64{7, 8, 9}, []uint64{0, 0, 0}, false, true},
-		{"wrong sequences", []cryptotypes.PrivKey{priv1, priv2, priv3}, []uint64{0, 1, 2}, []uint64{3, 4, 5}, false, true},
-		{"valid tx", []cryptotypes.PrivKey{priv1, priv2, priv3}, []uint64{0, 1, 2}, []uint64{0, 0, 0}, false, false},
-		{"no err on recheck", []cryptotypes.PrivKey{priv1, priv2, priv3}, []uint64{0, 1, 2}, []uint64{0, 0, 0}, true, false},
-	}
-	for i, tc := range testCases {
-		suite.ctx = suite.ctx.WithIsReCheckTx(tc.recheck)
-		suite.txBuilder = suite.clientCtx.TxConfig.NewTxBuilder() // Create new txBuilder for each test
-
-		require.NoError(t, suite.txBuilder.SetMsgs(msgs...))
-		suite.txBuilder.SetFeeAmount(feeAmount)
-		suite.txBuilder.SetGasLimit(gasLimit)
-
-		tx, err := suite.CreateTestTx(suite.ctx, tc.privs, tc.accNums, tc.accSeqs, suite.ctx.ChainID(), signing.SignMode_SIGN_MODE_LEGACY_AMINO_JSON)
-		require.NoError(t, err)
-
-		_, err = antehandler(suite.ctx, tx, false)
-		if tc.shouldErr {
-			require.NotNil(t, err, "TestCase %d: %s did not error as expected", i, tc.name)
-		} else {
-			require.Nil(t, err, "TestCase %d: %s errored unexpectedly. Err: %v", i, tc.name, err)
-		}
-	}
-}
-
 func TestSigIntegration(t *testing.T) {
 	// generate private keys
 	privs := []cryptotypes.PrivKey{