From ca7464fe0d213af881d9a45ddad6bb3ceec1bbe8 Mon Sep 17 00:00:00 2001 From: sahith-narahari Date: Tue, 16 Jun 2020 22:17:23 +0530 Subject: [PATCH 01/10] Add missing tests for ante --- x/auth/ante/sigverify.go | 4 ++- x/auth/signing/verify_test.go | 66 +++++++++++++++++++++++++++++++++++ x/auth/types/stdtx_test.go | 20 +++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 x/auth/signing/verify_test.go diff --git a/x/auth/ante/sigverify.go b/x/auth/ante/sigverify.go index 1842be6b1ba8..bacf5b117659 100644 --- a/x/auth/ante/sigverify.go +++ b/x/auth/ante/sigverify.go @@ -363,7 +363,9 @@ func ConsumeMultisignatureVerificationGas( sigIndex := 0 for i := 0; i < size; i++ { - if sig.BitArray.GetIndex(i) { + if !sig.BitArray.GetIndex(i) { + continue + } else { sigV2 := signing.SignatureV2{ PubKey: pubkey.GetPubKeys()[i], Data: sig.Signatures[sigIndex], diff --git a/x/auth/signing/verify_test.go b/x/auth/signing/verify_test.go new file mode 100644 index 000000000000..475b05fc1029 --- /dev/null +++ b/x/auth/signing/verify_test.go @@ -0,0 +1,66 @@ +package signing_test + +import ( + "testing" + + "github.com/stretchr/testify/require" + abci "github.com/tendermint/tendermint/abci/types" + + "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/simapp" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/auth/ante" + "github.com/cosmos/cosmos-sdk/x/auth/signing" + "github.com/cosmos/cosmos-sdk/x/auth/types" +) + +func TestVerifySignature(t *testing.T) { + msg := []byte{1, 2, 3, 4} + _, pubKey, _ := types.KeyTestPubAddr() + addr := sdk.AccAddress(pubKey.Address()) + app, ctx := createTestApp(false) + ctx = ctx.WithBlockHeight(1) + + cdc := codec.New() + sdk.RegisterCodec(cdc) + types.RegisterCodec(cdc) + + acc1 := app.AccountKeeper.NewAccountWithAddress(ctx, addr) + app.AccountKeeper.SetAccount(ctx, acc1) + balances := sdk.NewCoins(sdk.NewInt64Coin("atom", 200)) + require.NoError(t, app.BankKeeper.SetBalances(ctx, addr, balances)) + + fee := types.NewStdFee(50000, sdk.Coins{sdk.NewInt64Coin("atom", 150)}) + sig := types.StdSignature{PubKey: pubKey.Bytes(), Signature: msg} + stdTx := types.NewStdTx([]sdk.Msg{types.NewTestMsg(addr)}, fee, []types.StdSignature{sig}, "testsigs") + + acc, err := ante.GetSignerAcc(ctx, app.AccountKeeper, addr) + require.Nil(t, err) + genesis := ctx.BlockHeight() == 0 + chainID := ctx.ChainID() + var accNum uint64 + if !genesis { + accNum = acc.GetAccountNumber() + } + signerData := signing.SignerData{ + ChainID: chainID, + AccountNumber: accNum, + AccountSequence: acc.GetSequence(), + } + + sigV2, err := types.StdSignatureToSignatureV2(cdc, sig) + handler := MakeTestHandlerMap() + + err = signing.VerifySignature(pubKey, signerData, sigV2.Data, handler, stdTx) + t.Log(err) + require.NoError(t, err) +} + +// returns context and app with params set on account keeper +func createTestApp(isCheckTx bool) (*simapp.SimApp, sdk.Context) { + app := simapp.Setup(isCheckTx) + ctx := app.BaseApp.NewContext(isCheckTx, abci.Header{}) + app.AccountKeeper.SetParams(ctx, types.DefaultParams()) + + return app, ctx +} diff --git a/x/auth/types/stdtx_test.go b/x/auth/types/stdtx_test.go index df43ccda9268..995db6b47b76 100644 --- a/x/auth/types/stdtx_test.go +++ b/x/auth/types/stdtx_test.go @@ -227,3 +227,23 @@ func TestSignatureV2Conversions(t *testing.T) { require.Equal(t, multiPK, sigV2.PubKey) require.Equal(t, msigData, sigV2.Data) } + +func TestGetSignaturesV2(t *testing.T) { + _, pubKey, _ := KeyTestPubAddr() + dummy := []byte("dummySig") + + cdc := codec.New() + sdk.RegisterCodec(cdc) + RegisterCodec(cdc) + + fee := NewStdFee(50000, sdk.Coins{sdk.NewInt64Coin("atom", 150)}) + sig := StdSignature{PubKey: pubKey.Bytes(), Signature: dummy} + stdTx := NewStdTx([]sdk.Msg{NewTestMsg()}, fee, []StdSignature{sig}, "testsigs") + + sigs, err := stdTx.GetSignaturesV2() + require.Nil(t, err) + require.Equal(t, len(sigs), 1) + + sigV2, err := StdSignatureToSignatureV2(cdc, sig) + require.Equal(t, sigs[0], sigV2) +} From 311386074e0710d3fc175d78c3f030088e17d67a Mon Sep 17 00:00:00 2001 From: sahith-narahari Date: Wed, 17 Jun 2020 19:03:43 +0530 Subject: [PATCH 02/10] Add tests for verify signatures --- x/auth/signing/verify_test.go | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/x/auth/signing/verify_test.go b/x/auth/signing/verify_test.go index 475b05fc1029..356d24bd4b12 100644 --- a/x/auth/signing/verify_test.go +++ b/x/auth/signing/verify_test.go @@ -15,7 +15,6 @@ import ( ) func TestVerifySignature(t *testing.T) { - msg := []byte{1, 2, 3, 4} _, pubKey, _ := types.KeyTestPubAddr() addr := sdk.AccAddress(pubKey.Address()) app, ctx := createTestApp(false) @@ -30,11 +29,19 @@ func TestVerifySignature(t *testing.T) { balances := sdk.NewCoins(sdk.NewInt64Coin("atom", 200)) require.NoError(t, app.BankKeeper.SetBalances(ctx, addr, balances)) + acc, err := ante.GetSignerAcc(ctx, app.AccountKeeper, addr) + msgs := []sdk.Msg{types.NewTestMsg(addr)} + fee := types.NewStdFee(50000, sdk.Coins{sdk.NewInt64Coin("atom", 150)}) - sig := types.StdSignature{PubKey: pubKey.Bytes(), Signature: msg} - stdTx := types.NewStdTx([]sdk.Msg{types.NewTestMsg(addr)}, fee, []types.StdSignature{sig}, "testsigs") + txBuilder := types.NewTxBuilder(types.DefaultTxEncoder(codec.New()), acc.GetAccountNumber(), acc.GetSequence(), + 200000, 1.1, false, "test-chain", "hello", sdk.NewCoins(), + sdk.DecCoins{sdk.NewDecCoinFromDec(sdk.DefaultBondDenom, sdk.NewDecWithPrec(10000, sdk.Precision))}, + ) + signBytes, err := txBuilder.BuildSignMsg(msgs) + sign, err := txBuilder.Sign("addr", signBytes) + stdSig := types.StdSignature{PubKey: pubKey.Bytes(), Signature: sign} + stdTx := types.NewStdTx(msgs, fee, []types.StdSignature{}, "testsigs") - acc, err := ante.GetSignerAcc(ctx, app.AccountKeeper, addr) require.Nil(t, err) genesis := ctx.BlockHeight() == 0 chainID := ctx.ChainID() @@ -48,7 +55,7 @@ func TestVerifySignature(t *testing.T) { AccountSequence: acc.GetSequence(), } - sigV2, err := types.StdSignatureToSignatureV2(cdc, sig) + sigV2, err := types.StdSignatureToSignatureV2(cdc, stdSig) handler := MakeTestHandlerMap() err = signing.VerifySignature(pubKey, signerData, sigV2.Data, handler, stdTx) From 0756f34ca2bebb72badcc2454320ad42a333277b Mon Sep 17 00:00:00 2001 From: sahith-narahari Date: Thu, 18 Jun 2020 22:59:57 +0530 Subject: [PATCH 03/10] Update verify tests --- x/auth/ante/sigverify.go | 19 +++++++++---------- x/auth/signing/verify_test.go | 23 +++++++++++++++++++++-- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/x/auth/ante/sigverify.go b/x/auth/ante/sigverify.go index bacf5b117659..b7d7d46dea31 100644 --- a/x/auth/ante/sigverify.go +++ b/x/auth/ante/sigverify.go @@ -365,17 +365,16 @@ func ConsumeMultisignatureVerificationGas( for i := 0; i < size; i++ { if !sig.BitArray.GetIndex(i) { continue - } else { - sigV2 := signing.SignatureV2{ - PubKey: pubkey.GetPubKeys()[i], - Data: sig.Signatures[sigIndex], - } - err := DefaultSigVerificationGasConsumer(meter, sigV2, params) - if err != nil { - return err - } - sigIndex++ } + sigV2 := signing.SignatureV2{ + PubKey: pubkey.GetPubKeys()[i], + Data: sig.Signatures[sigIndex], + } + err := DefaultSigVerificationGasConsumer(meter, sigV2, params) + if err != nil { + return err + } + sigIndex++ } return nil diff --git a/x/auth/signing/verify_test.go b/x/auth/signing/verify_test.go index 356d24bd4b12..691f10707856 100644 --- a/x/auth/signing/verify_test.go +++ b/x/auth/signing/verify_test.go @@ -1,6 +1,9 @@ package signing_test import ( + "github.com/cosmos/cosmos-sdk/crypto/hd" + "github.com/cosmos/cosmos-sdk/crypto/keyring" + "github.com/cosmos/cosmos-sdk/tests" "testing" "github.com/stretchr/testify/require" @@ -37,12 +40,28 @@ func TestVerifySignature(t *testing.T) { 200000, 1.1, false, "test-chain", "hello", sdk.NewCoins(), sdk.DecCoins{sdk.NewDecCoinFromDec(sdk.DefaultBondDenom, sdk.NewDecWithPrec(10000, sdk.Precision))}, ) + + dir, clean := tests.NewTestCaseDir(t) + t.Cleanup(clean) + + path := hd.CreateHDPath(118, 0, 0).String() + kr, err := keyring.New(sdk.KeyringServiceName(), "test", dir, nil) + require.NoError(t, err) + + var from = "test_sign" + + _, _, err = kr.NewMnemonic(from, keyring.English, path, hd.Secp256k1) + require.NoError(t, err) + txBuilder.WithKeybase(kr) signBytes, err := txBuilder.BuildSignMsg(msgs) - sign, err := txBuilder.Sign("addr", signBytes) + require.Nil(t, err) + + sign, err := txBuilder.Sign(from, signBytes) + require.Nil(t, err) + stdSig := types.StdSignature{PubKey: pubKey.Bytes(), Signature: sign} stdTx := types.NewStdTx(msgs, fee, []types.StdSignature{}, "testsigs") - require.Nil(t, err) genesis := ctx.BlockHeight() == 0 chainID := ctx.ChainID() var accNum uint64 From 4556e62df904300f9379ce8c5f7bec0592f0451f Mon Sep 17 00:00:00 2001 From: anilCSE Date: Sun, 21 Jun 2020 01:35:28 +0530 Subject: [PATCH 04/10] Fix register codec issue --- x/auth/signing/verify_test.go | 37 +++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/x/auth/signing/verify_test.go b/x/auth/signing/verify_test.go index 691f10707856..7701d1e82b68 100644 --- a/x/auth/signing/verify_test.go +++ b/x/auth/signing/verify_test.go @@ -1,9 +1,11 @@ package signing_test import ( + "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/cosmos/cosmos-sdk/tests" + "github.com/spf13/viper" "testing" "github.com/stretchr/testify/require" @@ -23,9 +25,26 @@ func TestVerifySignature(t *testing.T) { app, ctx := createTestApp(false) ctx = ctx.WithBlockHeight(1) + dir, clean := tests.NewTestCaseDir(t) + t.Cleanup(clean) + + viper.Set(flags.FlagKeyringBackend, "test") + path := hd.CreateHDPath(118, 0, 0).String() + kr, err := keyring.New(sdk.KeyringServiceName(), "test", dir, nil) + require.NoError(t, err) + + var from = "test_sign" + _, _, err = kr.NewMnemonic(from, keyring.English, path, hd.Secp256k1) + require.NoError(t, err) + + viper.Set(flags.FlagFrom, from) + viper.Set(flags.FlagChainID, "test-chain") + viper.Set(flags.FlagHome, dir) + cdc := codec.New() sdk.RegisterCodec(cdc) types.RegisterCodec(cdc) + cdc.RegisterConcrete(sdk.TestMsg{}, "cosmos-sdk/Test", nil) acc1 := app.AccountKeeper.NewAccountWithAddress(ctx, addr) app.AccountKeeper.SetAccount(ctx, acc1) @@ -36,23 +55,11 @@ func TestVerifySignature(t *testing.T) { msgs := []sdk.Msg{types.NewTestMsg(addr)} fee := types.NewStdFee(50000, sdk.Coins{sdk.NewInt64Coin("atom", 150)}) - txBuilder := types.NewTxBuilder(types.DefaultTxEncoder(codec.New()), acc.GetAccountNumber(), acc.GetSequence(), + txBuilder := types.NewTxBuilder(types.DefaultTxEncoder(cdc), acc.GetAccountNumber(), acc.GetSequence(), 200000, 1.1, false, "test-chain", "hello", sdk.NewCoins(), sdk.DecCoins{sdk.NewDecCoinFromDec(sdk.DefaultBondDenom, sdk.NewDecWithPrec(10000, sdk.Precision))}, - ) + ).WithKeybase(kr) - dir, clean := tests.NewTestCaseDir(t) - t.Cleanup(clean) - - path := hd.CreateHDPath(118, 0, 0).String() - kr, err := keyring.New(sdk.KeyringServiceName(), "test", dir, nil) - require.NoError(t, err) - - var from = "test_sign" - - _, _, err = kr.NewMnemonic(from, keyring.English, path, hd.Secp256k1) - require.NoError(t, err) - txBuilder.WithKeybase(kr) signBytes, err := txBuilder.BuildSignMsg(msgs) require.Nil(t, err) @@ -60,7 +67,7 @@ func TestVerifySignature(t *testing.T) { require.Nil(t, err) stdSig := types.StdSignature{PubKey: pubKey.Bytes(), Signature: sign} - stdTx := types.NewStdTx(msgs, fee, []types.StdSignature{}, "testsigs") + stdTx := types.NewStdTx(msgs, fee, []types.StdSignature{stdSig}, "testsigs") genesis := ctx.BlockHeight() == 0 chainID := ctx.ChainID() From deffd9995f9ef8b89afb6dfd3e6788f1fe4d64c6 Mon Sep 17 00:00:00 2001 From: anilCSE Date: Sun, 21 Jun 2020 01:45:31 +0530 Subject: [PATCH 05/10] debug --- x/auth/signing/verify_test.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/x/auth/signing/verify_test.go b/x/auth/signing/verify_test.go index 7701d1e82b68..2becea2ed7ad 100644 --- a/x/auth/signing/verify_test.go +++ b/x/auth/signing/verify_test.go @@ -56,7 +56,7 @@ func TestVerifySignature(t *testing.T) { fee := types.NewStdFee(50000, sdk.Coins{sdk.NewInt64Coin("atom", 150)}) txBuilder := types.NewTxBuilder(types.DefaultTxEncoder(cdc), acc.GetAccountNumber(), acc.GetSequence(), - 200000, 1.1, false, "test-chain", "hello", sdk.NewCoins(), + 200000, 1.1, false, "test-chain", "testsigs", sdk.NewCoins(), sdk.DecCoins{sdk.NewDecCoinFromDec(sdk.DefaultBondDenom, sdk.NewDecWithPrec(10000, sdk.Precision))}, ).WithKeybase(kr) @@ -67,17 +67,13 @@ func TestVerifySignature(t *testing.T) { require.Nil(t, err) stdSig := types.StdSignature{PubKey: pubKey.Bytes(), Signature: sign} - stdTx := types.NewStdTx(msgs, fee, []types.StdSignature{stdSig}, "testsigs") + stdTx := types.NewStdTx(msgs, fee, []types.StdSignature{}, "testsigs") - genesis := ctx.BlockHeight() == 0 chainID := ctx.ChainID() - var accNum uint64 - if !genesis { - accNum = acc.GetAccountNumber() - } + signerData := signing.SignerData{ ChainID: chainID, - AccountNumber: accNum, + AccountNumber: acc.GetAccountNumber(), AccountSequence: acc.GetSequence(), } From 25e28a67ef978a5f21cc99cce1e4a8e85c6000e0 Mon Sep 17 00:00:00 2001 From: anilCSE Date: Sun, 21 Jun 2020 01:56:01 +0530 Subject: [PATCH 06/10] Cleanup --- x/auth/signing/verify_test.go | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/x/auth/signing/verify_test.go b/x/auth/signing/verify_test.go index 2becea2ed7ad..45842bf5fe38 100644 --- a/x/auth/signing/verify_test.go +++ b/x/auth/signing/verify_test.go @@ -21,6 +21,14 @@ import ( func TestVerifySignature(t *testing.T) { _, pubKey, _ := types.KeyTestPubAddr() + + const ( + from = "test_sign" + backend = "test" + memo = "testmemo" + chainId = "test-chain" + ) + addr := sdk.AccAddress(pubKey.Address()) app, ctx := createTestApp(false) ctx = ctx.WithBlockHeight(1) @@ -28,17 +36,17 @@ func TestVerifySignature(t *testing.T) { dir, clean := tests.NewTestCaseDir(t) t.Cleanup(clean) - viper.Set(flags.FlagKeyringBackend, "test") + viper.Set(flags.FlagKeyringBackend, backend) path := hd.CreateHDPath(118, 0, 0).String() - kr, err := keyring.New(sdk.KeyringServiceName(), "test", dir, nil) + kr, err := keyring.New(sdk.KeyringServiceName(), backend, dir, nil) require.NoError(t, err) - var from = "test_sign" + _, _, err = kr.NewMnemonic(from, keyring.English, path, hd.Secp256k1) require.NoError(t, err) viper.Set(flags.FlagFrom, from) - viper.Set(flags.FlagChainID, "test-chain") + viper.Set(flags.FlagChainID, chainId) viper.Set(flags.FlagHome, dir) cdc := codec.New() @@ -56,8 +64,10 @@ func TestVerifySignature(t *testing.T) { fee := types.NewStdFee(50000, sdk.Coins{sdk.NewInt64Coin("atom", 150)}) txBuilder := types.NewTxBuilder(types.DefaultTxEncoder(cdc), acc.GetAccountNumber(), acc.GetSequence(), - 200000, 1.1, false, "test-chain", "testsigs", sdk.NewCoins(), - sdk.DecCoins{sdk.NewDecCoinFromDec(sdk.DefaultBondDenom, sdk.NewDecWithPrec(10000, sdk.Precision))}, + fee.Gas, 0, false, chainId, + memo, + fee.Amount, + nil, ).WithKeybase(kr) signBytes, err := txBuilder.BuildSignMsg(msgs) @@ -67,7 +77,7 @@ func TestVerifySignature(t *testing.T) { require.Nil(t, err) stdSig := types.StdSignature{PubKey: pubKey.Bytes(), Signature: sign} - stdTx := types.NewStdTx(msgs, fee, []types.StdSignature{}, "testsigs") + stdTx := types.NewStdTx(msgs, fee, []types.StdSignature{}, memo) chainID := ctx.ChainID() From e5e144697811ea023cd1c3e42fc7ace7fc3c6132 Mon Sep 17 00:00:00 2001 From: anilCSE Date: Tue, 23 Jun 2020 02:04:45 +0530 Subject: [PATCH 07/10] Fix verify signature tests --- x/auth/signing/verify_test.go | 36 ++++++++++------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/x/auth/signing/verify_test.go b/x/auth/signing/verify_test.go index 45842bf5fe38..6b92e7562a3b 100644 --- a/x/auth/signing/verify_test.go +++ b/x/auth/signing/verify_test.go @@ -20,7 +20,7 @@ import ( ) func TestVerifySignature(t *testing.T) { - _, pubKey, _ := types.KeyTestPubAddr() + priv, pubKey, addr := types.KeyTestPubAddr() const ( from = "test_sign" @@ -29,7 +29,6 @@ func TestVerifySignature(t *testing.T) { chainId = "test-chain" ) - addr := sdk.AccAddress(pubKey.Address()) app, ctx := createTestApp(false) ctx = ctx.WithBlockHeight(1) @@ -41,7 +40,6 @@ func TestVerifySignature(t *testing.T) { kr, err := keyring.New(sdk.KeyringServiceName(), backend, dir, nil) require.NoError(t, err) - _, _, err = kr.NewMnemonic(from, keyring.English, path, hd.Secp256k1) require.NoError(t, err) @@ -58,40 +56,26 @@ func TestVerifySignature(t *testing.T) { app.AccountKeeper.SetAccount(ctx, acc1) balances := sdk.NewCoins(sdk.NewInt64Coin("atom", 200)) require.NoError(t, app.BankKeeper.SetBalances(ctx, addr, balances)) - acc, err := ante.GetSignerAcc(ctx, app.AccountKeeper, addr) - msgs := []sdk.Msg{types.NewTestMsg(addr)} + require.NoError(t, app.BankKeeper.SetBalances(ctx, addr, balances)) + msgs := []sdk.Msg{types.NewTestMsg(addr)} fee := types.NewStdFee(50000, sdk.Coins{sdk.NewInt64Coin("atom", 150)}) - txBuilder := types.NewTxBuilder(types.DefaultTxEncoder(cdc), acc.GetAccountNumber(), acc.GetSequence(), - fee.Gas, 0, false, chainId, - memo, - fee.Amount, - nil, - ).WithKeybase(kr) - - signBytes, err := txBuilder.BuildSignMsg(msgs) - require.Nil(t, err) - - sign, err := txBuilder.Sign(from, signBytes) - require.Nil(t, err) - - stdSig := types.StdSignature{PubKey: pubKey.Bytes(), Signature: sign} - stdTx := types.NewStdTx(msgs, fee, []types.StdSignature{}, memo) - - chainID := ctx.ChainID() - signerData := signing.SignerData{ - ChainID: chainID, + ChainID: chainId, AccountNumber: acc.GetAccountNumber(), AccountSequence: acc.GetSequence(), } + signBytes := types.StdSignBytes(signerData.ChainID, signerData.AccountNumber, signerData.AccountSequence, + fee, msgs, memo) + signature, err := priv.Sign(signBytes) + require.NoError(t, err) + stdSig := types.StdSignature{PubKey: pubKey.Bytes(), Signature: signature} sigV2, err := types.StdSignatureToSignatureV2(cdc, stdSig) handler := MakeTestHandlerMap() - + stdTx := types.NewStdTx(msgs, fee, []types.StdSignature{stdSig}, memo) err = signing.VerifySignature(pubKey, signerData, sigV2.Data, handler, stdTx) - t.Log(err) require.NoError(t, err) } From 488ad4424fc8989007afd4422d5318c76f6b8acf Mon Sep 17 00:00:00 2001 From: anilCSE Date: Tue, 23 Jun 2020 02:26:24 +0530 Subject: [PATCH 08/10] Remove viper --- x/auth/signing/verify_test.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/x/auth/signing/verify_test.go b/x/auth/signing/verify_test.go index 6b92e7562a3b..188c51996a64 100644 --- a/x/auth/signing/verify_test.go +++ b/x/auth/signing/verify_test.go @@ -1,11 +1,9 @@ package signing_test import ( - "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/cosmos/cosmos-sdk/tests" - "github.com/spf13/viper" "testing" "github.com/stretchr/testify/require" @@ -35,7 +33,6 @@ func TestVerifySignature(t *testing.T) { dir, clean := tests.NewTestCaseDir(t) t.Cleanup(clean) - viper.Set(flags.FlagKeyringBackend, backend) path := hd.CreateHDPath(118, 0, 0).String() kr, err := keyring.New(sdk.KeyringServiceName(), backend, dir, nil) require.NoError(t, err) @@ -43,10 +40,6 @@ func TestVerifySignature(t *testing.T) { _, _, err = kr.NewMnemonic(from, keyring.English, path, hd.Secp256k1) require.NoError(t, err) - viper.Set(flags.FlagFrom, from) - viper.Set(flags.FlagChainID, chainId) - viper.Set(flags.FlagHome, dir) - cdc := codec.New() sdk.RegisterCodec(cdc) types.RegisterCodec(cdc) From e5a79cf8fb3c45e22c1bfac810555fcae1b1acb6 Mon Sep 17 00:00:00 2001 From: anilCSE Date: Tue, 23 Jun 2020 02:27:53 +0530 Subject: [PATCH 09/10] remove keyring usage --- x/auth/signing/verify_test.go | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/x/auth/signing/verify_test.go b/x/auth/signing/verify_test.go index 188c51996a64..acf14ddfa849 100644 --- a/x/auth/signing/verify_test.go +++ b/x/auth/signing/verify_test.go @@ -1,9 +1,6 @@ package signing_test import ( - "github.com/cosmos/cosmos-sdk/crypto/hd" - "github.com/cosmos/cosmos-sdk/crypto/keyring" - "github.com/cosmos/cosmos-sdk/tests" "testing" "github.com/stretchr/testify/require" @@ -30,16 +27,6 @@ func TestVerifySignature(t *testing.T) { app, ctx := createTestApp(false) ctx = ctx.WithBlockHeight(1) - dir, clean := tests.NewTestCaseDir(t) - t.Cleanup(clean) - - path := hd.CreateHDPath(118, 0, 0).String() - kr, err := keyring.New(sdk.KeyringServiceName(), backend, dir, nil) - require.NoError(t, err) - - _, _, err = kr.NewMnemonic(from, keyring.English, path, hd.Secp256k1) - require.NoError(t, err) - cdc := codec.New() sdk.RegisterCodec(cdc) types.RegisterCodec(cdc) From b20c3f552e48e6ee9d2f0faee5cec6979699c23e Mon Sep 17 00:00:00 2001 From: anilCSE Date: Wed, 24 Jun 2020 02:40:56 +0530 Subject: [PATCH 10/10] Fix review changes --- x/auth/signing/verify_test.go | 2 -- x/auth/types/stdtx_test.go | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/x/auth/signing/verify_test.go b/x/auth/signing/verify_test.go index acf14ddfa849..c6f2c7cb1534 100644 --- a/x/auth/signing/verify_test.go +++ b/x/auth/signing/verify_test.go @@ -18,8 +18,6 @@ func TestVerifySignature(t *testing.T) { priv, pubKey, addr := types.KeyTestPubAddr() const ( - from = "test_sign" - backend = "test" memo = "testmemo" chainId = "test-chain" ) diff --git a/x/auth/types/stdtx_test.go b/x/auth/types/stdtx_test.go index 995db6b47b76..bdd94d3336e4 100644 --- a/x/auth/types/stdtx_test.go +++ b/x/auth/types/stdtx_test.go @@ -244,6 +244,9 @@ func TestGetSignaturesV2(t *testing.T) { require.Nil(t, err) require.Equal(t, len(sigs), 1) - sigV2, err := StdSignatureToSignatureV2(cdc, sig) - require.Equal(t, sigs[0], sigV2) + require.Equal(t, sigs[0].PubKey.Bytes(), sig.GetPubKey().Bytes()) + require.Equal(t, sigs[0].Data, &signing.SingleSignatureData{ + SignMode: signing.SignMode_SIGN_MODE_LEGACY_AMINO_JSON, + Signature: sig.GetSignature(), + }) }