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

chore: Review feedback (#23465)

Browse Source
This commit is contained in:
Alexander Peters 2025-01-20 13:04:29 +01:00 committed by GitHub
parent 0440a13dd0
commit 66a766beae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
simapp/v2/sim_test_utils.go
View File

@ -33,7 +33,6 @@ func AssertEqualStores(tb testing.TB, srcRootStore, otherRootStore storev2.RootS
if !assert.Empty(tb, len(failedKVAs), storeKey+": "+GetSimulationLog(storeKey, storeDecoders, failedKVAs, failedKVBs)) {
for i, v := range failedKVAs {
tb.Logf("store mismatch: %q\n %q\n", v, failedKVBs[i])
break // todo: remove
}
tb.FailNow()
}

11
x/staking/keeper/genesis.go
View File

@ -361,7 +361,7 @@ func (k Keeper) ExportGenesis(ctx context.Context) (*types.GenesisState, error)
}
var initConsAddrs, rotatedConsAddrs []types.RotatedConsensusAddresses
err = k.ConsAddrToValidatorIdentifierMap.Walk(ctx, nil, func(newBz []byte, initBz []byte) (stop bool, err error) {
err = k.ConsAddrToValidatorIdentifierMap.Walk(ctx, nil, func(newBz, initBz []byte) (stop bool, err error) {
oldAddr, err2 := k.consensusAddressCodec.BytesToString(initBz)
if err2 != nil {
return true, fmt.Errorf("decode initial address %X: %w", initBz, err2)
@ -373,7 +373,11 @@ func (k Keeper) ExportGenesis(ctx context.Context) (*types.GenesisState, error)
initConsAddrs = append(initConsAddrs, types.RotatedConsensusAddresses{OldAddress: oldAddr, NewAddress: newAddr})
return false, nil
})
err = k.OldToNewConsAddrMap.Walk(ctx, nil, func(oldBz []byte, newBz []byte) (stop bool, err error) {
if err != nil {
return nil, fmt.Errorf("cons addrs to validator ident: %w", err)
}
err = k.OldToNewConsAddrMap.Walk(ctx, nil, func(oldBz, newBz []byte) (stop bool, err error) {
oldAddr, err2 := k.consensusAddressCodec.BytesToString(oldBz)
if err2 != nil {
return true, fmt.Errorf("decode old address %X: %w", oldBz, err2)
@ -385,6 +389,9 @@ func (k Keeper) ExportGenesis(ctx context.Context) (*types.GenesisState, error)
rotatedConsAddrs = append(rotatedConsAddrs, types.RotatedConsensusAddresses{OldAddress: oldAddr, NewAddress: newAddr})
return false, nil
})
if err != nil {
return nil, fmt.Errorf("old to new cons addrs: %w", err)
}
return &types.GenesisState{
Params: params,