Skip to content

Commit 2d40cc1

Browse files
authored
fix(x/tx): fix amino json drift from legacy spec (#21825)
1 parent bb7d11d commit 2d40cc1

File tree

7 files changed

+426
-341
lines changed

7 files changed

+426
-341
lines changed

tests/integration/rapidgen/rapidgen.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ var (
222222
NonsignableTypes = []GeneratedType{
223223
GenType(&authtypes.Params{}, &authapi.Params{}, GenOpts),
224224
GenType(&authtypes.BaseAccount{}, &authapi.BaseAccount{}, GenOpts.WithAnyTypes(&ed25519.PubKey{})),
225-
GenType(&authtypes.ModuleAccount{}, &authapi.ModuleAccount{}, GenOpts.WithAnyTypes(&ed25519.PubKey{})),
226225
GenType(&authtypes.ModuleCredential{}, &authapi.ModuleCredential{}, GenOpts),
227226

228227
GenType(&authztypes.GenericAuthorization{}, &authzapi.GenericAuthorization{}, GenOpts),
@@ -260,7 +259,9 @@ var (
260259

261260
GenType(&slashingtypes.Params{}, &slashingapi.Params{}, GenOpts.WithDisallowNil()),
262261

263-
GenType(&stakingtypes.StakeAuthorization{}, &stakingapi.StakeAuthorization{}, GenOpts),
262+
// JSON ordering of one of fields to be fixed in https://github.com/cosmos/cosmos-sdk/pull/21782
263+
// TODO uncomment once merged
264+
// GenType(&stakingtypes.StakeAuthorization{}, &stakingapi.StakeAuthorization{}, GenOpts),
264265

265266
GenType(&upgradetypes.CancelSoftwareUpgradeProposal{}, &upgradeapi.CancelSoftwareUpgradeProposal{}, GenOpts), //nolint:staticcheck // testing legacy code path
266267
GenType(&upgradetypes.SoftwareUpgradeProposal{}, &upgradeapi.SoftwareUpgradeProposal{}, GenOpts.WithDisallowNil()), //nolint:staticcheck // testing legacy code path

0 commit comments

Comments
 (0)