Move KeyTestPubAddr to testdata

client/testutil/suite.go

@@ -6,7 +6,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec/testdata"
 	"github.com/cosmos/cosmos-sdk/crypto/types/multisig"
 	"github.com/cosmos/cosmos-sdk/x/auth/signing"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/stretchr/testify/suite"
 	"github.com/tendermint/tendermint/crypto"
 
@@ -63,8 +62,8 @@ func (s *TxConfigTestSuite) TestTxBuilderSetMemo() {
 }
 
 func (s *TxConfigTestSuite) TestTxBuilderSetMsgs() {
-	_, _, addr1 := authtypes.KeyTestPubAddr()
-	_, _, addr2 := authtypes.KeyTestPubAddr()
+	_, _, addr1 := testdata.KeyTestPubAddr()
+	_, _, addr2 := testdata.KeyTestPubAddr()
 	msg1 := testdata.NewTestMsg(addr1)
 	msg2 := testdata.NewTestMsg(addr2)
 	msgs := []sdk.Msg{msg1, msg2}
@@ -81,8 +80,8 @@ func (s *TxConfigTestSuite) TestTxBuilderSetMsgs() {
 }
 
 func (s *TxConfigTestSuite) TestTxBuilderSetSignatures() {
-	privKey, pubkey, addr := authtypes.KeyTestPubAddr()
-	privKey2, pubkey2, _ := authtypes.KeyTestPubAddr()
+	privKey, pubkey, addr := testdata.KeyTestPubAddr()
+	privKey2, pubkey2, _ := testdata.KeyTestPubAddr()
 	multisigPk := multisig.NewPubKeyMultisigThreshold(2, []crypto.PubKey{pubkey, pubkey2})
 
 	txBuilder := s.TxConfig.NewTxBuilder()
@@ -228,7 +227,7 @@ func sigDataEquals(data1, data2 signingtypes.SignatureData) bool {
 }
 
 func (s *TxConfigTestSuite) TestTxEncodeDecode() {
-	_, pubkey, addr := authtypes.KeyTestPubAddr()
+	_, pubkey, addr := testdata.KeyTestPubAddr()
 	feeAmount := sdk.Coins{sdk.NewInt64Coin("atom", 150)}
 	gasLimit := uint64(50000)
 	memo := "foomemo"

codec/testdata/test_tx.go

@@ -4,8 +4,18 @@ import (
 	"encoding/json"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/tendermint/tendermint/crypto"
+	"github.com/tendermint/tendermint/crypto/secp256k1"
 )
 
+// KeyTestPubAddr generates a new secp256k1 keypair.
+func KeyTestPubAddr() (crypto.PrivKey, crypto.PubKey, sdk.AccAddress) {
+	key := secp256k1.GenPrivKey()
+	pub := key.PubKey()
+	addr := sdk.AccAddress(pub.Address())
+	return key, pub, addr
+}
+
 // NewTestFeeAmount is a test fee amount.
 func NewTestFeeAmount() sdk.Coins {
 	return sdk.NewCoins(sdk.NewInt64Coin("atom", 150))

x/auth/ante/ante_test.go

@@ -80,9 +80,9 @@ func (suite *AnteTestSuite) TestAnteHandlerSigErrors() {
 	suite.SetupTest(true) // reset
 
 	// Same data for every test cases
-	priv0, _, addr0 := types.KeyTestPubAddr()
-	priv1, _, addr1 := types.KeyTestPubAddr()
-	priv2, _, addr2 := types.KeyTestPubAddr()
+	priv0, _, addr0 := testdata.KeyTestPubAddr()
+	priv1, _, addr1 := testdata.KeyTestPubAddr()
+	priv2, _, addr2 := testdata.KeyTestPubAddr()
 	msgs := []sdk.Msg{
 		testdata.NewTestMsg(addr0, addr1),
 		testdata.NewTestMsg(addr0, addr2),
@@ -438,7 +438,7 @@ func (suite *AnteTestSuite) TestAnteHandlerFees() {
 	suite.SetupTest(true) // setup
 
 	// Same data for every test cases
-	priv0, _, addr0 := types.KeyTestPubAddr()
+	priv0, _, addr0 := testdata.KeyTestPubAddr()
 
 	acc1 := suite.app.AccountKeeper.NewAccountWithAddress(suite.ctx, addr0)
 	suite.app.AccountKeeper.SetAccount(suite.ctx, acc1)

x/auth/ante/basic_test.go

@@ -20,7 +20,7 @@ func (suite *AnteTestSuite) TestValidateBasic() {
 	suite.txBuilder = suite.clientCtx.TxConfig.NewTxBuilder()
 
 	// keys and addresses
-	priv1, _, addr1 := types.KeyTestPubAddr()
+	priv1, _, addr1 := testdata.KeyTestPubAddr()
 
 	// msg and signatures
 	msg := testdata.NewTestMsg(addr1)
@@ -59,7 +59,7 @@ func (suite *AnteTestSuite) TestValidateMemo() {
 	suite.txBuilder = suite.clientCtx.TxConfig.NewTxBuilder()
 
 	// keys and addresses
-	priv1, _, addr1 := types.KeyTestPubAddr()
+	priv1, _, addr1 := testdata.KeyTestPubAddr()
 
 	// msg and signatures
 	msg := testdata.NewTestMsg(addr1)
@@ -93,7 +93,7 @@ func (suite *AnteTestSuite) TestConsumeGasForTxSize() {
 	suite.txBuilder = suite.clientCtx.TxConfig.NewTxBuilder()
 
 	// keys and addresses
-	priv1, _, addr1 := types.KeyTestPubAddr()
+	priv1, _, addr1 := testdata.KeyTestPubAddr()
 
 	// msg and signatures
 	msg := testdata.NewTestMsg(addr1)

x/auth/ante/fee_test.go

@@ -10,7 +10,6 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
-	"github.com/cosmos/cosmos-sdk/x/auth/types"
 )
 
 func (suite *AnteTestSuite) TestEnsureMempoolFees() {
@@ -21,7 +20,7 @@ func (suite *AnteTestSuite) TestEnsureMempoolFees() {
 	antehandler := sdk.ChainAnteDecorators(mfd)
 
 	// keys and addresses
-	priv1, _, addr1 := types.KeyTestPubAddr()
+	priv1, _, addr1 := testdata.KeyTestPubAddr()
 
 	// msg and signatures
 	msg := testdata.NewTestMsg(addr1)
@@ -69,7 +68,7 @@ func (suite *AnteTestSuite) TestDeductFees() {
 	suite.txBuilder = suite.clientCtx.TxConfig.NewTxBuilder()
 
 	// keys and addresses
-	priv1, _, addr1 := types.KeyTestPubAddr()
+	priv1, _, addr1 := testdata.KeyTestPubAddr()
 
 	// msg and signatures
 	msg := testdata.NewTestMsg(addr1)

x/auth/ante/setup_test.go

@@ -11,15 +11,14 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
-	"github.com/cosmos/cosmos-sdk/x/auth/types"
 )
 
 func (suite *AnteTestSuite) TestSetup() {
 	suite.SetupTest(true) // setup
 	suite.txBuilder = suite.clientCtx.TxConfig.NewTxBuilder()
 
 	// keys and addresses
-	priv1, _, addr1 := types.KeyTestPubAddr()
+	priv1, _, addr1 := testdata.KeyTestPubAddr()
 
 	// msg and signatures
 	msg := testdata.NewTestMsg(addr1)
@@ -53,7 +52,7 @@ func (suite *AnteTestSuite) TestRecoverPanic() {
 	suite.txBuilder = suite.clientCtx.TxConfig.NewTxBuilder()
 
 	// keys and addresses
-	priv1, _, addr1 := types.KeyTestPubAddr()
+	priv1, _, addr1 := testdata.KeyTestPubAddr()
 
 	// msg and signatures
 	msg := testdata.NewTestMsg(addr1)

x/auth/ante/sigverify_test.go

@@ -26,9 +26,9 @@ func (suite *AnteTestSuite) TestSetPubKey() {
 	suite.txBuilder = suite.clientCtx.TxConfig.NewTxBuilder()
 
 	// keys and addresses
-	priv1, pub1, addr1 := types.KeyTestPubAddr()
-	priv2, pub2, addr2 := types.KeyTestPubAddr()
-	priv3, pub3, addr3 := types.KeyTestPubAddr()
+	priv1, pub1, addr1 := testdata.KeyTestPubAddr()
+	priv2, pub2, addr2 := testdata.KeyTestPubAddr()
+	priv3, pub3, addr3 := testdata.KeyTestPubAddr()
 
 	addrs := []sdk.AccAddress{addr1, addr2, addr3}
 	pubs := []crypto.PubKey{pub1, pub2, pub3}
@@ -123,9 +123,9 @@ func (suite *AnteTestSuite) TestSigVerification() {
 	suite.ctx = suite.ctx.WithBlockHeight(1)
 
 	// keys and addresses
-	priv1, _, addr1 := types.KeyTestPubAddr()
-	priv2, _, addr2 := types.KeyTestPubAddr()
-	priv3, _, addr3 := types.KeyTestPubAddr()
+	priv1, _, addr1 := testdata.KeyTestPubAddr()
+	priv2, _, addr2 := testdata.KeyTestPubAddr()
+	priv3, _, addr3 := testdata.KeyTestPubAddr()
 
 	addrs := []sdk.AccAddress{addr1, addr2, addr3}
 
@@ -244,7 +244,7 @@ func (suite *AnteTestSuite) TestIncrementSequenceDecorator() {
 	suite.SetupTest(true) // setup
 	suite.txBuilder = suite.clientCtx.TxConfig.NewTxBuilder()
 
-	priv, _, addr := types.KeyTestPubAddr()
+	priv, _, addr := testdata.KeyTestPubAddr()
 	acc := suite.app.AccountKeeper.NewAccountWithAddress(suite.ctx, addr)
 	suite.Require().NoError(acc.SetAccountNumber(uint64(50)))
 	suite.app.AccountKeeper.SetAccount(suite.ctx, acc)

x/auth/ante/testutil_test.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/tx"
+	"github.com/cosmos/cosmos-sdk/codec/testdata"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	simappparams "github.com/cosmos/cosmos-sdk/simapp/params"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -53,7 +54,7 @@ func (suite *AnteTestSuite) CreateTestAccounts(numAccs int) []TestAccount {
 	var accounts []TestAccount
 
 	for i := 0; i < numAccs; i++ {
-		priv, _, addr := types.KeyTestPubAddr()
+		priv, _, addr := testdata.KeyTestPubAddr()
 		acc := suite.app.AccountKeeper.NewAccountWithAddress(suite.ctx, addr)
 		err := acc.SetAccountNumber(uint64(i))
 		suite.Require().NoError(err)

x/auth/keeper/grpc_query_test.go

@@ -3,6 +3,7 @@ package keeper_test
 import (
 	"fmt"
 
+	"github.com/cosmos/cosmos-sdk/codec/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 )
@@ -11,7 +12,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryAccount() {
 	var (
 		req *types.QueryAccountRequest
 	)
-	_, _, addr := types.KeyTestPubAddr()
+	_, _, addr := testdata.KeyTestPubAddr()
 
 	testCases := []struct {
 		msg       string

x/auth/keeper/querier_test.go

@@ -8,6 +8,7 @@ import (
 
 	abci "github.com/tendermint/tendermint/abci/types"
 
+	"github.com/cosmos/cosmos-sdk/codec/testdata"
 	keep "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 )
@@ -41,7 +42,7 @@ func TestQueryAccount(t *testing.T) {
 	require.Error(t, err)
 	require.Nil(t, res)
 
-	_, _, addr := types.KeyTestPubAddr()
+	_, _, addr := testdata.KeyTestPubAddr()
 	req.Data = cdc.MustMarshalJSON(types.NewQueryAccountRequest(addr))
 	res, err = querier(ctx, path, req)
 	require.Error(t, err)

x/auth/signing/direct/direct_test.go

@@ -21,11 +21,10 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	txtypes "github.com/cosmos/cosmos-sdk/types/tx"
 	"github.com/cosmos/cosmos-sdk/x/auth/signing"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 )
 
 func TestDirectModeHandler(t *testing.T) {
-	privKey, pubkey, addr := authtypes.KeyTestPubAddr()
+	privKey, pubkey, addr := testdata.KeyTestPubAddr()
 	interfaceRegistry := codectypes.NewInterfaceRegistry()
 	interfaceRegistry.RegisterImplementations((*sdk.Msg)(nil), &testdata.TestMsg{})
 	marshaler := codec.NewProtoCodec(interfaceRegistry)

x/auth/signing/verify_test.go

@@ -19,8 +19,8 @@ import (
 )
 
 func TestVerifySignature(t *testing.T) {
-	priv, pubKey, addr := types.KeyTestPubAddr()
-	priv1, pubKey1, addr1 := types.KeyTestPubAddr()
+	priv, pubKey, addr := testdata.KeyTestPubAddr()
+	priv1, pubKey1, addr1 := testdata.KeyTestPubAddr()
 
 	const (
 		memo    = "testmemo"

x/auth/tx/builder_test.go

@@ -12,16 +12,14 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/std"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 func TestTxBuilder(t *testing.T) {
-	_, pubkey, addr := authtypes.KeyTestPubAddr()
+	_, pubkey, addr := testdata.KeyTestPubAddr()
 
 	marshaler := codec.NewHybridCodec(codec.New(), codectypes.NewInterfaceRegistry())
 	tx := newBuilder(marshaler, std.DefaultPublicKeyCodec{})
@@ -116,8 +114,8 @@ func TestTxBuilder(t *testing.T) {
 
 func TestBuilderValidateBasic(t *testing.T) {
 	// keys and addresses
-	_, pubKey1, addr1 := authtypes.KeyTestPubAddr()
-	_, pubKey2, addr2 := authtypes.KeyTestPubAddr()
+	_, pubKey1, addr1 := testdata.KeyTestPubAddr()
+	_, pubKey2, addr2 := testdata.KeyTestPubAddr()
 
 	// msg and signatures
 	msg1 := testdata.NewTestMsg(addr1, addr2)

x/auth/types/account_test.go

@@ -10,13 +10,14 @@ import (
 	"github.com/tendermint/tendermint/crypto/secp256k1"
 	yaml "gopkg.in/yaml.v2"
 
+	"github.com/cosmos/cosmos-sdk/codec/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 )
 
 func TestBaseAddressPubKey(t *testing.T) {
-	_, pub1, addr1 := types.KeyTestPubAddr()
-	_, pub2, addr2 := types.KeyTestPubAddr()
+	_, pub1, addr1 := testdata.KeyTestPubAddr()
+	_, pub2, addr2 := testdata.KeyTestPubAddr()
 	acc := types.NewBaseAccountWithAddress(addr1)
 
 	// check the address (set) and pubkey (not set)
@@ -48,7 +49,7 @@ func TestBaseAddressPubKey(t *testing.T) {
 }
 
 func TestBaseAccountSequence(t *testing.T) {
-	_, _, addr := types.KeyTestPubAddr()
+	_, _, addr := testdata.KeyTestPubAddr()
 	acc := types.NewBaseAccountWithAddress(addr)
 	seq := uint64(7)
 
@@ -58,7 +59,7 @@ func TestBaseAccountSequence(t *testing.T) {
 }
 
 func TestBaseAccountMarshal(t *testing.T) {
-	_, pub, addr := types.KeyTestPubAddr()
+	_, pub, addr := testdata.KeyTestPubAddr()
 	acc := types.NewBaseAccountWithAddress(addr)
 	seq := uint64(7)
 

x/auth/types/stdtx_test.go

@@ -95,8 +95,8 @@ func TestTxValidateBasic(t *testing.T) {
 	ctx := sdk.NewContext(nil, abci.Header{ChainID: "mychainid"}, false, log.NewNopLogger())
 
 	// keys and addresses
-	priv1, _, addr1 := KeyTestPubAddr()
-	priv2, _, addr2 := KeyTestPubAddr()
+	priv1, _, addr1 := testdata.KeyTestPubAddr()
+	priv2, _, addr2 := testdata.KeyTestPubAddr()
 
 	// msg and signatures
 	msg1 := testdata.NewTestMsg(addr1, addr2)
@@ -173,7 +173,7 @@ func TestDefaultTxEncoder(t *testing.T) {
 }
 
 func TestStdSignatureMarshalYAML(t *testing.T) {
-	_, pubKey, _ := KeyTestPubAddr()
+	_, pubKey, _ := testdata.KeyTestPubAddr()
 
 	testCases := []struct {
 		sig    StdSignature
@@ -201,7 +201,7 @@ func TestStdSignatureMarshalYAML(t *testing.T) {
 }
 
 func TestSignatureV2Conversions(t *testing.T) {
-	_, pubKey, _ := KeyTestPubAddr()
+	_, pubKey, _ := testdata.KeyTestPubAddr()
 	cdc := codec.New()
 	sdk.RegisterCodec(cdc)
 	RegisterCodec(cdc)
@@ -221,7 +221,7 @@ func TestSignatureV2Conversions(t *testing.T) {
 	require.Equal(t, dummy, sigBz)
 
 	// multisigs
-	_, pubKey2, _ := KeyTestPubAddr()
+	_, pubKey2, _ := testdata.KeyTestPubAddr()
 	multiPK := multisig.NewPubKeyMultisigThreshold(1, []crypto.PubKey{
 		pubKey, pubKey2,
 	})
@@ -256,7 +256,7 @@ func TestSignatureV2Conversions(t *testing.T) {
 }
 
 func TestGetSignaturesV2(t *testing.T) {
-	_, pubKey, _ := KeyTestPubAddr()
+	_, pubKey, _ := testdata.KeyTestPubAddr()
 	dummy := []byte("dummySig")
 
 	cdc := codec.New()