refactor!: Remove clientCtx.JSONCodec and rename EncodingConfig.Marshaler to Codec (#9521)
<!-- The default pull request template is for types feat, fix, or refactor. For other templates, add one of the following parameters to the url: - template=docs.md - template=other.md --> ## Description Closes: #9499 <!-- Add a description of the changes that this PR introduces and the files that are the most critical to review. --> --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [x] added `!` to the type prefix if API or client breaking change - [x] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting)) - [x] provided a link to the relevant issue or specification - [x] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing) - [x] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [x] reviewed "Files changed" and left comments if necessary - [x] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable)
This commit is contained in:
@@ -39,7 +39,7 @@ func TestGetCommandEncode(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
clientCtx := client.Context{}.
|
||||
WithTxConfig(encodingConfig.TxConfig).
|
||||
WithCodec(encodingConfig.Marshaler)
|
||||
WithCodec(encodingConfig.Codec)
|
||||
ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx)
|
||||
|
||||
cmd.SetArgs([]string{txFileName})
|
||||
@@ -52,7 +52,7 @@ func TestGetCommandDecode(t *testing.T) {
|
||||
|
||||
clientCtx := client.Context{}.
|
||||
WithTxConfig(encodingConfig.TxConfig).
|
||||
WithCodec(encodingConfig.Marshaler)
|
||||
WithCodec(encodingConfig.Codec)
|
||||
|
||||
cmd := GetDecodeCommand()
|
||||
_ = testutil.ApplyMockIODiscardOutErr(cmd)
|
||||
|
||||
@@ -129,7 +129,7 @@ func TestSupply_ValidatePermissions(t *testing.T) {
|
||||
maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking}
|
||||
maccPerms[randomPerm] = []string{"random"}
|
||||
|
||||
cdc := simapp.MakeTestEncodingConfig().Marshaler
|
||||
cdc := simapp.MakeTestEncodingConfig().Codec
|
||||
keeper := keeper.NewAccountKeeper(
|
||||
cdc, app.GetKey(types.StoreKey), app.GetSubspace(types.ModuleName),
|
||||
types.ProtoBaseAccount, maccPerms,
|
||||
|
||||
@@ -22,7 +22,7 @@ func TestMigrate(t *testing.T) {
|
||||
WithInterfaceRegistry(encodingConfig.InterfaceRegistry).
|
||||
WithTxConfig(encodingConfig.TxConfig).
|
||||
WithLegacyAmino(encodingConfig.Amino).
|
||||
WithJSONCodec(encodingConfig.Marshaler)
|
||||
WithCodec(encodingConfig.Codec)
|
||||
|
||||
coins := sdk.NewCoins(sdk.NewInt64Coin("stake", 50))
|
||||
|
||||
|
||||
@@ -661,7 +661,7 @@ func createValidator(t *testing.T, ctx sdk.Context, app *simapp.SimApp, powers i
|
||||
addrs := simapp.AddTestAddrsIncremental(app, ctx, 1, valTokens)
|
||||
valAddrs := simapp.ConvertAddrsToValAddrs(addrs)
|
||||
pks := simapp.CreateTestPubKeys(1)
|
||||
cdc := simapp.MakeTestEncodingConfig().Marshaler
|
||||
cdc := simapp.MakeTestEncodingConfig().Codec
|
||||
|
||||
app.StakingKeeper = stakingkeeper.NewKeeper(
|
||||
cdc,
|
||||
|
||||
@@ -22,7 +22,7 @@ var (
|
||||
|
||||
func TestDecodeStore(t *testing.T) {
|
||||
app := simapp.Setup(false)
|
||||
cdc := simapp.MakeTestEncodingConfig().Marshaler
|
||||
cdc := simapp.MakeTestEncodingConfig().Codec
|
||||
acc := types.NewBaseAccountWithAddress(delAddr1)
|
||||
dec := simulation.NewDecodeStore(app.AccountKeeper)
|
||||
|
||||
|
||||
@@ -7,5 +7,5 @@ import (
|
||||
var (
|
||||
app = simapp.Setup(false)
|
||||
ecdc = simapp.MakeTestEncodingConfig()
|
||||
appCodec, legacyAmino = ecdc.Marshaler, ecdc.Amino
|
||||
appCodec, legacyAmino = ecdc.Codec, ecdc.Amino
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user