-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(client/tx): simulate with correct pk (#18472)
(cherry picked from commit 80e0c63) # Conflicts: # CHANGELOG.md # client/tx/aux_builder_test.go # client/tx/factory_test.go # client/tx/tx_test.go
- Loading branch information
1 parent
03d578b
commit 39f9722
Showing
6 changed files
with
663 additions
and
27 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,122 @@ | ||
package tx_test | ||
package tx | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/cosmos/cosmos-sdk/client" | ||
<<<<<<< HEAD | ||
"github.com/cosmos/cosmos-sdk/client/tx" | ||
"github.com/stretchr/testify/require" | ||
======= | ||
"github.com/cosmos/cosmos-sdk/codec" | ||
codectypes "github.com/cosmos/cosmos-sdk/codec/types" | ||
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" | ||
"github.com/cosmos/cosmos-sdk/crypto/hd" | ||
"github.com/cosmos/cosmos-sdk/crypto/keyring" | ||
"github.com/cosmos/cosmos-sdk/crypto/keys/multisig" | ||
"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" | ||
"github.com/cosmos/cosmos-sdk/crypto/types" | ||
"github.com/cosmos/cosmos-sdk/testutil/testdata" | ||
"github.com/cosmos/cosmos-sdk/types/tx/signing" | ||
>>>>>>> 80e0c631c (fix(client/tx): simulate with correct pk (#18472)) | ||
) | ||
|
||
func TestFactoryPrepate(t *testing.T) { | ||
func TestFactoryPrepare(t *testing.T) { | ||
t.Parallel() | ||
|
||
factory := tx.Factory{} | ||
factory := Factory{} | ||
clientCtx := client.Context{} | ||
|
||
output, err := factory.Prepare(clientCtx.WithOffline(true)) | ||
require.NoError(t, err) | ||
require.Equal(t, output, factory) | ||
|
||
factory = tx.Factory{}.WithAccountRetriever(client.MockAccountRetriever{ReturnAccNum: 10, ReturnAccSeq: 1}).WithAccountNumber(5) | ||
factory = Factory{}.WithAccountRetriever(client.MockAccountRetriever{ReturnAccNum: 10, ReturnAccSeq: 1}).WithAccountNumber(5) | ||
output, err = factory.Prepare(clientCtx.WithFrom("foo")) | ||
require.NoError(t, err) | ||
require.NotEqual(t, output, factory) | ||
require.Equal(t, output.AccountNumber(), uint64(5)) | ||
require.Equal(t, output.Sequence(), uint64(1)) | ||
|
||
factory = tx.Factory{}.WithAccountRetriever(client.MockAccountRetriever{ReturnAccNum: 10, ReturnAccSeq: 1}) | ||
factory = Factory{}.WithAccountRetriever(client.MockAccountRetriever{ReturnAccNum: 10, ReturnAccSeq: 1}) | ||
output, err = factory.Prepare(clientCtx.WithFrom("foo")) | ||
require.NoError(t, err) | ||
require.NotEqual(t, output, factory) | ||
require.Equal(t, output.AccountNumber(), uint64(10)) | ||
require.Equal(t, output.Sequence(), uint64(1)) | ||
} | ||
|
||
func TestFactory_getSimPKType(t *testing.T) { | ||
// setup keyring | ||
registry := codectypes.NewInterfaceRegistry() | ||
cryptocodec.RegisterInterfaces(registry) | ||
k := keyring.NewInMemory(codec.NewProtoCodec(registry)) | ||
|
||
tests := []struct { | ||
name string | ||
fromName string | ||
genKey func(fromName string, k keyring.Keyring) error | ||
wantType types.PubKey | ||
}{ | ||
{ | ||
name: "simple key", | ||
fromName: "testKey", | ||
genKey: func(fromName string, k keyring.Keyring) error { | ||
_, err := k.NewAccount(fromName, testdata.TestMnemonic, "", "", hd.Secp256k1) | ||
return err | ||
}, | ||
wantType: (*secp256k1.PubKey)(nil), | ||
}, | ||
{ | ||
name: "multisig key", | ||
fromName: "multiKey", | ||
genKey: func(fromName string, k keyring.Keyring) error { | ||
pk := multisig.NewLegacyAminoPubKey(1, []types.PubKey{&multisig.LegacyAminoPubKey{}}) | ||
_, err := k.SaveMultisig(fromName, pk) | ||
return err | ||
}, | ||
wantType: (*multisig.LegacyAminoPubKey)(nil), | ||
}, | ||
} | ||
|
||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
err := tt.genKey(tt.fromName, k) | ||
require.NoError(t, err) | ||
f := Factory{ | ||
keybase: k, | ||
fromName: tt.fromName, | ||
simulateAndExecute: true, | ||
} | ||
got, err := f.getSimPK() | ||
require.NoError(t, err) | ||
require.IsType(t, tt.wantType, got) | ||
}) | ||
} | ||
} | ||
|
||
func TestFactory_getSimSignatureData(t *testing.T) { | ||
tests := []struct { | ||
name string | ||
pk types.PubKey | ||
wantType any | ||
}{ | ||
{ | ||
name: "simple pubkey", | ||
pk: &secp256k1.PubKey{}, | ||
wantType: (*signing.SingleSignatureData)(nil), | ||
}, | ||
{ | ||
name: "multisig pubkey", | ||
pk: &multisig.LegacyAminoPubKey{}, | ||
wantType: (*signing.MultiSignatureData)(nil), | ||
}, | ||
} | ||
|
||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
got := Factory{}.getSimSignatureData(tt.pk) | ||
require.IsType(t, tt.wantType, got) | ||
}) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package tx_test | ||
package tx | ||
|
||
import ( | ||
"testing" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters