From 63ab9bc208305abbf5fb8af309c07c73667e0388 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 10 Jun 2021 23:27:28 +0200 Subject: [PATCH 1/8] chore(types): add sdk.Context.Codec and deprecate JSONCodec --- CHANGELOG.md | 2 ++ client/context.go | 17 +++++++++++++---- simapp/params/encoding.go | 7 ++++--- simapp/simd/cmd/root.go | 2 +- testutil/network/network.go | 2 +- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43c0beed6fb1..886ba07aed56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -155,6 +155,8 @@ if input key is empty, or input data contains empty key. ### Deprecated * (grpc) [\#8926](https://github.com/cosmos/cosmos-sdk/pull/8926) The `tx` field in `SimulateRequest` has been deprecated, prefer to pass `tx_bytes` instead. +* (sdk types) [\#xxx]() `clientContext.JSONCodec` + ## [v0.42.4](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.42.4) - 2021-04-08 diff --git a/client/context.go b/client/context.go index ee6fe8b86081..3fa742bff4af 100644 --- a/client/context.go +++ b/client/context.go @@ -22,10 +22,12 @@ import ( // Context implements a typical context created in SDK modules for transaction // handling and queries. type Context struct { - FromAddress sdk.AccAddress - Client rpcclient.Client - ChainID string + FromAddress sdk.AccAddress + Client rpcclient.Client + ChainID string + // Deprecated: JSONCodec codec will be changed to Codec: codec.Codec JSONCodec codec.JSONCodec + Codec codec.Codec InterfaceRegistry codectypes.InterfaceRegistry Input io.Reader Keyring keyring.Keyring @@ -72,12 +74,19 @@ func (ctx Context) WithInput(r io.Reader) Context { return ctx } -// WithJSONCodec returns a copy of the Context with an updated JSONCodec. +// Deprecated: WithJSONCodec returns a copy of the Context with an updated JSONCodec. func (ctx Context) WithJSONCodec(m codec.JSONCodec) Context { ctx.JSONCodec = m return ctx } +// WithCodec returns a copy of the Context with an updated Codec. +func (ctx Context) WithCodec(m codec.Codec) Context { + ctx.Codec = m + ctx.JSONCodec = m + return ctx +} + // WithLegacyAmino returns a copy of the context with an updated LegacyAmino codec. // TODO: Deprecated (remove). func (ctx Context) WithLegacyAmino(cdc *codec.LegacyAmino) Context { diff --git a/simapp/params/encoding.go b/simapp/params/encoding.go index 3d634abf16b2..e80042cfc9d6 100644 --- a/simapp/params/encoding.go +++ b/simapp/params/encoding.go @@ -10,7 +10,8 @@ import ( // This is provided for compatibility between protobuf and amino implementations. type EncodingConfig struct { InterfaceRegistry types.InterfaceRegistry - Marshaler codec.Codec - TxConfig client.TxConfig - Amino *codec.LegacyAmino + // Deprecated: this field wil lbe renamed to Codec + Marshaler codec.Codec + TxConfig client.TxConfig + Amino *codec.LegacyAmino } diff --git a/simapp/simd/cmd/root.go b/simapp/simd/cmd/root.go index e40412d076f4..e37944f09d55 100644 --- a/simapp/simd/cmd/root.go +++ b/simapp/simd/cmd/root.go @@ -39,7 +39,7 @@ import ( func NewRootCmd() (*cobra.Command, params.EncodingConfig) { encodingConfig := simapp.MakeTestEncodingConfig() initClientCtx := client.Context{}. - WithJSONCodec(encodingConfig.Marshaler). + WithCodec(encodingConfig.Marshaler). WithInterfaceRegistry(encodingConfig.InterfaceRegistry). WithTxConfig(encodingConfig.TxConfig). WithLegacyAmino(encodingConfig.Amino). diff --git a/testutil/network/network.go b/testutil/network/network.go index 58f08316a407..2f17bca13273 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -346,7 +346,7 @@ func New(t *testing.T, cfg Config) *Network { WithHomeDir(tmCfg.RootDir). WithChainID(cfg.ChainID). WithInterfaceRegistry(cfg.InterfaceRegistry). - WithJSONCodec(cfg.Codec). + WithCodec(cfg.Codec). WithLegacyAmino(cfg.LegacyAmino). WithTxConfig(cfg.TxConfig). WithAccountRetriever(cfg.AccountRetriever) From 900db8b7dee28701eeb39576ba41694f23f65576 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 10 Jun 2021 23:38:13 +0200 Subject: [PATCH 2/8] Use clientContext.Codec rather than JSONCodec everywhere --- client/context.go | 6 +-- client/debug/main.go | 2 +- client/grpc/tmservice/service_test.go | 14 +++---- client/keys/add.go | 2 +- server/start.go | 2 +- server/tm_cmds.go | 2 +- simapp/simd/cmd/genaccounts.go | 2 +- simapp/simd/cmd/testnet.go | 12 +++--- x/auth/client/testutil/suite.go | 38 +++++++++---------- x/auth/legacy/v040/migrate_test.go | 2 +- x/auth/tx/service_test.go | 14 +++---- x/auth/vesting/client/testutil/suite.go | 2 +- x/authz/client/testutil/query.go | 2 +- x/authz/client/testutil/tx.go | 16 ++++---- x/bank/client/testutil/suite.go | 8 ++-- x/bank/legacy/v040/migrate_test.go | 2 +- x/crisis/client/testsuite/suite.go | 2 +- x/distribution/client/cli/tx.go | 2 +- x/distribution/client/rest/grpc_query_test.go | 28 +++++++------- x/distribution/client/testutil/suite.go | 10 ++--- x/evidence/client/rest/query.go | 2 +- x/evidence/legacy/v040/migrate_test.go | 2 +- x/feegrant/client/testutil/suite.go | 16 ++++---- x/genutil/client/cli/collect.go | 2 +- x/genutil/client/cli/gentx.go | 4 +- x/genutil/client/cli/init.go | 2 +- x/genutil/client/cli/validate_genesis.go | 2 +- x/genutil/client/rest/query.go | 2 +- x/genutil/legacy/v040/migrate.go | 2 +- x/genutil/legacy/v043/migrate.go | 4 +- x/gov/client/cli/query.go | 4 +- x/gov/client/testutil/suite.go | 22 +++++------ x/gov/client/utils/query.go | 6 +-- x/gov/legacy/v040/migrate_test.go | 2 +- x/gov/legacy/v043/json_test.go | 2 +- x/params/client/rest/grpc_query_test.go | 2 +- x/slashing/client/cli/query.go | 2 +- x/slashing/client/rest/grpc_query_test.go | 2 +- x/slashing/client/testutil/suite.go | 2 +- x/slashing/legacy/v040/migrate_test.go | 2 +- x/staking/client/cli/tx.go | 2 +- x/staking/client/testutil/suite.go | 34 ++++++++--------- x/staking/legacy/v040/migrate_test.go | 2 +- x/staking/legacy/v043/json_test.go | 2 +- x/upgrade/client/testutil/suite.go | 2 +- 45 files changed, 147 insertions(+), 147 deletions(-) diff --git a/client/context.go b/client/context.go index 3fa742bff4af..644d6e60360d 100644 --- a/client/context.go +++ b/client/context.go @@ -25,7 +25,7 @@ type Context struct { FromAddress sdk.AccAddress Client rpcclient.Client ChainID string - // Deprecated: JSONCodec codec will be changed to Codec: codec.Codec + // Deprecated: Codec codec will be changed to Codec: codec.Codec JSONCodec codec.JSONCodec Codec codec.Codec InterfaceRegistry codectypes.InterfaceRegistry @@ -82,8 +82,8 @@ func (ctx Context) WithJSONCodec(m codec.JSONCodec) Context { // WithCodec returns a copy of the Context with an updated Codec. func (ctx Context) WithCodec(m codec.Codec) Context { - ctx.Codec = m ctx.JSONCodec = m + ctx.Codec = m return ctx } @@ -266,7 +266,7 @@ func (ctx Context) PrintBytes(o []byte) error { // will be JSON encoded using ctx.JSONCodec. An error is returned upon failure. func (ctx Context) PrintProto(toPrint proto.Message) error { // always serialize JSON initially because proto json can't be directly YAML encoded - out, err := ctx.JSONCodec.MarshalJSON(toPrint) + out, err := ctx.Codec.MarshalJSON(toPrint) if err != nil { return err } diff --git a/client/debug/main.go b/client/debug/main.go index 377fa5f54903..03358fd7c2e4 100644 --- a/client/debug/main.go +++ b/client/debug/main.go @@ -32,7 +32,7 @@ func Cmd() *cobra.Command { // getPubKeyFromString decodes SDK PubKey using JSON marshaler. func getPubKeyFromString(ctx client.Context, pkstr string) (cryptotypes.PubKey, error) { var pk cryptotypes.PubKey - err := ctx.JSONCodec.UnmarshalInterfaceJSON([]byte(pkstr), &pk) + err := ctx.Codec.UnmarshalInterfaceJSON([]byte(pkstr), &pk) return pk, err } diff --git a/client/grpc/tmservice/service_test.go b/client/grpc/tmservice/service_test.go index 0256ec8197d4..3de92411c9f7 100644 --- a/client/grpc/tmservice/service_test.go +++ b/client/grpc/tmservice/service_test.go @@ -57,7 +57,7 @@ func (s IntegrationTestSuite) TestQueryNodeInfo() { restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/node_info", val.APIAddress)) s.Require().NoError(err) var getInfoRes tmservice.GetNodeInfoResponse - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(restRes, &getInfoRes)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(restRes, &getInfoRes)) s.Require().Equal(getInfoRes.ApplicationVersion.AppName, version.NewInfo().AppName) } @@ -70,7 +70,7 @@ func (s IntegrationTestSuite) TestQuerySyncing() { restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/syncing", val.APIAddress)) s.Require().NoError(err) var syncingRes tmservice.GetSyncingResponse - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(restRes, &syncingRes)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(restRes, &syncingRes)) } func (s IntegrationTestSuite) TestQueryLatestBlock() { @@ -82,7 +82,7 @@ func (s IntegrationTestSuite) TestQueryLatestBlock() { restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/blocks/latest", val.APIAddress)) s.Require().NoError(err) var blockInfoRes tmservice.GetLatestBlockResponse - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(restRes, &blockInfoRes)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(restRes, &blockInfoRes)) } func (s IntegrationTestSuite) TestQueryBlockByHeight() { @@ -93,7 +93,7 @@ func (s IntegrationTestSuite) TestQueryBlockByHeight() { restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/blocks/%d", val.APIAddress, 1)) s.Require().NoError(err) var blockInfoRes tmservice.GetBlockByHeightResponse - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(restRes, &blockInfoRes)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(restRes, &blockInfoRes)) } func (s IntegrationTestSuite) TestQueryLatestValidatorSet() { @@ -124,7 +124,7 @@ func (s IntegrationTestSuite) TestQueryLatestValidatorSet() { restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/validatorsets/latest?pagination.offset=%d&pagination.limit=%d", val.APIAddress, 0, 1)) s.Require().NoError(err) var validatorSetRes tmservice.GetLatestValidatorSetResponse - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(restRes, &validatorSetRes)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(restRes, &validatorSetRes)) s.Require().Equal(1, len(validatorSetRes.Validators)) anyPub, err := codectypes.NewAnyWithValue(val.PubKey) s.Require().NoError(err) @@ -183,7 +183,7 @@ func (s IntegrationTestSuite) TestLatestValidatorSet_GRPCGateway() { s.Require().Contains(string(res), tc.expErrMsg) } else { var result tmservice.GetLatestValidatorSetResponse - err = vals[0].ClientCtx.JSONCodec.UnmarshalJSON(res, &result) + err = vals[0].ClientCtx.Codec.UnmarshalJSON(res, &result) s.Require().NoError(err) s.Require().Equal(uint64(len(vals)), result.Pagination.Total) anyPub, err := codectypes.NewAnyWithValue(vals[0].PubKey) @@ -245,7 +245,7 @@ func (s IntegrationTestSuite) TestValidatorSetByHeight_GRPCGateway() { s.Require().Contains(string(res), tc.expErrMsg) } else { var result tmservice.GetValidatorSetByHeightResponse - err = vals[0].ClientCtx.JSONCodec.UnmarshalJSON(res, &result) + err = vals[0].ClientCtx.Codec.UnmarshalJSON(res, &result) s.Require().NoError(err) s.Require().Equal(uint64(len(vals)), result.Pagination.Total) } diff --git a/client/keys/add.go b/client/keys/add.go index 19a927f73953..d0436320519c 100644 --- a/client/keys/add.go +++ b/client/keys/add.go @@ -172,7 +172,7 @@ func RunAddCmd(ctx client.Context, cmd *cobra.Command, args []string, inBuf *buf pubKey, _ := cmd.Flags().GetString(FlagPublicKey) if pubKey != "" { var pk cryptotypes.PubKey - err = ctx.JSONCodec.UnmarshalInterfaceJSON([]byte(pubKey), &pk) + err = ctx.Codec.UnmarshalInterfaceJSON([]byte(pubKey), &pk) if err != nil { return err } diff --git a/server/start.go b/server/start.go index 1ce8811ba721..0c084c858ec2 100644 --- a/server/start.go +++ b/server/start.go @@ -347,7 +347,7 @@ func startInProcess(ctx *Context, clientCtx client.Context, appCreator types.App Retries: config.Rosetta.Retries, Offline: offlineMode, } - conf.WithCodec(clientCtx.InterfaceRegistry, clientCtx.JSONCodec.(*codec.ProtoCodec)) + conf.WithCodec(clientCtx.InterfaceRegistry, clientCtx.Codec.(*codec.ProtoCodec)) rosettaSrv, err = rosetta.ServerFromConfig(conf) if err != nil { diff --git a/server/tm_cmds.go b/server/tm_cmds.go index 4d94422f795a..35e202abc22e 100644 --- a/server/tm_cmds.go +++ b/server/tm_cmds.go @@ -55,7 +55,7 @@ func ShowValidatorCmd() *cobra.Command { return err } clientCtx := client.GetClientContextFromCmd(cmd) - bz, err := clientCtx.JSONCodec.MarshalInterfaceJSON(sdkPK) + bz, err := clientCtx.Codec.MarshalInterfaceJSON(sdkPK) if err != nil { return err } diff --git a/simapp/simd/cmd/genaccounts.go b/simapp/simd/cmd/genaccounts.go index 5c04059b7d2d..408a7dad0c2a 100644 --- a/simapp/simd/cmd/genaccounts.go +++ b/simapp/simd/cmd/genaccounts.go @@ -40,7 +40,7 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa Args: cobra.ExactArgs(2), RunE: func(cmd *cobra.Command, args []string) error { clientCtx := client.GetClientContextFromCmd(cmd) - depCdc := clientCtx.JSONCodec + depCdc := clientCtx.Codec cdc := depCdc.(codec.Codec) serverCtx := server.GetServerContextFromCmd(cmd) diff --git a/simapp/simd/cmd/testnet.go b/simapp/simd/cmd/testnet.go index d789c3471f43..abf6cb3cdb42 100644 --- a/simapp/simd/cmd/testnet.go +++ b/simapp/simd/cmd/testnet.go @@ -271,11 +271,11 @@ func initGenFiles( genFiles []string, numValidators int, ) error { - appGenState := mbm.DefaultGenesis(clientCtx.JSONCodec) + appGenState := mbm.DefaultGenesis(clientCtx.Codec) // set the accounts in the genesis state var authGenState authtypes.GenesisState - clientCtx.JSONCodec.MustUnmarshalJSON(appGenState[authtypes.ModuleName], &authGenState) + clientCtx.Codec.MustUnmarshalJSON(appGenState[authtypes.ModuleName], &authGenState) accounts, err := authtypes.PackAccounts(genAccounts) if err != nil { @@ -283,14 +283,14 @@ func initGenFiles( } authGenState.Accounts = accounts - appGenState[authtypes.ModuleName] = clientCtx.JSONCodec.MustMarshalJSON(&authGenState) + appGenState[authtypes.ModuleName] = clientCtx.Codec.MustMarshalJSON(&authGenState) // set the balances in the genesis state var bankGenState banktypes.GenesisState - clientCtx.JSONCodec.MustUnmarshalJSON(appGenState[banktypes.ModuleName], &bankGenState) + clientCtx.Codec.MustUnmarshalJSON(appGenState[banktypes.ModuleName], &bankGenState) bankGenState.Balances = genBalances - appGenState[banktypes.ModuleName] = clientCtx.JSONCodec.MustMarshalJSON(&bankGenState) + appGenState[banktypes.ModuleName] = clientCtx.Codec.MustMarshalJSON(&bankGenState) appGenStateJSON, err := json.MarshalIndent(appGenState, "", " ") if err != nil { @@ -337,7 +337,7 @@ func collectGenFiles( return err } - nodeAppState, err := genutil.GenAppStateFromConfig(clientCtx.JSONCodec, clientCtx.TxConfig, nodeConfig, initCfg, *genDoc, genBalIterator) + nodeAppState, err := genutil.GenAppStateFromConfig(clientCtx.Codec, clientCtx.TxConfig, nodeConfig, initCfg, *genDoc, genBalIterator) if err != nil { return err } diff --git a/x/auth/client/testutil/suite.go b/x/auth/client/testutil/suite.go index f176716cfb09..9456260c89ef 100644 --- a/x/auth/client/testutil/suite.go +++ b/x/auth/client/testutil/suite.go @@ -169,7 +169,7 @@ func (s *IntegrationTestSuite) TestCLISignAminoJSON() { queryResJSON, err := QueryAccountExec(val1.ClientCtx, val1.Address) require.NoError(err) var account authtypes.AccountI - require.NoError(val1.ClientCtx.JSONCodec.UnmarshalInterfaceJSON(queryResJSON.Bytes(), &account)) + require.NoError(val1.ClientCtx.Codec.UnmarshalInterfaceJSON(queryResJSON.Bytes(), &account)) /**** test signature-only ****/ res, err := TxSignExec(val1.ClientCtx, val1.Address, fileUnsigned.Name(), chainFlag, @@ -258,7 +258,7 @@ func (s *IntegrationTestSuite) TestCLIQueryTxCmd() { ) s.Require().NoError(err) var txRes sdk.TxResponse - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &txRes)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &txRes)) s.Require().NoError(s.network.WaitForNextBlock()) testCases := []struct { @@ -300,7 +300,7 @@ func (s *IntegrationTestSuite) TestCLIQueryTxCmd() { s.Require().NotEqual("internal", err.Error()) } else { var result sdk.TxResponse - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &result)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &result)) s.Require().NotNil(result.Height) s.Require().Contains(result.RawLog, tc.rawLogContains) } @@ -353,7 +353,7 @@ func (s *IntegrationTestSuite) TestCLISendGenerateSignAndBroadcast() { s.Require().NoError(err) var balRes banktypes.QueryAllBalancesResponse - err = val1.ClientCtx.JSONCodec.UnmarshalJSON(resp.Bytes(), &balRes) + err = val1.ClientCtx.Codec.UnmarshalJSON(resp.Bytes(), &balRes) s.Require().NoError(err) startTokens := balRes.Balances.AmountOf(s.cfg.BondDenom) @@ -414,7 +414,7 @@ func (s *IntegrationTestSuite) TestCLISendGenerateSignAndBroadcast() { resp, err = bankcli.QueryBalancesExec(val1.ClientCtx, val1.Address) s.Require().NoError(err) - err = val1.ClientCtx.JSONCodec.UnmarshalJSON(resp.Bytes(), &balRes) + err = val1.ClientCtx.Codec.UnmarshalJSON(resp.Bytes(), &balRes) s.Require().NoError(err) s.Require().Equal(startTokens, balRes.Balances.AmountOf(s.cfg.BondDenom)) @@ -437,7 +437,7 @@ func (s *IntegrationTestSuite) TestCLISendGenerateSignAndBroadcast() { resp, err = bankcli.QueryBalancesExec(val1.ClientCtx, account.GetAddress()) s.Require().NoError(err) - err = val1.ClientCtx.JSONCodec.UnmarshalJSON(resp.Bytes(), &balRes) + err = val1.ClientCtx.Codec.UnmarshalJSON(resp.Bytes(), &balRes) s.Require().NoError(err) s.Require().Equal(sendTokens.Amount, balRes.Balances.AmountOf(s.cfg.BondDenom)) @@ -445,7 +445,7 @@ func (s *IntegrationTestSuite) TestCLISendGenerateSignAndBroadcast() { resp, err = bankcli.QueryBalancesExec(val1.ClientCtx, val1.Address) s.Require().NoError(err) - err = val1.ClientCtx.JSONCodec.UnmarshalJSON(resp.Bytes(), &balRes) + err = val1.ClientCtx.Codec.UnmarshalJSON(resp.Bytes(), &balRes) s.Require().NoError(err) } @@ -554,7 +554,7 @@ func (s *IntegrationTestSuite) TestCLIMultisignSortSignatures() { s.Require().NoError(err) var balRes banktypes.QueryAllBalancesResponse - err = val1.ClientCtx.JSONCodec.UnmarshalJSON(resp.Bytes(), &balRes) + err = val1.ClientCtx.Codec.UnmarshalJSON(resp.Bytes(), &balRes) s.Require().NoError(err) intialCoins := balRes.Balances @@ -572,7 +572,7 @@ func (s *IntegrationTestSuite) TestCLIMultisignSortSignatures() { resp, err = bankcli.QueryBalancesExec(val1.ClientCtx, multisigInfo.GetAddress()) s.Require().NoError(err) - err = val1.ClientCtx.JSONCodec.UnmarshalJSON(resp.Bytes(), &balRes) + err = val1.ClientCtx.Codec.UnmarshalJSON(resp.Bytes(), &balRes) s.Require().NoError(err) diff, _ := balRes.Balances.SafeSub(intialCoins) s.Require().Equal(sendTokens.Amount, diff.AmountOf(s.cfg.BondDenom)) @@ -650,7 +650,7 @@ func (s *IntegrationTestSuite) TestCLIMultisign() { s.Require().NoError(err) var balRes banktypes.QueryAllBalancesResponse - err = val1.ClientCtx.JSONCodec.UnmarshalJSON(resp.Bytes(), &balRes) + err = val1.ClientCtx.Codec.UnmarshalJSON(resp.Bytes(), &balRes) s.Require().NoError(err) s.Require().Equal(sendTokens.Amount, balRes.Balances.AmountOf(s.cfg.BondDenom)) @@ -805,7 +805,7 @@ func (s *IntegrationTestSuite) TestMultisignBatch() { queryResJSON, err := QueryAccountExec(val.ClientCtx, multisigInfo.GetAddress()) s.Require().NoError(err) var account authtypes.AccountI - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalInterfaceJSON(queryResJSON.Bytes(), &account)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalInterfaceJSON(queryResJSON.Bytes(), &account)) // sign-batch file res, err := TxSignBatchExec(val.ClientCtx, account1.GetAddress(), filename.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, val.ClientCtx.ChainID), "--multisig", multisigInfo.GetAddress().String(), fmt.Sprintf("--%s", flags.FlagOffline), fmt.Sprintf("--%s=%s", flags.FlagAccountNumber, fmt.Sprint(account.GetAccountNumber())), fmt.Sprintf("--%s=%s", flags.FlagSequence, fmt.Sprint(account.GetSequence()))) @@ -867,7 +867,7 @@ func (s *IntegrationTestSuite) TestGetAccountCmd() { s.Require().NotEqual("internal", err.Error()) } else { var acc authtypes.AccountI - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalInterfaceJSON(out.Bytes(), &acc)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalInterfaceJSON(out.Bytes(), &acc)) s.Require().Equal(val.Address, acc.GetAddress()) } }) @@ -884,7 +884,7 @@ func (s *IntegrationTestSuite) TestGetAccountsCmd() { s.Require().NoError(err) var res authtypes.QueryAccountsResponse - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &res)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &res)) s.Require().NotEmpty(res.Accounts) } @@ -962,7 +962,7 @@ func (s *IntegrationTestSuite) TestQueryParamsCmd() { s.Require().NotEqual("internal", err.Error()) } else { var authParams authtypes.Params - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &authParams)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &authParams)) s.Require().NotNil(authParams.MaxMemoCharacters) } }) @@ -1009,11 +1009,11 @@ func (s *IntegrationTestSuite) TestTxWithoutPublicKey() { // Note: this method is only used for test purposes! In general, one should // use txBuilder and TxEncoder/TxDecoder to manipulate txs. var tx tx.Tx - err = val1.ClientCtx.JSONCodec.UnmarshalJSON(signedTx.Bytes(), &tx) + err = val1.ClientCtx.Codec.UnmarshalJSON(signedTx.Bytes(), &tx) s.Require().NoError(err) tx.AuthInfo.SignerInfos[0].PublicKey = nil // Re-encode the tx again, to another file. - txJSON, err = val1.ClientCtx.JSONCodec.MarshalJSON(&tx) + txJSON, err = val1.ClientCtx.Codec.MarshalJSON(&tx) s.Require().NoError(err) signedTxFile := testutil.WriteToNewTempFile(s.T(), string(txJSON)) s.Require().True(strings.Contains(string(txJSON), "\"public_key\":null")) @@ -1023,7 +1023,7 @@ func (s *IntegrationTestSuite) TestTxWithoutPublicKey() { out, err := TxBroadcastExec(val1.ClientCtx, signedTxFile.Name()) s.Require().NoError(err) var res sdk.TxResponse - s.Require().NoError(val1.ClientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &res)) + s.Require().NoError(val1.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &res)) s.Require().NotEqual(0, res.Code) } @@ -1081,14 +1081,14 @@ func (s *IntegrationTestSuite) TestSignWithMultiSignersAminoJSON() { require.NoError(err) var txRes sdk.TxResponse - require.NoError(val0.ClientCtx.JSONCodec.UnmarshalJSON(res.Bytes(), &txRes)) + require.NoError(val0.ClientCtx.Codec.UnmarshalJSON(res.Bytes(), &txRes)) require.Equal(uint32(0), txRes.Code) // Make sure the addr1's balance got funded. queryResJSON, err := bankcli.QueryBalancesExec(val0.ClientCtx, addr1) require.NoError(err) var queryRes banktypes.QueryAllBalancesResponse - err = val0.ClientCtx.JSONCodec.UnmarshalJSON(queryResJSON.Bytes(), &queryRes) + err = val0.ClientCtx.Codec.UnmarshalJSON(queryResJSON.Bytes(), &queryRes) require.NoError(err) require.Equal(sdk.NewCoins(val0Coin, val1Coin), queryRes.Balances) } diff --git a/x/auth/legacy/v040/migrate_test.go b/x/auth/legacy/v040/migrate_test.go index b6892702db10..9b09d6e18a02 100644 --- a/x/auth/legacy/v040/migrate_test.go +++ b/x/auth/legacy/v040/migrate_test.go @@ -241,7 +241,7 @@ func TestMigrate(t *testing.T) { } }` - bz, err := clientCtx.JSONCodec.MarshalJSON(migrated) + bz, err := clientCtx.Codec.MarshalJSON(migrated) require.NoError(t, err) // Indent the JSON bz correctly. diff --git a/x/auth/tx/service_test.go b/x/auth/tx/service_test.go index 547186603a52..9a4bc1d40d4b 100644 --- a/x/auth/tx/service_test.go +++ b/x/auth/tx/service_test.go @@ -76,7 +76,7 @@ func (s *IntegrationTestSuite) SetupSuite() { fmt.Sprintf("--%s=foobar", flags.FlagNote), ) s.Require().NoError(err) - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &s.txRes)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &s.txRes)) s.Require().Equal(uint32(0), s.txRes.Code) s.Require().NoError(s.network.WaitForNextBlock()) @@ -151,7 +151,7 @@ func (s IntegrationTestSuite) TestSimulateTx_GRPCGateway() { for _, tc := range testCases { s.Run(tc.name, func() { - req, err := val.ClientCtx.JSONCodec.MarshalJSON(tc.req) + req, err := val.ClientCtx.Codec.MarshalJSON(tc.req) s.Require().NoError(err) res, err := rest.PostRequest(fmt.Sprintf("%s/cosmos/tx/v1beta1/simulate", val.APIAddress), "application/json", req) s.Require().NoError(err) @@ -159,7 +159,7 @@ func (s IntegrationTestSuite) TestSimulateTx_GRPCGateway() { s.Require().Contains(string(res), tc.expErrMsg) } else { var result tx.SimulateResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(res, &result) + err = val.ClientCtx.Codec.UnmarshalJSON(res, &result) s.Require().NoError(err) // Check the result and gas used are correct. s.Require().Equal(len(result.GetResult().GetEvents()), 6) // 1 coin recv, 1 coin spent,1 transfer, 3 messages. @@ -313,7 +313,7 @@ func (s IntegrationTestSuite) TestGetTxEvents_GRPCGateway() { s.Require().Contains(string(res), tc.expErrMsg) } else { var result tx.GetTxsEventResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(res, &result) + err = val.ClientCtx.Codec.UnmarshalJSON(res, &result) s.Require().NoError(err) s.Require().GreaterOrEqual(len(result.Txs), 1) s.Require().Equal("foobar", result.Txs[0].Body.Memo) @@ -382,7 +382,7 @@ func (s IntegrationTestSuite) TestGetTx_GRPCGateway() { s.Require().Contains(string(res), tc.expErrMsg) } else { var result tx.GetTxResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(res, &result) + err = val.ClientCtx.Codec.UnmarshalJSON(res, &result) s.Require().NoError(err) s.Require().Equal("foobar", result.Tx.Body.Memo) s.Require().NotZero(result.TxResponse.Height) @@ -459,7 +459,7 @@ func (s IntegrationTestSuite) TestBroadcastTx_GRPCGateway() { for _, tc := range testCases { s.Run(tc.name, func() { - req, err := val.ClientCtx.JSONCodec.MarshalJSON(tc.req) + req, err := val.ClientCtx.Codec.MarshalJSON(tc.req) s.Require().NoError(err) res, err := rest.PostRequest(fmt.Sprintf("%s/cosmos/tx/v1beta1/txs", val.APIAddress), "application/json", req) s.Require().NoError(err) @@ -467,7 +467,7 @@ func (s IntegrationTestSuite) TestBroadcastTx_GRPCGateway() { s.Require().Contains(string(res), tc.expErrMsg) } else { var result tx.BroadcastTxResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(res, &result) + err = val.ClientCtx.Codec.UnmarshalJSON(res, &result) s.Require().NoError(err) s.Require().Equal(uint32(0), result.TxResponse.Code, "rawlog", result.TxResponse.RawLog) } diff --git a/x/auth/vesting/client/testutil/suite.go b/x/auth/vesting/client/testutil/suite.go index 1d41e136d076..f619f31165c8 100644 --- a/x/auth/vesting/client/testutil/suite.go +++ b/x/auth/vesting/client/testutil/suite.go @@ -122,7 +122,7 @@ func (s *IntegrationTestSuite) TestNewMsgCreateVestingAccountCmd() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(bw.Bytes(), tc.respType), bw.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(bw.Bytes(), tc.respType), bw.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code) diff --git a/x/authz/client/testutil/query.go b/x/authz/client/testutil/query.go index acdd7b7abf77..529939a7019c 100644 --- a/x/authz/client/testutil/query.go +++ b/x/authz/client/testutil/query.go @@ -85,7 +85,7 @@ func (s *IntegrationTestSuite) TestQueryAuthorizations() { } else { s.Require().NoError(err) var grants authz.QueryGrantsResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp.Bytes(), &grants) + err = val.ClientCtx.Codec.UnmarshalJSON(resp.Bytes(), &grants) s.Require().NoError(err) } }) diff --git a/x/authz/client/testutil/tx.go b/x/authz/client/testutil/tx.go index 66c077ad688f..10932d9bda23 100644 --- a/x/authz/client/testutil/tx.go +++ b/x/authz/client/testutil/tx.go @@ -290,7 +290,7 @@ func (s *IntegrationTestSuite) TestCLITxGrantAuthorization() { } else { var txResp sdk.TxResponse s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &txResp), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &txResp), out.String()) s.Require().Equal(tc.expectedCode, txResp.Code, out.String()) } }) @@ -441,7 +441,7 @@ func (s *IntegrationTestSuite) TestCmdRevokeAuthorizations() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code, out.String()) @@ -584,7 +584,7 @@ func (s *IntegrationTestSuite) TestNewExecGenericAuthorized() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code, out.String()) } @@ -670,7 +670,7 @@ func (s *IntegrationTestSuite) TestNewExecGrantAuthorized() { } else { var response sdk.TxResponse s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &response), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &response), out.String()) s.Require().Equal(tc.expectedCode, response.Code, out.String()) } }) @@ -767,7 +767,7 @@ func (s *IntegrationTestSuite) TestExecDelegateAuthorization() { } else { var response sdk.TxResponse s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &response), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &response), out.String()) s.Require().Equal(tc.expectedCode, response.Code, out.String()) } }) @@ -844,7 +844,7 @@ func (s *IntegrationTestSuite) TestExecDelegateAuthorization() { } else { var response sdk.TxResponse s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &response), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &response), out.String()) s.Require().Equal(tc.expectedCode, response.Code, out.String()) } }) @@ -985,7 +985,7 @@ func (s *IntegrationTestSuite) TestExecUndelegateAuthorization() { } else { var response sdk.TxResponse s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &response), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &response), out.String()) s.Require().Equal(tc.expectedCode, response.Code, out.String()) } }) @@ -1062,7 +1062,7 @@ func (s *IntegrationTestSuite) TestExecUndelegateAuthorization() { } else { var response sdk.TxResponse s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &response), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &response), out.String()) s.Require().Equal(tc.expectedCode, response.Code, out.String()) } }) diff --git a/x/bank/client/testutil/suite.go b/x/bank/client/testutil/suite.go index 69892674fe8c..19be5401c672 100644 --- a/x/bank/client/testutil/suite.go +++ b/x/bank/client/testutil/suite.go @@ -155,7 +155,7 @@ func (s *IntegrationTestSuite) TestGetBalancesCmd() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType)) s.Require().Equal(tc.expected.String(), tc.respType.String()) } }) @@ -227,7 +227,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryTotalSupply() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType)) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType)) s.Require().Equal(tc.expected, tc.respType) } }) @@ -354,7 +354,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryDenomsMetadata() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType)) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType)) s.Require().Equal(tc.expected, tc.respType) } }) @@ -462,7 +462,7 @@ func (s *IntegrationTestSuite) TestNewSendTxCmd() { } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(bz.Bytes(), tc.respType), bz.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(bz.Bytes(), tc.respType), bz.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code) } diff --git a/x/bank/legacy/v040/migrate_test.go b/x/bank/legacy/v040/migrate_test.go index 9f1874f8c957..e30299ff9251 100644 --- a/x/bank/legacy/v040/migrate_test.go +++ b/x/bank/legacy/v040/migrate_test.go @@ -50,7 +50,7 @@ func TestMigrate(t *testing.T) { migrated := v040bank.Migrate(bankGenState, authGenState, supplyGenState) expected := `{"params":{"send_enabled":[],"default_send_enabled":true},"balances":[{"address":"cosmos1xxkueklal9vejv9unqu80w9vptyepfa95pd53u","coins":[{"denom":"stake","amount":"50"}]},{"address":"cosmos15v50ymp6n5dn73erkqtmq0u8adpl8d3ujv2e74","coins":[{"denom":"stake","amount":"50"}]}],"supply":[{"denom":"stake","amount":"1000"}],"denom_metadata":[]}` - bz, err := clientCtx.JSONCodec.MarshalJSON(migrated) + bz, err := clientCtx.Codec.MarshalJSON(migrated) require.NoError(t, err) require.Equal(t, expected, string(bz)) } diff --git a/x/crisis/client/testsuite/suite.go b/x/crisis/client/testsuite/suite.go index c38ff8fe170e..d0d82f62120b 100644 --- a/x/crisis/client/testsuite/suite.go +++ b/x/crisis/client/testsuite/suite.go @@ -94,7 +94,7 @@ func (s *IntegrationTestSuite) TestNewMsgVerifyInvariantTxCmd() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code) diff --git a/x/distribution/client/cli/tx.go b/x/distribution/client/cli/tx.go index ab81fc44e4a9..f65e6fd8a75e 100644 --- a/x/distribution/client/cli/tx.go +++ b/x/distribution/client/cli/tx.go @@ -293,7 +293,7 @@ Where proposal.json contains: if err != nil { return err } - proposal, err := ParseCommunityPoolSpendProposalWithDeposit(clientCtx.JSONCodec, args[0]) + proposal, err := ParseCommunityPoolSpendProposalWithDeposit(clientCtx.Codec, args[0]) if err != nil { return err } diff --git a/x/distribution/client/rest/grpc_query_test.go b/x/distribution/client/rest/grpc_query_test.go index 393b5da76e0b..ec8e2a7666dd 100644 --- a/x/distribution/client/rest/grpc_query_test.go +++ b/x/distribution/client/rest/grpc_query_test.go @@ -61,7 +61,7 @@ func (s *IntegrationTestSuite) TestQueryParamsGRPC() { resp, err := rest.GetRequest(tc.url) s.Run(tc.name, func() { s.Require().NoError(err) - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) s.Require().Equal(tc.expected, tc.respType) }) } @@ -111,10 +111,10 @@ func (s *IntegrationTestSuite) TestQueryOutstandingRewardsGRPC() { resp, err := testutil.GetRequestWithHeaders(tc.url, tc.headers) s.Run(tc.name, func() { if tc.expErr { - s.Require().Error(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().Error(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) } else { s.Require().NoError(err) - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) s.Require().Equal(tc.expected.String(), tc.respType.String()) } }) @@ -165,10 +165,10 @@ func (s *IntegrationTestSuite) TestQueryValidatorCommissionGRPC() { resp, err := testutil.GetRequestWithHeaders(tc.url, tc.headers) s.Run(tc.name, func() { if tc.expErr { - s.Require().Error(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().Error(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) } else { s.Require().NoError(err) - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) s.Require().Equal(tc.expected.String(), tc.respType.String()) } }) @@ -224,10 +224,10 @@ func (s *IntegrationTestSuite) TestQuerySlashesGRPC() { s.Run(tc.name, func() { if tc.expErr { - s.Require().Error(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().Error(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) } else { s.Require().NoError(err) - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) s.Require().Equal(tc.expected.String(), tc.respType.String()) } }) @@ -300,10 +300,10 @@ func (s *IntegrationTestSuite) TestQueryDelegatorRewardsGRPC() { s.Run(tc.name, func() { if tc.expErr { - s.Require().Error(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().Error(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) } else { s.Require().NoError(err) - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) s.Require().Equal(tc.expected.String(), tc.respType.String()) } }) @@ -352,10 +352,10 @@ func (s *IntegrationTestSuite) TestQueryDelegatorValidatorsGRPC() { s.Run(tc.name, func() { if tc.expErr { - s.Require().Error(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().Error(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) } else { s.Require().NoError(err) - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) s.Require().Equal(tc.expected.String(), tc.respType.String()) } }) @@ -404,10 +404,10 @@ func (s *IntegrationTestSuite) TestQueryWithdrawAddressGRPC() { s.Run(tc.name, func() { if tc.expErr { - s.Require().Error(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().Error(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) } else { s.Require().NoError(err) - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) s.Require().Equal(tc.expected.String(), tc.respType.String()) } }) @@ -452,7 +452,7 @@ func (s *IntegrationTestSuite) TestQueryValidatorCommunityPoolGRPC() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) s.Require().Equal(tc.expected.String(), tc.respType.String()) } }) diff --git a/x/distribution/client/testutil/suite.go b/x/distribution/client/testutil/suite.go index 91c24a43029a..3dcfca70aa68 100644 --- a/x/distribution/client/testutil/suite.go +++ b/x/distribution/client/testutil/suite.go @@ -502,7 +502,7 @@ func (s *IntegrationTestSuite) TestNewWithdrawRewardsCmd() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(bz, tc.respType), string(bz)) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(bz, tc.respType), string(bz)) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code) @@ -555,7 +555,7 @@ func (s *IntegrationTestSuite) TestNewWithdrawAllRewardsCmd() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code) @@ -610,7 +610,7 @@ func (s *IntegrationTestSuite) TestNewSetWithdrawAddrCmd() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code) @@ -665,7 +665,7 @@ func (s *IntegrationTestSuite) TestNewFundCommunityPoolCmd() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code) @@ -739,7 +739,7 @@ func (s *IntegrationTestSuite) TestGetCmdSubmitProposal() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code, out.String()) diff --git a/x/evidence/client/rest/query.go b/x/evidence/client/rest/query.go index 4ce8e22e08ed..b8bdcf4813f6 100644 --- a/x/evidence/client/rest/query.go +++ b/x/evidence/client/rest/query.go @@ -47,7 +47,7 @@ func queryEvidenceHandler(clientCtx client.Context) http.HandlerFunc { } params := types.NewQueryEvidenceRequest(decodedHash) - bz, err := clientCtx.JSONCodec.MarshalJSON(params) + bz, err := clientCtx.Codec.MarshalJSON(params) if err != nil { rest.WriteErrorResponse(w, http.StatusBadRequest, fmt.Sprintf("failed to marshal query params: %s", err)) return diff --git a/x/evidence/legacy/v040/migrate_test.go b/x/evidence/legacy/v040/migrate_test.go index 0ad7fe3e5680..43d3d9db7e2e 100644 --- a/x/evidence/legacy/v040/migrate_test.go +++ b/x/evidence/legacy/v040/migrate_test.go @@ -34,7 +34,7 @@ func TestMigrate(t *testing.T) { migrated := v040evidence.Migrate(evidenceGenState) expected := `{"evidence":[{"@type":"/cosmos.evidence.v1beta1.Equivocation","height":"20","time":"0001-01-01T00:00:00Z","power":"100","consensus_address":"cosmosvalcons1xxkueklal9vejv9unqu80w9vptyepfa99x2a3w"}]}` - bz, err := clientCtx.JSONCodec.MarshalJSON(migrated) + bz, err := clientCtx.Codec.MarshalJSON(migrated) require.NoError(t, err) require.Equal(t, expected, string(bz)) } diff --git a/x/feegrant/client/testutil/suite.go b/x/feegrant/client/testutil/suite.go index 90dc13307f6a..c539cf84766f 100644 --- a/x/feegrant/client/testutil/suite.go +++ b/x/feegrant/client/testutil/suite.go @@ -178,7 +178,7 @@ func (s *IntegrationTestSuite) TestCmdGetFeeGrant() { s.Require().Contains(err.Error(), tc.expectErrMsg) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) s.Require().Equal(tc.respType.Grantee, tc.respType.Grantee) s.Require().Equal(tc.respType.Granter, tc.respType.Granter) grant, err := tc.respType.GetGrant() @@ -243,7 +243,7 @@ func (s *IntegrationTestSuite) TestCmdGetFeeGrants() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.resp), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.resp), out.String()) s.Require().Len(tc.resp.Allowances, tc.expectLength) } }) @@ -506,7 +506,7 @@ func (s *IntegrationTestSuite) TestNewCmdFeeGrant() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code, out.String()) @@ -613,7 +613,7 @@ func (s *IntegrationTestSuite) TestNewCmdRevokeFeegrant() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code, out.String()) @@ -667,7 +667,7 @@ func (s *IntegrationTestSuite) TestTxWithFeeGrant() { s.Require().NoError(err) var resp sdk.TxResponse - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &resp), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &resp), out.String()) s.Require().Equal(uint32(0), resp.Code) } @@ -752,7 +752,7 @@ func (s *IntegrationTestSuite) TestFilteredFeeAllowance() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code, out.String()) @@ -773,7 +773,7 @@ func (s *IntegrationTestSuite) TestFilteredFeeAllowance() { resp := &feegrant.Grant{} - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), resp), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), resp), out.String()) s.Require().Equal(resp.Grantee, resp.Grantee) s.Require().Equal(resp.Granter, resp.Granter) @@ -842,7 +842,7 @@ func (s *IntegrationTestSuite) TestFilteredFeeAllowance() { s.Run(tc.name, func() { out, err := tc.malleate() s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code, out.String()) }) diff --git a/x/genutil/client/cli/collect.go b/x/genutil/client/cli/collect.go index 4e3cc1e6a9db..2a727ca8fba0 100644 --- a/x/genutil/client/cli/collect.go +++ b/x/genutil/client/cli/collect.go @@ -27,7 +27,7 @@ func CollectGenTxsCmd(genBalIterator types.GenesisBalancesIterator, defaultNodeH config := serverCtx.Config clientCtx := client.GetClientContextFromCmd(cmd) - cdc := clientCtx.JSONCodec + cdc := clientCtx.Codec config.SetRoot(clientCtx.HomeDir) diff --git a/x/genutil/client/cli/gentx.go b/x/genutil/client/cli/gentx.go index 107990ed1182..e6433b2f46f6 100644 --- a/x/genutil/client/cli/gentx.go +++ b/x/genutil/client/cli/gentx.go @@ -61,7 +61,7 @@ $ %s gentx my-key-name 1000000stake --home=/path/to/home/dir --keyring-backend=o if err != nil { return err } - cdc := clientCtx.JSONCodec + cdc := clientCtx.Codec config := serverCtx.Config config.SetRoot(clientCtx.HomeDir) @@ -78,7 +78,7 @@ $ %s gentx my-key-name 1000000stake --home=/path/to/home/dir --keyring-backend=o // read --pubkey, if empty take it from priv_validator.json if val, _ := cmd.Flags().GetString(cli.FlagPubKey); val != "" { - err = clientCtx.JSONCodec.UnmarshalJSON([]byte(val), valPubKey) + err = clientCtx.Codec.UnmarshalJSON([]byte(val), valPubKey) if err != nil { return errors.Wrap(err, "failed to unmarshal consensus node public key") } diff --git a/x/genutil/client/cli/init.go b/x/genutil/client/cli/init.go index 84a03c877dab..a51d4b90757b 100644 --- a/x/genutil/client/cli/init.go +++ b/x/genutil/client/cli/init.go @@ -72,7 +72,7 @@ func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command { Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { clientCtx := client.GetClientContextFromCmd(cmd) - cdc := clientCtx.JSONCodec + cdc := clientCtx.Codec serverCtx := server.GetServerContextFromCmd(cmd) config := serverCtx.Config diff --git a/x/genutil/client/cli/validate_genesis.go b/x/genutil/client/cli/validate_genesis.go index 30102277d670..6c8e27dda8e0 100644 --- a/x/genutil/client/cli/validate_genesis.go +++ b/x/genutil/client/cli/validate_genesis.go @@ -24,7 +24,7 @@ func ValidateGenesisCmd(mbm module.BasicManager) *cobra.Command { serverCtx := server.GetServerContextFromCmd(cmd) clientCtx := client.GetClientContextFromCmd(cmd) - cdc := clientCtx.JSONCodec + cdc := clientCtx.Codec // Load default if passed no args, otherwise load passed file var genesis string diff --git a/x/genutil/client/rest/query.go b/x/genutil/client/rest/query.go index 025f3a21d8d3..5d3812ca31aa 100644 --- a/x/genutil/client/rest/query.go +++ b/x/genutil/client/rest/query.go @@ -32,7 +32,7 @@ func QueryGenesisTxs(clientCtx client.Context, w http.ResponseWriter) { return } - genState := types.GetGenesisStateFromAppState(clientCtx.JSONCodec, appState) + genState := types.GetGenesisStateFromAppState(clientCtx.Codec, appState) genTxs := make([]sdk.Tx, len(genState.GenTxs)) for i, tx := range genState.GenTxs { err := clientCtx.LegacyAmino.UnmarshalJSON(tx, &genTxs[i]) diff --git a/x/genutil/legacy/v040/migrate.go b/x/genutil/legacy/v040/migrate.go index 3f1896cd1d49..a022d9fcf985 100644 --- a/x/genutil/legacy/v040/migrate.go +++ b/x/genutil/legacy/v040/migrate.go @@ -44,7 +44,7 @@ func Migrate(appState types.AppMap, clientCtx client.Context) types.AppMap { v036params.RegisterLegacyAminoCodec(v039Codec) v038upgrade.RegisterLegacyAminoCodec(v039Codec) - v040Codec := clientCtx.JSONCodec + v040Codec := clientCtx.Codec if appState[v038bank.ModuleName] != nil { // unmarshal relative source genesis application state diff --git a/x/genutil/legacy/v043/migrate.go b/x/genutil/legacy/v043/migrate.go index c5fd884863c4..e9321593934e 100644 --- a/x/genutil/legacy/v043/migrate.go +++ b/x/genutil/legacy/v043/migrate.go @@ -13,14 +13,14 @@ func Migrate(appState types.AppMap, clientCtx client.Context) types.AppMap { if appState[v040gov.ModuleName] != nil { // unmarshal relative source genesis application state var oldGovState v040gov.GenesisState - clientCtx.JSONCodec.MustUnmarshalJSON(appState[v040gov.ModuleName], &oldGovState) + clientCtx.Codec.MustUnmarshalJSON(appState[v040gov.ModuleName], &oldGovState) // delete deprecated x/gov genesis state delete(appState, v040gov.ModuleName) // Migrate relative source genesis application state and marshal it into // the respective key. - appState[v043gov.ModuleName] = clientCtx.JSONCodec.MustMarshalJSON(v043gov.MigrateJSON(&oldGovState)) + appState[v043gov.ModuleName] = clientCtx.Codec.MustMarshalJSON(v043gov.MigrateJSON(&oldGovState)) } return appState diff --git a/x/gov/client/cli/query.go b/x/gov/client/cli/query.go index 34d4665a99d4..4fa3a9bbf07f 100644 --- a/x/gov/client/cli/query.go +++ b/x/gov/client/cli/query.go @@ -238,7 +238,7 @@ $ %s query gov vote 1 cosmos1skjwj5whet0lpe65qaq4rpq03hjxlwd9nf39lk return err } - if err := clientCtx.JSONCodec.UnmarshalJSON(resByTxQuery, &vote); err != nil { + if err := clientCtx.Codec.UnmarshalJSON(resByTxQuery, &vote); err != nil { return err } } @@ -387,7 +387,7 @@ $ %s query gov deposit 1 cosmos1skjwj5whet0lpe65qaq4rpq03hjxlwd9nf39lk if err != nil { return err } - clientCtx.JSONCodec.MustUnmarshalJSON(resByTxQuery, &deposit) + clientCtx.Codec.MustUnmarshalJSON(resByTxQuery, &deposit) return clientCtx.PrintProto(&deposit) } diff --git a/x/gov/client/testutil/suite.go b/x/gov/client/testutil/suite.go index bcb0f823a2ee..ee2634e3d188 100644 --- a/x/gov/client/testutil/suite.go +++ b/x/gov/client/testutil/suite.go @@ -266,7 +266,7 @@ func (s *IntegrationTestSuite) TestCmdTally() { s.Require().Error(err) } else { var tally types.TallyResult - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &tally), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &tally), out.String()) s.Require().Equal(tally, tc.expectedOutput) } }) @@ -357,7 +357,7 @@ func (s *IntegrationTestSuite) TestNewCmdSubmitProposal() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code, out.String()) } @@ -406,7 +406,7 @@ func (s *IntegrationTestSuite) TestCmdGetProposal() { } else { s.Require().NoError(err) var proposal types.Proposal - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &proposal), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &proposal), out.String()) s.Require().Equal(title, proposal.GetTitle()) } }) @@ -452,7 +452,7 @@ func (s *IntegrationTestSuite) TestCmdGetProposals() { s.Require().NoError(err) var proposals types.QueryProposalsResponse - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &proposals), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &proposals), out.String()) s.Require().Len(proposals.Proposals, 3) } }) @@ -498,7 +498,7 @@ func (s *IntegrationTestSuite) TestCmdQueryDeposits() { s.Require().NoError(err) var deposits types.QueryDepositsResponse - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &deposits), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &deposits), out.String()) s.Require().Len(deposits.Deposits, 1) } }) @@ -554,7 +554,7 @@ func (s *IntegrationTestSuite) TestCmdQueryDeposit() { s.Require().NoError(err) var deposit types.Deposit - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &deposit), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &deposit), out.String()) s.Require().Equal(depositAmount.String(), deposit.Amount.String()) } }) @@ -632,7 +632,7 @@ func (s *IntegrationTestSuite) TestNewCmdDeposit() { } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &resp), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &resp), out.String()) s.Require().Equal(tc.expectedCode, resp.Code, out.String()) } }) @@ -683,7 +683,7 @@ func (s *IntegrationTestSuite) TestCmdQueryVotes() { s.Require().NoError(err) var votes types.QueryVotesResponse - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &votes), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &votes), out.String()) s.Require().Len(votes.Votes, 1) } }) @@ -758,7 +758,7 @@ func (s *IntegrationTestSuite) TestCmdQueryVote() { s.Require().NoError(err) var vote types.Vote - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &vote), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &vote), out.String()) s.Require().Equal(len(vote.Options), len(tc.expVoteOptions)) for i, option := range tc.expVoteOptions { s.Require().Equal(option.Option, vote.Options[i].Option) @@ -822,7 +822,7 @@ func (s *IntegrationTestSuite) TestNewCmdVote() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &txResp), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &txResp), out.String()) s.Require().Equal(tc.expectedCode, txResp.Code, out.String()) } }) @@ -906,7 +906,7 @@ func (s *IntegrationTestSuite) TestNewCmdWeightedVote() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &txResp), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &txResp), out.String()) s.Require().Equal(tc.expectedCode, txResp.Code, out.String()) } }) diff --git a/x/gov/client/utils/query.go b/x/gov/client/utils/query.go index 977b5adc699f..f4799a89d3a2 100644 --- a/x/gov/client/utils/query.go +++ b/x/gov/client/utils/query.go @@ -221,7 +221,7 @@ func QueryVoteByTxQuery(clientCtx client.Context, params types.QueryVoteParams) } if vote != nil { - bz, err := clientCtx.JSONCodec.MarshalJSON(vote) + bz, err := clientCtx.Codec.MarshalJSON(vote) if err != nil { return nil, err } @@ -245,7 +245,7 @@ func QueryDepositByTxQuery(clientCtx client.Context, params types.QueryDepositPa } if !initialDeposit.Amount.IsZero() { - bz, err := clientCtx.JSONCodec.MarshalJSON(&initialDeposit) + bz, err := clientCtx.Codec.MarshalJSON(&initialDeposit) if err != nil { return nil, err } @@ -282,7 +282,7 @@ func QueryDepositByTxQuery(clientCtx client.Context, params types.QueryDepositPa Amount: depMsg.Amount, } - bz, err := clientCtx.JSONCodec.MarshalJSON(&deposit) + bz, err := clientCtx.Codec.MarshalJSON(&deposit) if err != nil { return nil, err } diff --git a/x/gov/legacy/v040/migrate_test.go b/x/gov/legacy/v040/migrate_test.go index ab66a1b14254..3c9d512df51e 100644 --- a/x/gov/legacy/v040/migrate_test.go +++ b/x/gov/legacy/v040/migrate_test.go @@ -78,7 +78,7 @@ func TestMigrate(t *testing.T) { migrated := v040gov.Migrate(govGenState) - bz, err := clientCtx.JSONCodec.MarshalJSON(migrated) + bz, err := clientCtx.Codec.MarshalJSON(migrated) require.NoError(t, err) // Indent the JSON bz correctly. diff --git a/x/gov/legacy/v043/json_test.go b/x/gov/legacy/v043/json_test.go index 47910d01324f..1cf6bf8e18aa 100644 --- a/x/gov/legacy/v043/json_test.go +++ b/x/gov/legacy/v043/json_test.go @@ -36,7 +36,7 @@ func TestMigrateJSON(t *testing.T) { migrated := v043gov.MigrateJSON(govGenState) - bz, err := clientCtx.JSONCodec.MarshalJSON(migrated) + bz, err := clientCtx.Codec.MarshalJSON(migrated) require.NoError(t, err) // Indent the JSON bz correctly. diff --git a/x/params/client/rest/grpc_query_test.go b/x/params/client/rest/grpc_query_test.go index eb3c0ac13d31..f2c4440e29d5 100644 --- a/x/params/client/rest/grpc_query_test.go +++ b/x/params/client/rest/grpc_query_test.go @@ -113,7 +113,7 @@ func (s *IntegrationTestSuite) TestQueryParamsGRPC() { resp, err := testutil.GetRequestWithHeaders(tc.url, tc.headers) s.Require().NoError(err) - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType) if tc.expErr { s.Require().Error(err) diff --git a/x/slashing/client/cli/query.go b/x/slashing/client/cli/query.go index 50c3fe683819..08ae03301fbc 100644 --- a/x/slashing/client/cli/query.go +++ b/x/slashing/client/cli/query.go @@ -50,7 +50,7 @@ $ query slashing signing-info '{"@type":"/cosmos.crypto.ed25519.PubKey"," } var pk cryptotypes.PubKey - if err := clientCtx.JSONCodec.UnmarshalInterfaceJSON([]byte(args[0]), &pk); err != nil { + if err := clientCtx.Codec.UnmarshalInterfaceJSON([]byte(args[0]), &pk); err != nil { return err } diff --git a/x/slashing/client/rest/grpc_query_test.go b/x/slashing/client/rest/grpc_query_test.go index bfc6f20a5825..39daf06f69c5 100644 --- a/x/slashing/client/rest/grpc_query_test.go +++ b/x/slashing/client/rest/grpc_query_test.go @@ -117,7 +117,7 @@ func (s *IntegrationTestSuite) TestGRPCQueries() { resp, err := testutil.GetRequestWithHeaders(tc.url, tc.headers) s.Require().NoError(err) - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType) if tc.expErr { s.Require().Error(err) diff --git a/x/slashing/client/testutil/suite.go b/x/slashing/client/testutil/suite.go index 815c02160416..cf5cf997b6c3 100644 --- a/x/slashing/client/testutil/suite.go +++ b/x/slashing/client/testutil/suite.go @@ -173,7 +173,7 @@ func (s *IntegrationTestSuite) TestNewUnjailTxCmd() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code, out.String()) diff --git a/x/slashing/legacy/v040/migrate_test.go b/x/slashing/legacy/v040/migrate_test.go index b5c2fa3bc809..f11d2e9d26ee 100644 --- a/x/slashing/legacy/v040/migrate_test.go +++ b/x/slashing/legacy/v040/migrate_test.go @@ -126,7 +126,7 @@ func TestMigrate(t *testing.T) { ] }` - bz, err := clientCtx.JSONCodec.MarshalJSON(migrated) + bz, err := clientCtx.Codec.MarshalJSON(migrated) require.NoError(t, err) // Indent the JSON bz correctly. diff --git a/x/staking/client/cli/tx.go b/x/staking/client/cli/tx.go index 80513b63db5b..cafee004c1b4 100644 --- a/x/staking/client/cli/tx.go +++ b/x/staking/client/cli/tx.go @@ -291,7 +291,7 @@ func newBuildCreateValidatorMsg(clientCtx client.Context, txf tx.Factory, fs *fl } var pk cryptotypes.PubKey - if err := clientCtx.JSONCodec.UnmarshalInterfaceJSON([]byte(pkStr), &pk); err != nil { + if err := clientCtx.Codec.UnmarshalInterfaceJSON([]byte(pkStr), &pk); err != nil { return txf, nil, err } diff --git a/x/staking/client/testutil/suite.go b/x/staking/client/testutil/suite.go index baa00c4ac27e..822082d32ae5 100644 --- a/x/staking/client/testutil/suite.go +++ b/x/staking/client/testutil/suite.go @@ -200,7 +200,7 @@ func (s *IntegrationTestSuite) TestNewCreateValidatorCmd() { require.Error(err) } else { require.NoError(err, "test: %s\noutput: %s", tc.name, out.String()) - err = clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType) + err = clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType) require.NoError(err, out.String(), "test: %s, output\n:", tc.name, out.String()) txResp := tc.respType.(*sdk.TxResponse) @@ -245,7 +245,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryValidator() { s.Require().NotEqual("internal", err.Error()) } else { var result types.Validator - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &result)) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &result)) s.Require().Equal(val.ValAddress.String(), result.OperatorAddress) } }) @@ -286,7 +286,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryValidators() { s.Require().NoError(err) var result types.QueryValidatorsResponse - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &result)) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &result)) s.Require().Equal(tc.minValidatorCount, len(result.Validators)) }) } @@ -352,7 +352,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryDelegation() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) s.Require().Equal(tc.expected.String(), tc.respType.String()) } }) @@ -408,7 +408,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryDelegations() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) s.Require().Equal(tc.expected.String(), tc.respType.String()) } }) @@ -464,7 +464,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryValidatorDelegations() { s.Require().Error(err) } else { s.Require().NoError(err) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) s.Require().Equal(tc.expected.String(), tc.respType.String()) } }) @@ -509,7 +509,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryUnbondingDelegations() { s.Require().Error(err) } else { var ubds types.QueryDelegatorUnbondingDelegationsResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &ubds) + err = val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &ubds) s.Require().NoError(err) s.Require().Len(ubds.UnbondingResponses, 1) @@ -569,7 +569,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryUnbondingDelegation() { } else { var ubd types.UnbondingDelegation - err = val.ClientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &ubd) + err = val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &ubd) s.Require().NoError(err) s.Require().Equal(ubd.DelegatorAddress, val.Address.String()) s.Require().Equal(ubd.ValidatorAddress, val.ValAddress.String()) @@ -617,7 +617,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryValidatorUnbondingDelegations() { s.Require().Error(err) } else { var ubds types.QueryValidatorUnbondingDelegationsResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &ubds) + err = val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &ubds) s.Require().NoError(err) s.Require().Len(ubds.UnbondingResponses, 1) @@ -666,7 +666,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryRedelegations() { s.Require().Error(err) } else { var redelegations types.QueryRedelegationsResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &redelegations) + err = val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &redelegations) s.Require().NoError(err) @@ -743,7 +743,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryRedelegation() { } else { var redelegations types.QueryRedelegationsResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &redelegations) + err = val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &redelegations) s.Require().NoError(err) s.Require().Len(redelegations.RedelegationResponses, 1) @@ -794,7 +794,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryValidatorRedelegations() { s.Require().Error(err) } else { var redelegations types.QueryRedelegationsResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &redelegations) + err = val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &redelegations) s.Require().NoError(err) @@ -845,7 +845,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryHistoricalInfo() { } else { var historicalInfo types.HistoricalInfo - err = val.ClientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &historicalInfo) + err = val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &historicalInfo) s.Require().NoError(err) s.Require().NotNil(historicalInfo) } @@ -1032,7 +1032,7 @@ func (s *IntegrationTestSuite) TestNewEditValidatorCmd() { s.Require().Error(err) } else { s.Require().NoError(err, out.String()) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code, out.String()) @@ -1114,7 +1114,7 @@ func (s *IntegrationTestSuite) TestNewDelegateCmd() { s.Require().Error(err) } else { s.Require().NoError(err, out.String()) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code, out.String()) @@ -1200,7 +1200,7 @@ func (s *IntegrationTestSuite) TestNewRedelegateCmd() { s.Require().Error(err) } else { s.Require().NoError(err, out.String()) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code, out.String()) @@ -1267,7 +1267,7 @@ func (s *IntegrationTestSuite) TestNewUnbondCmd() { s.Require().Error(err) } else { s.Require().NoError(err, out.String()) - s.Require().NoError(clientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) + s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), tc.respType), out.String()) txResp := tc.respType.(*sdk.TxResponse) s.Require().Equal(tc.expectedCode, txResp.Code, out.String()) diff --git a/x/staking/legacy/v040/migrate_test.go b/x/staking/legacy/v040/migrate_test.go index 97321a47b9f5..af409dde26b8 100644 --- a/x/staking/legacy/v040/migrate_test.go +++ b/x/staking/legacy/v040/migrate_test.go @@ -32,7 +32,7 @@ func TestMigrate(t *testing.T) { migrated := v040staking.Migrate(stakingGenState) - bz, err := clientCtx.JSONCodec.MarshalJSON(migrated) + bz, err := clientCtx.Codec.MarshalJSON(migrated) require.NoError(t, err) // Indent the JSON bz correctly. diff --git a/x/staking/legacy/v043/json_test.go b/x/staking/legacy/v043/json_test.go index 8dc2bf82a440..7eec5418b7c8 100644 --- a/x/staking/legacy/v043/json_test.go +++ b/x/staking/legacy/v043/json_test.go @@ -31,7 +31,7 @@ func TestMigrateJSON(t *testing.T) { require.True(t, migrated.Params.PowerReduction.Equal(sdk.DefaultPowerReduction)) - bz, err := clientCtx.JSONCodec.MarshalJSON(migrated) + bz, err := clientCtx.Codec.MarshalJSON(migrated) require.NoError(t, err) // Indent the JSON bz correctly. diff --git a/x/upgrade/client/testutil/suite.go b/x/upgrade/client/testutil/suite.go index 2faee645eaac..6b559e823c77 100644 --- a/x/upgrade/client/testutil/suite.go +++ b/x/upgrade/client/testutil/suite.go @@ -92,7 +92,7 @@ func (s *IntegrationTestSuite) TestModuleVersionsCLI() { pm := types.QueryModuleVersionsResponse{ ModuleVersions: expect, } - jsonVM, _ := clientCtx.JSONCodec.MarshalJSON(&pm) + jsonVM, _ := clientCtx.Codec.MarshalJSON(&pm) expectedRes := string(jsonVM) // append new line to match behaviour of PrintProto expectedRes += "\n" From 12e711f73b3750f1ee1535609ffbf8dde0f0b355 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 10 Jun 2021 23:49:12 +0200 Subject: [PATCH 3/8] update tests to use clientContext.Codec --- client/context.go | 2 +- .../adr-020-protobuf-transaction-encoding.md | 5 ++-- docs/migrations/app_and_modules.md | 6 ++-- x/auth/client/rest/rest_test.go | 6 ++-- x/authz/client/rest/grpc_query_test.go | 4 +-- x/bank/client/rest/grpc_query_test.go | 8 +++--- x/gov/client/rest/grpc_query_test.go | 16 +++++------ x/mint/client/rest/grpc_query_test.go | 2 +- x/staking/client/rest/grpc_query_test.go | 28 +++++++++---------- 9 files changed, 39 insertions(+), 38 deletions(-) diff --git a/client/context.go b/client/context.go index 644d6e60360d..16c34ac4af33 100644 --- a/client/context.go +++ b/client/context.go @@ -263,7 +263,7 @@ func (ctx Context) PrintBytes(o []byte) error { // PrintProto outputs toPrint to the ctx.Output based on ctx.OutputFormat which is // either text or json. If text, toPrint will be YAML encoded. Otherwise, toPrint -// will be JSON encoded using ctx.JSONCodec. An error is returned upon failure. +// will be JSON encoded using ctx.Codec. An error is returned upon failure. func (ctx Context) PrintProto(toPrint proto.Message) error { // always serialize JSON initially because proto json can't be directly YAML encoded out, err := ctx.Codec.MarshalJSON(toPrint) diff --git a/docs/architecture/adr-020-protobuf-transaction-encoding.md b/docs/architecture/adr-020-protobuf-transaction-encoding.md index d2e288db3841..2efe583cf590 100644 --- a/docs/architecture/adr-020-protobuf-transaction-encoding.md +++ b/docs/architecture/adr-020-protobuf-transaction-encoding.md @@ -13,7 +13,8 @@ - 2020 September 25: Remove `PublicKey` type in favor of `secp256k1.PubKey`, `ed25519.PubKey` and `multisig.LegacyAminoPubKey`. - 2020 October 15: Add `GetAccount` and `GetAccountWithHeight` methods to the `AccountRetriever` interface. - 2021 Feb 24: The SDK does not use Tendermint's `PubKey` interface anymore, but its own `cryptotypes.PubKey`. Updates to reflect this. -- 2021 May 3: Rename `clientCtx.JSONMarshaler` to `clientCtx.JSONCodec` +- 2021 May 3: Rename `clientCtx.JSONMarshaler` to `clientCtx.JSONCodec`. +- 2021 June 10: Add `clientCtx.Codec: codec.Codec`. ## Status @@ -344,7 +345,7 @@ type TxBuilder interface { } ``` -We then update `Context` to have new fields: `JSONCodec`, `TxGenerator`, +We then update `Context` to have new fields: `Codec`, `TxGenerator`, and `AccountRetriever`, and we update `AppModuleBasic.GetTxCmd` to take a `Context` which should have all of these fields pre-populated. diff --git a/docs/migrations/app_and_modules.md b/docs/migrations/app_and_modules.md index 64f004c907fe..7c93a1f6d5b2 100644 --- a/docs/migrations/app_and_modules.md +++ b/docs/migrations/app_and_modules.md @@ -146,7 +146,7 @@ clientCtx, err := client.GetClientTxContext(cmd) Some other flags helper functions are transformed: `flags.PostCommands(cmds ...*cobra.Command) []*cobra.Command` and `flags.GetCommands(...)` usage is now replaced by `flags.AddTxFlagsToCmd(cmd *cobra.Command)` and `flags.AddQueryFlagsToCmd(cmd *cobra.Command)` respectively. -Moreover, new CLI commands don't take any codec as input anymore. Instead, the `clientCtx` can be retrieved from the `cmd` itself using the `GetClient{Query,Tx}Context` function above, and the codec as `clientCtx.JSONCodec`. +Moreover, new CLI commands don't take any codec as input anymore. Instead, the `clientCtx` can be retrieved from the `cmd` itself using the `GetClient{Query,Tx}Context` function above, and the codec as `clientCtx.Codec`. ```diff // v0.39 @@ -154,10 +154,10 @@ Moreover, new CLI commands don't take any codec as input anymore. Instead, the ` - cdc.MarshalJSON(...) - } -// v0.40 +// v0.43 + func NewSendTxCmd() *cobra.Command { + clientCtx, err := client.GetClientTxContext(cmd) -+ clientCtx.JSONCodec.MarshalJSON(...) ++ clientCtx.Codec.MarshalJSON(...) +} ``` diff --git a/x/auth/client/rest/rest_test.go b/x/auth/client/rest/rest_test.go index 038321f242a6..4d7ebf92687a 100644 --- a/x/auth/client/rest/rest_test.go +++ b/x/auth/client/rest/rest_test.go @@ -258,7 +258,7 @@ func (s *IntegrationTestSuite) TestQueryTx() { s.Require().NoError(err) var txRes sdk.TxResponse - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &txRes)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &txRes)) s.Require().Equal(uint32(0), txRes.Code) s.Require().NoError(s.network.WaitForNextBlock()) @@ -411,7 +411,7 @@ func (s *IntegrationTestSuite) testQueryIBCTx(txRes sdk.TxResponse, cmd *cobra.C s.Require().NoError(err) var getTxRes txtypes.GetTxResponse - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(grpcJSON, &getTxRes)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(grpcJSON, &getTxRes)) s.Require().Equal(getTxRes.Tx.Body.Memo, "foobar") // generate broadcast only txn. @@ -522,7 +522,7 @@ func (s *IntegrationTestSuite) TestLegacyMultisig() { s.Require().NoError(s.network.WaitForNextBlock()) var txRes sdk.TxResponse - err = val1.ClientCtx.JSONCodec.UnmarshalJSON(out.Bytes(), &txRes) + err = val1.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &txRes) s.Require().NoError(err) s.Require().Equal(uint32(0), txRes.Code) diff --git a/x/authz/client/rest/grpc_query_test.go b/x/authz/client/rest/grpc_query_test.go index 00106b430252..3f29323815ab 100644 --- a/x/authz/client/rest/grpc_query_test.go +++ b/x/authz/client/rest/grpc_query_test.go @@ -139,7 +139,7 @@ func (s *IntegrationTestSuite) TestQueryGrantGRPC() { require.Contains(string(resp), tc.errorMsg) } else { var g authz.QueryGrantsResponse - err := val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &g) + err := val.ClientCtx.Codec.UnmarshalJSON(resp, &g) require.NoError(err) require.Len(g.Grants, 1) g.Grants[0].UnpackInterfaces(val.ClientCtx.InterfaceRegistry) @@ -223,7 +223,7 @@ func (s *IntegrationTestSuite) TestQueryGrantsGRPC() { s.Require().Contains(string(resp), tc.errMsg) } else { var authorizations authz.QueryGrantsResponse - err := val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &authorizations) + err := val.ClientCtx.Codec.UnmarshalJSON(resp, &authorizations) s.Require().NoError(err) tc.postRun(&authorizations) } diff --git a/x/bank/client/rest/grpc_query_test.go b/x/bank/client/rest/grpc_query_test.go index a770919b17ea..5277fd22d010 100644 --- a/x/bank/client/rest/grpc_query_test.go +++ b/x/bank/client/rest/grpc_query_test.go @@ -95,7 +95,7 @@ func (s *IntegrationTestSuite) TestTotalSupplyGRPCHandler() { resp, err := testutil.GetRequestWithHeaders(tc.url, tc.headers) s.Require().NoError(err) - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) s.Require().Equal(tc.expected.String(), tc.respType.String()) }) } @@ -199,9 +199,9 @@ func (s *IntegrationTestSuite) TestDenomMetadataGRPCHandler() { s.Require().NoError(err) if tc.expErr { - s.Require().Error(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().Error(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) } else { - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) s.Require().Equal(tc.expected.String(), tc.respType.String()) } }) @@ -262,7 +262,7 @@ func (s *IntegrationTestSuite) TestBalancesGRPCHandler() { resp, err := rest.GetRequest(tc.url) s.Require().NoError(err) - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) s.Require().Equal(tc.expected.String(), tc.respType.String()) }) } diff --git a/x/gov/client/rest/grpc_query_test.go b/x/gov/client/rest/grpc_query_test.go index ecbf0c5915a1..12247aeb9a91 100644 --- a/x/gov/client/rest/grpc_query_test.go +++ b/x/gov/client/rest/grpc_query_test.go @@ -103,7 +103,7 @@ func (s *IntegrationTestSuite) TestGetProposalGRPC() { s.Require().NoError(err) var proposal types.QueryProposalResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &proposal) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, &proposal) if tc.expErr { s.Require().Error(err) @@ -157,7 +157,7 @@ func (s *IntegrationTestSuite) TestGetProposalsGRPC() { s.Require().NoError(err) var proposals types.QueryProposalsResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &proposals) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, &proposals) if tc.expErr { s.Require().Empty(proposals.Proposals) @@ -224,7 +224,7 @@ func (s *IntegrationTestSuite) TestGetProposalVoteGRPC() { s.Require().NoError(err) var vote types.QueryVoteResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &vote) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, &vote) if tc.expErr { s.Require().Error(err) @@ -268,7 +268,7 @@ func (s *IntegrationTestSuite) TestGetProposalVotesGRPC() { s.Require().NoError(err) var votes types.QueryVotesResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &votes) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, &votes) if tc.expErr { s.Require().Error(err) @@ -317,7 +317,7 @@ func (s *IntegrationTestSuite) TestGetProposalDepositGRPC() { s.Require().NoError(err) var deposit types.QueryDepositResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &deposit) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, &deposit) if tc.expErr { s.Require().Error(err) @@ -356,7 +356,7 @@ func (s *IntegrationTestSuite) TestGetProposalDepositsGRPC() { s.Require().NoError(err) var deposits types.QueryDepositsResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &deposits) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, &deposits) if tc.expErr { s.Require().Error(err) @@ -401,7 +401,7 @@ func (s *IntegrationTestSuite) TestGetTallyGRPC() { s.Require().NoError(err) var tally types.QueryTallyResultResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &tally) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, &tally) if tc.expErr { s.Require().Error(err) @@ -463,7 +463,7 @@ func (s *IntegrationTestSuite) TestGetParamsGRPC() { resp, err := rest.GetRequest(tc.url) s.Require().NoError(err) - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType) if tc.expErr { s.Require().Error(err) diff --git a/x/mint/client/rest/grpc_query_test.go b/x/mint/client/rest/grpc_query_test.go index 6d8fa90a2fcc..fdbb4ff75998 100644 --- a/x/mint/client/rest/grpc_query_test.go +++ b/x/mint/client/rest/grpc_query_test.go @@ -101,7 +101,7 @@ func (s *IntegrationTestSuite) TestQueryGRPC() { resp, err := testutil.GetRequestWithHeaders(tc.url, tc.headers) s.Run(tc.name, func() { s.Require().NoError(err) - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) s.Require().Equal(tc.expected.String(), tc.respType.String()) }) } diff --git a/x/staking/client/rest/grpc_query_test.go b/x/staking/client/rest/grpc_query_test.go index 7ead75b8df73..55a10194f603 100644 --- a/x/staking/client/rest/grpc_query_test.go +++ b/x/staking/client/rest/grpc_query_test.go @@ -107,7 +107,7 @@ func (s *IntegrationTestSuite) TestQueryValidatorsGRPCHandler() { s.Require().NoError(err) var valRes types.QueryValidatorsResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &valRes) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, &valRes) if tc.error { s.Require().Error(err) @@ -155,7 +155,7 @@ func (s *IntegrationTestSuite) TestQueryValidatorGRPC() { s.Require().NoError(err) var validator types.QueryValidatorResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &validator) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, &validator) if tc.error { s.Require().Error(err) @@ -219,7 +219,7 @@ func (s *IntegrationTestSuite) TestQueryValidatorDelegationsGRPC() { resp, err := testutil.GetRequestWithHeaders(tc.url, tc.headers) s.Require().NoError(err) - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType) if tc.error { s.Require().Error(err) @@ -265,7 +265,7 @@ func (s *IntegrationTestSuite) TestQueryValidatorUnbondingDelegationsGRPC() { var ubds types.QueryValidatorUnbondingDelegationsResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &ubds) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, &ubds) if tc.error { s.Require().Error(err) @@ -342,7 +342,7 @@ func (s *IntegrationTestSuite) TestQueryDelegationGRPC() { resp, err := rest.GetRequest(tc.url) s.Require().NoError(err) s.T().Logf("%s", resp) - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType) if tc.error { s.Require().Error(err) @@ -398,7 +398,7 @@ func (s *IntegrationTestSuite) TestQueryUnbondingDelegationGRPC() { var ubd types.QueryUnbondingDelegationResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &ubd) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, &ubd) if tc.error { s.Require().Error(err) @@ -481,7 +481,7 @@ func (s *IntegrationTestSuite) TestQueryDelegatorDelegationsGRPC() { resp, err := testutil.GetRequestWithHeaders(tc.url, tc.headers) s.Require().NoError(err) - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType) if tc.error { s.Require().Error(err) @@ -531,7 +531,7 @@ func (s *IntegrationTestSuite) TestQueryDelegatorUnbondingDelegationsGRPC() { var ubds types.QueryDelegatorUnbondingDelegationsResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &ubds) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, &ubds) if tc.error { s.Require().Error(err) @@ -592,7 +592,7 @@ func (s *IntegrationTestSuite) TestQueryRedelegationsGRPC() { s.Require().NoError(err) var redelegations types.QueryRedelegationsResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &redelegations) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, &redelegations) if tc.error { s.Require().Error(err) @@ -642,7 +642,7 @@ func (s *IntegrationTestSuite) TestQueryDelegatorValidatorsGRPC() { var validators types.QueryDelegatorValidatorsResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &validators) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, &validators) if tc.error { s.Require().Error(err) @@ -698,7 +698,7 @@ func (s *IntegrationTestSuite) TestQueryDelegatorValidatorGRPC() { s.Require().NoError(err) var validator types.QueryDelegatorValidatorResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &validator) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, &validator) if tc.error { s.Require().Error(err) @@ -745,7 +745,7 @@ func (s *IntegrationTestSuite) TestQueryHistoricalInfoGRPC() { var historicalInfo types.QueryHistoricalInfoResponse - err = val.ClientCtx.JSONCodec.UnmarshalJSON(resp, &historicalInfo) + err = val.ClientCtx.Codec.UnmarshalJSON(resp, &historicalInfo) if tc.error { s.Require().Error(err) @@ -782,7 +782,7 @@ func (s *IntegrationTestSuite) TestQueryParamsGRPC() { resp, err := rest.GetRequest(tc.url) s.Run(tc.name, func() { s.Require().NoError(err) - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) s.Require().Equal(tc.expected, tc.respType) }) } @@ -816,7 +816,7 @@ func (s *IntegrationTestSuite) TestQueryPoolGRPC() { resp, err := rest.GetRequest(tc.url) s.Run(tc.name, func() { s.Require().NoError(err) - s.Require().NoError(val.ClientCtx.JSONCodec.UnmarshalJSON(resp, tc.respType)) + s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(resp, tc.respType)) s.Require().Equal(tc.expected, tc.respType) }) } From ff977ddb6909f6b0daf30947804ceddb779475ad Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 10 Jun 2021 23:58:31 +0200 Subject: [PATCH 4/8] added a note that EncodingConfig.Marshaler will be renamed to Codec --- simapp/params/encoding.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simapp/params/encoding.go b/simapp/params/encoding.go index e80042cfc9d6..057c82160d5f 100644 --- a/simapp/params/encoding.go +++ b/simapp/params/encoding.go @@ -10,7 +10,7 @@ import ( // This is provided for compatibility between protobuf and amino implementations. type EncodingConfig struct { InterfaceRegistry types.InterfaceRegistry - // Deprecated: this field wil lbe renamed to Codec + // NOTE: this field wil lbe renamed to Codec Marshaler codec.Codec TxConfig client.TxConfig Amino *codec.LegacyAmino From 3226be8de54fc1a702795bad09e2e0c78d74d8e7 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Fri, 11 Jun 2021 00:04:08 +0200 Subject: [PATCH 5/8] update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 886ba07aed56..63e42a722333 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ if input key is empty, or input data contains empty key. * (x/staking) [\#9214](https://github.com/cosmos/cosmos-sdk/pull/9214) Added `new_shares` attribute inside `EventTypeDelegate` event. * [\#9382](https://github.com/cosmos/cosmos-sdk/pull/9382) feat: add Dec.Float64() function. * [\#9457](https://github.com/cosmos/cosmos-sdk/pull/9457) Add amino support for x/authz and x/feegrant Msgs. +* [\#9498](https://github.com/cosmos/cosmos-sdk/pull/9498) Added `Codec: codec.Codec` attribute to `client/Context` structure. ### Client Breaking Changes @@ -155,7 +156,7 @@ if input key is empty, or input data contains empty key. ### Deprecated * (grpc) [\#8926](https://github.com/cosmos/cosmos-sdk/pull/8926) The `tx` field in `SimulateRequest` has been deprecated, prefer to pass `tx_bytes` instead. -* (sdk types) [\#xxx]() `clientContext.JSONCodec` +* (sdk types) [\#9498](https://github.com/cosmos/cosmos-sdk/pull/9498) `clientContext.JSONCodec` will be removed in the next version. use `clientContext.Codec` instead. ## [v0.42.4](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.42.4) - 2021-04-08 From eb5bb9554ae60e9e6909ba0a6ad723f997f3e5ec Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Fri, 11 Jun 2021 01:32:54 +0200 Subject: [PATCH 6/8] fix tests to use clientCtx.WithCodec instead of WithJSONCodec --- client/context.go | 5 +++++ client/context_test.go | 2 +- server/export_test.go | 2 +- simapp/simd/cmd/genaccounts_test.go | 2 +- x/auth/client/cli/encode_test.go | 4 ++-- x/genutil/client/cli/init_test.go | 6 +++--- x/genutil/client/testutil/helpers.go | 2 +- x/gov/legacy/v043/json_test.go | 2 +- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/client/context.go b/client/context.go index 16c34ac4af33..246ea5b40d67 100644 --- a/client/context.go +++ b/client/context.go @@ -77,6 +77,11 @@ func (ctx Context) WithInput(r io.Reader) Context { // Deprecated: WithJSONCodec returns a copy of the Context with an updated JSONCodec. func (ctx Context) WithJSONCodec(m codec.JSONCodec) Context { ctx.JSONCodec = m + // since we are using ctx.Codec everywhere in the SDK, for backward compatibility + // we need to try to set it here as well. + if c, ok := m.(codec.Codec); ok { + ctx.Codec = c + } return ctx } diff --git a/client/context_test.go b/client/context_test.go index 53214b7c23d8..9c2e8d4ab19e 100644 --- a/client/context_test.go +++ b/client/context_test.go @@ -41,7 +41,7 @@ func TestContext_PrintObject(t *testing.T) { // proto // registry := testdata.NewTestInterfaceRegistry() - ctx = ctx.WithJSONCodec(codec.NewProtoCodec(registry)) + ctx = ctx.WithCodec(codec.NewProtoCodec(registry)) // json buf := &bytes.Buffer{} diff --git a/server/export_test.go b/server/export_test.go index e7d62ebfcfc9..364a8475dd33 100644 --- a/server/export_test.go +++ b/server/export_test.go @@ -135,7 +135,7 @@ func setupApp(t *testing.T, tempDir string) (*simapp.SimApp, context.Context, *t serverCtx := server.NewDefaultContext() serverCtx.Config.RootDir = tempDir - clientCtx := client.Context{}.WithJSONCodec(app.AppCodec()) + clientCtx := client.Context{}.WithCodec(app.AppCodec()) genDoc := newDefaultGenesisDoc(encCfg.Marshaler) require.NoError(t, saveGenesisFile(genDoc, serverCtx.Config.GenesisFile())) diff --git a/simapp/simd/cmd/genaccounts_test.go b/simapp/simd/cmd/genaccounts_test.go index a1b0137a1261..2802cd4af8ae 100644 --- a/simapp/simd/cmd/genaccounts_test.go +++ b/simapp/simd/cmd/genaccounts_test.go @@ -63,7 +63,7 @@ func TestAddGenesisAccountCmd(t *testing.T) { require.NoError(t, err) serverCtx := server.NewContext(viper.New(), cfg, logger) - clientCtx := client.Context{}.WithJSONCodec(appCodec).WithHomeDir(home) + clientCtx := client.Context{}.WithCodec(appCodec).WithHomeDir(home) ctx := context.Background() ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx) diff --git a/x/auth/client/cli/encode_test.go b/x/auth/client/cli/encode_test.go index 2b0a7ab2e5e4..ed3566aaf2c6 100644 --- a/x/auth/client/cli/encode_test.go +++ b/x/auth/client/cli/encode_test.go @@ -39,7 +39,7 @@ func TestGetCommandEncode(t *testing.T) { ctx := context.Background() clientCtx := client.Context{}. WithTxConfig(encodingConfig.TxConfig). - WithJSONCodec(encodingConfig.Marshaler) + WithCodec(encodingConfig.Marshaler) 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). - WithJSONCodec(encodingConfig.Marshaler) + WithCodec(encodingConfig.Marshaler) cmd := GetDecodeCommand() _ = testutil.ApplyMockIODiscardOutErr(cmd) diff --git a/x/genutil/client/cli/init_test.go b/x/genutil/client/cli/init_test.go index 37bbd7597a7c..64ec01c4adf1 100644 --- a/x/genutil/client/cli/init_test.go +++ b/x/genutil/client/cli/init_test.go @@ -63,7 +63,7 @@ func TestInitCmd(t *testing.T) { interfaceRegistry := types.NewInterfaceRegistry() marshaler := codec.NewProtoCodec(interfaceRegistry) clientCtx := client.Context{}. - WithJSONCodec(marshaler). + WithCodec(marshaler). WithLegacyAmino(makeCodec()). WithHomeDir(home) @@ -97,7 +97,7 @@ func TestInitRecover(t *testing.T) { interfaceRegistry := types.NewInterfaceRegistry() marshaler := codec.NewProtoCodec(interfaceRegistry) clientCtx := client.Context{}. - WithJSONCodec(marshaler). + WithCodec(marshaler). WithLegacyAmino(makeCodec()). WithHomeDir(home) @@ -128,7 +128,7 @@ func TestEmptyState(t *testing.T) { interfaceRegistry := types.NewInterfaceRegistry() marshaler := codec.NewProtoCodec(interfaceRegistry) clientCtx := client.Context{}. - WithJSONCodec(marshaler). + WithCodec(marshaler). WithLegacyAmino(makeCodec()). WithHomeDir(home) diff --git a/x/genutil/client/testutil/helpers.go b/x/genutil/client/testutil/helpers.go index 1a5229f3733d..47ab83d4613a 100644 --- a/x/genutil/client/testutil/helpers.go +++ b/x/genutil/client/testutil/helpers.go @@ -26,7 +26,7 @@ func ExecInitCmd(testMbm module.BasicManager, home string, cdc codec.JSONCodec) cmd := genutilcli.InitCmd(testMbm, home) serverCtx := server.NewContext(viper.New(), cfg, logger) - clientCtx := client.Context{}.WithJSONCodec(cdc).WithHomeDir(home) + clientCtx := client.Context{}.WithCodec(cdc).WithHomeDir(home) _, out := testutil.ApplyMockIO(cmd) clientCtx = clientCtx.WithOutput(out) diff --git a/x/gov/legacy/v043/json_test.go b/x/gov/legacy/v043/json_test.go index 1cf6bf8e18aa..1f8bb2a69f60 100644 --- a/x/gov/legacy/v043/json_test.go +++ b/x/gov/legacy/v043/json_test.go @@ -20,7 +20,7 @@ func TestMigrateJSON(t *testing.T) { clientCtx := client.Context{}. WithInterfaceRegistry(encodingConfig.InterfaceRegistry). WithTxConfig(encodingConfig.TxConfig). - WithJSONCodec(encodingConfig.Marshaler) + WithCodec(encodingConfig.Marshaler) voter, err := sdk.AccAddressFromBech32("cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh") require.NoError(t, err) From c80200fe7e879a6e2a6d58d240615404407a8bb1 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Fri, 11 Jun 2021 03:32:26 +0200 Subject: [PATCH 7/8] fix genutil build --- x/genutil/client/testutil/helpers.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/genutil/client/testutil/helpers.go b/x/genutil/client/testutil/helpers.go index 47ab83d4613a..1d71ba11411f 100644 --- a/x/genutil/client/testutil/helpers.go +++ b/x/genutil/client/testutil/helpers.go @@ -17,7 +17,7 @@ import ( genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" ) -func ExecInitCmd(testMbm module.BasicManager, home string, cdc codec.JSONCodec) error { +func ExecInitCmd(testMbm module.BasicManager, home string, cdc codec.Codec) error { logger := log.NewNopLogger() cfg, err := CreateDefaultTendermintConfig(home) if err != nil { From 7c54e03544e644e9a25bf773443734ad6672b51b Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Fri, 11 Jun 2021 12:43:56 +0200 Subject: [PATCH 8/8] Update simapp/params/encoding.go Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com> --- simapp/params/encoding.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simapp/params/encoding.go b/simapp/params/encoding.go index 057c82160d5f..2cd16263a899 100644 --- a/simapp/params/encoding.go +++ b/simapp/params/encoding.go @@ -10,7 +10,7 @@ import ( // This is provided for compatibility between protobuf and amino implementations. type EncodingConfig struct { InterfaceRegistry types.InterfaceRegistry - // NOTE: this field wil lbe renamed to Codec + // NOTE: this field will be renamed to Codec Marshaler codec.Codec TxConfig client.TxConfig Amino *codec.LegacyAmino