refactor!: deprecate sdk.Msg.GetSigners (#15284)
Co-authored-by: Matt Kocubinski <mkocubinski@gmail.com>
This commit is contained in:
co-authored by
Matt Kocubinski
parent
b6613f9163
commit
82659a7477
@@ -561,6 +561,7 @@ func (s *E2ETestSuite) TestCLIQueryTxCmdByEvents() {
|
||||
s.Require().Contains(err.Error(), tc.expectErrStr)
|
||||
} else {
|
||||
var result sdk.TxResponse
|
||||
s.Require().NoError(err)
|
||||
s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &result))
|
||||
s.Require().NotNil(result.Height)
|
||||
}
|
||||
@@ -743,7 +744,9 @@ func (s *E2ETestSuite) TestCLISendGenerateSignAndBroadcast() {
|
||||
sigs, err = txBuilder.GetTx().GetSignaturesV2()
|
||||
s.Require().NoError(err)
|
||||
s.Require().Equal(1, len(sigs))
|
||||
s.Require().Equal(val1.Address.String(), txBuilder.GetTx().GetSigners()[0].String())
|
||||
signers, err := txBuilder.GetTx().GetSigners()
|
||||
s.Require().NoError(err)
|
||||
s.Require().Equal([]byte(val1.Address), signers[0])
|
||||
|
||||
// Write the output to disk
|
||||
signedTxFile := testutil.WriteToNewTempFile(s.T(), signedTx.String())
|
||||
@@ -1580,7 +1583,9 @@ func (s *E2ETestSuite) TestSignWithMultiSignersAminoJSON() {
|
||||
)
|
||||
txBuilder.SetFeeAmount(sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))))
|
||||
txBuilder.SetGasLimit(testdata.NewTestGasLimit() * 2)
|
||||
require.Equal([]sdk.AccAddress{val0.Address, val1.Address}, txBuilder.GetTx().GetSigners())
|
||||
signers, err := txBuilder.GetTx().GetSigners()
|
||||
require.NoError(err)
|
||||
require.Equal([][]byte{val0.Address, val1.Address}, signers)
|
||||
|
||||
// Write the unsigned tx into a file.
|
||||
txJSON, err := val0.ClientCtx.TxConfig.TxJSONEncoder()(txBuilder.GetTx())
|
||||
|
||||
@@ -1102,7 +1102,9 @@ func (s *E2ETestSuite) mkTxBuilder() client.TxBuilder {
|
||||
txBuilder.SetFeeAmount(feeAmount)
|
||||
txBuilder.SetGasLimit(gasLimit)
|
||||
txBuilder.SetMemo("foobar")
|
||||
s.Require().Equal([]sdk.AccAddress{val.Address}, txBuilder.GetTx().GetSigners())
|
||||
signers, err := txBuilder.GetTx().GetSigners()
|
||||
s.Require().NoError(err)
|
||||
s.Require().Equal([][]byte{val.Address}, signers)
|
||||
|
||||
// setup txFactory
|
||||
txFactory := clienttx.Factory{}.
|
||||
@@ -1112,7 +1114,7 @@ func (s *E2ETestSuite) mkTxBuilder() client.TxBuilder {
|
||||
WithSignMode(signing.SignMode_SIGN_MODE_DIRECT)
|
||||
|
||||
// Sign Tx.
|
||||
err := authclient.SignTx(txFactory, val.ClientCtx, val.Moniker, txBuilder, false, true)
|
||||
err = authclient.SignTx(txFactory, val.ClientCtx, val.Moniker, txBuilder, false, true)
|
||||
s.Require().NoError(err)
|
||||
|
||||
return txBuilder
|
||||
|
||||
@@ -50,6 +50,7 @@ import (
|
||||
txtypes "github.com/cosmos/cosmos-sdk/types/tx"
|
||||
signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth/signing"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth/tx"
|
||||
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
||||
@@ -131,7 +132,7 @@ func TestAminoJSON_Equivalence(t *testing.T) {
|
||||
require.Equal(t, string(legacyAminoJSON), string(aminoJSON))
|
||||
|
||||
// test amino json signer handler equivalence
|
||||
gogoMsg, ok := gogo.(types.Msg)
|
||||
gogoMsg, ok := gogo.(legacytx.LegacyMsg)
|
||||
if !ok {
|
||||
// not signable
|
||||
return
|
||||
@@ -440,7 +441,7 @@ func TestAminoJSON_LegacyParity(t *testing.T) {
|
||||
require.Equal(t, string(gogoBytes), string(newGogoBytes))
|
||||
|
||||
// test amino json signer handler equivalence
|
||||
msg, ok := tc.gogo.(types.Msg)
|
||||
msg, ok := tc.gogo.(legacytx.LegacyMsg)
|
||||
if !ok {
|
||||
// not signable
|
||||
return
|
||||
|
||||
@@ -23,6 +23,7 @@ import (
|
||||
txtypes "github.com/cosmos/cosmos-sdk/types/tx"
|
||||
"github.com/cosmos/cosmos-sdk/types/tx/signing"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
|
||||
"github.com/cosmos/cosmos-sdk/x/auth/vesting"
|
||||
authzmodule "github.com/cosmos/cosmos-sdk/x/authz/module"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank"
|
||||
@@ -101,7 +102,7 @@ func TestDecode(t *testing.T) {
|
||||
Sequence: accSeq,
|
||||
}
|
||||
|
||||
gogoMsg, ok := gogo.(sdk.Msg)
|
||||
gogoMsg, ok := gogo.(legacytx.LegacyMsg)
|
||||
require.True(t, ok)
|
||||
|
||||
err = txBuilder.SetMsgs(gogoMsg)
|
||||
|
||||
Reference in New Issue
Block a user