LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

refactor(types,client,simapp): remove some address String() calls (#21455)

Browse Source
This commit is contained in:
Julián Toledano
2024-09-02 10:28:12 +00:00
committed by GitHub
parent f79b3802ac
commit a51b432b76
23 changed files with 243 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crypto/keyring/keyring_test.go
+2 -1
View File
@@ -17,6 +17,7 @@ import (
"golang.org/x/crypto/bcrypt"
"github.com/cosmos/cosmos-sdk/codec"
codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/crypto"
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
@@ -223,7 +224,7 @@ func TestNewKey(t *testing.T) {
_, err = kb.KeyByAddress(addr)
require.NoError(t, err)
addr, err = sdk.AccAddressFromBech32("cosmos1yq8lgssgxlx9smjhes6ryjasmqmd3ts2559g0t")
addr, err = codectestutil.CodecOptions{}.GetAddressCodec().StringToBytes("cosmos1yq8lgssgxlx9smjhes6ryjasmqmd3ts2559g0t")
require.NoError(t, err)
_, err = kb.KeyByAddress(addr)
require.NotNil(t, err)
crypto/ledger/ledger_mock.go
+6 -2
View File
@@ -12,10 +12,10 @@ import (
secp "github.com/decred/dcrd/dcrec/secp256k1/v4"
"github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa"
codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil"
"github.com/cosmos/cosmos-sdk/crypto/hd"
csecp256k1 "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
)
// If ledger support (build tag) has been enabled, which implies a CGO dependency,
@@ -78,7 +78,11 @@ func (mock LedgerSECP256K1Mock) GetAddressPubKeySECP256K1(derivationPath []uint3
// Generate the bech32 addr using existing cmtcrypto/etc.
pub := &csecp256k1.PubKey{Key: compressedPublicKey}
addr := sdk.AccAddress(pub.Address()).String()
addr, err := codectestutil.CodecOptions{}.GetAddressCodec().BytesToString(pub.Address())
if err != nil {
return nil, "", err
}
return pk, addr, err
}
crypto/ledger/ledger_test.go
+10 -3
View File
@@ -10,12 +10,15 @@ import (
"github.com/stretchr/testify/require"
"github.com/cosmos/cosmos-sdk/codec/legacy"
codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil"
"github.com/cosmos/cosmos-sdk/crypto/hd"
"github.com/cosmos/cosmos-sdk/crypto/types"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
)
var ac = codectestutil.CodecOptions{}.GetAddressCodec()
func TestPublicKeyUnsafe(t *testing.T) {
path := *hd.NewFundraiserParams(0, sdk.CoinType, 0)
priv, err := NewPrivKeySecp256k1Unsafe(path)
@@ -31,7 +34,8 @@ func checkDefaultPubKey(t *testing.T, priv types.LedgerPrivKey) {
fmt.Sprintf("%x", cdc.Amino.MustMarshalBinaryBare(priv.PubKey())),
"Is your device using test mnemonic: %s ?", testdata.TestMnemonic)
require.Equal(t, expectedPkStr, priv.PubKey().String())
addr := sdk.AccAddress(priv.PubKey().Address()).String()
addr, err := ac.BytesToString(priv.PubKey().Address())
require.NoError(t, err)
require.Equal(t, "cosmos1w34k53py5v5xyluazqpq65agyajavep2rflq6h",
addr, "Is your device using test mnemonic: %s ?", testdata.TestMnemonic)
}
@@ -98,7 +102,8 @@ func TestPublicKeySafe(t *testing.T) {
require.Nil(t, ShowAddress(path, priv.PubKey(), "cosmos"))
checkDefaultPubKey(t, priv)
addr2 := sdk.AccAddress(priv.PubKey().Address()).String()
addr2, err := ac.BytesToString(priv.PubKey().Address())
require.NoError(t, err)
require.Equal(t, addr, addr2)
}
@@ -143,7 +148,9 @@ func TestPublicKeyHDPath(t *testing.T) {
require.NotNil(t, addr)
require.NotNil(t, priv)
addr2 := sdk.AccAddress(priv.PubKey().Address()).String()
addr2, err := ac.BytesToString(priv.PubKey().Address())
require.NoError(t, err)
require.Equal(t, addr2, addr)
require.Equal(t,
expectedAddrs[i], addr,