From a6fe36d574d635a8e409d0445bc4356f17ed038a Mon Sep 17 00:00:00 2001 From: Simon Warta <2603011+webmaster128@users.noreply.github.com> Date: Fri, 20 Oct 2023 18:04:59 +0200 Subject: [PATCH] Rename some more "features" to "capabilities" (#1679) * Format code * Rename {Reflect,Cyberpunk}Features -> {Reflect,Cyberpunk}Capabilities --- tests/system/cli.go | 1 - x/wasm/keeper/addresses_test.go | 2 +- x/wasm/keeper/query_plugin_integration_test.go | 18 +++++++++--------- x/wasm/keeper/reflect_test.go | 10 +++++----- x/wasm/keeper/submsg_test.go | 8 ++++---- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/tests/system/cli.go b/tests/system/cli.go index 600dcf9ee0..5b0eef69d3 100644 --- a/tests/system/cli.go +++ b/tests/system/cli.go @@ -389,7 +389,6 @@ func (c WasmdCli) IsInCometBftValset(valPubKey cryptotypes.PubKey) (cmtservice.G return valResult, found } - // SubmitGovProposal submit a gov v1 proposal func (c WasmdCli) SubmitGovProposal(proposalJson string, args ...string) string { if len(args) == 0 { diff --git a/x/wasm/keeper/addresses_test.go b/x/wasm/keeper/addresses_test.go index c3b24bc41a..c548f46787 100644 --- a/x/wasm/keeper/addresses_test.go +++ b/x/wasm/keeper/addresses_test.go @@ -3,9 +3,9 @@ package keeper import ( "encoding/json" "fmt" - tmbytes "github.com/cometbft/cometbft/libs/bytes" "testing" + tmbytes "github.com/cometbft/cometbft/libs/bytes" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/wasm/keeper/query_plugin_integration_test.go b/x/wasm/keeper/query_plugin_integration_test.go index b6316d8d45..644c4ed093 100644 --- a/x/wasm/keeper/query_plugin_integration_test.go +++ b/x/wasm/keeper/query_plugin_integration_test.go @@ -27,7 +27,7 @@ import ( func TestMaskReflectCustomQuery(t *testing.T) { cdc := MakeEncodingConfig(t).Codec - ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) + ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) keeper := keepers.WasmKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) @@ -75,7 +75,7 @@ func TestMaskReflectCustomQuery(t *testing.T) { func TestReflectStargateQuery(t *testing.T) { cdc := MakeEncodingConfig(t).Codec - ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) + ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) keeper := keepers.WasmKeeper funds := sdk.NewCoins(sdk.NewInt64Coin("denom", 320000)) @@ -118,7 +118,7 @@ func TestReflectStargateQuery(t *testing.T) { func TestReflectTotalSupplyQuery(t *testing.T) { cdc := MakeEncodingConfig(t).Codec - ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) + ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) keeper := keepers.WasmKeeper // upload code codeID := StoreReflectContract(t, ctx, keepers).CodeID @@ -169,7 +169,7 @@ func TestReflectTotalSupplyQuery(t *testing.T) { func TestReflectInvalidStargateQuery(t *testing.T) { cdc := MakeEncodingConfig(t).Codec - ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) + ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) keeper := keepers.WasmKeeper funds := sdk.NewCoins(sdk.NewInt64Coin("denom", 320000)) @@ -250,7 +250,7 @@ type reflectState struct { func TestMaskReflectWasmQueries(t *testing.T) { cdc := MakeEncodingConfig(t).Codec - ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) + ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) keeper := keepers.WasmKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) @@ -320,7 +320,7 @@ func TestMaskReflectWasmQueries(t *testing.T) { func TestWasmRawQueryWithNil(t *testing.T) { cdc := MakeEncodingConfig(t).Codec - ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) + ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) keeper := keepers.WasmKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) @@ -363,7 +363,7 @@ func TestWasmRawQueryWithNil(t *testing.T) { } func TestQueryDenomsIntegration(t *testing.T) { - ctx, keepers := CreateTestInput(t, false, CyberpunkFeatures) + ctx, keepers := CreateTestInput(t, false, CyberpunkCapabilities) ck, k := keepers.ContractKeeper, keepers.WasmKeeper creator := keepers.Faucet.NewFundedRandomAccount(ctx, sdk.NewCoins(sdk.NewInt64Coin("denom", 100000))...) @@ -477,7 +477,7 @@ func TestQueryDenomsIntegration(t *testing.T) { func TestDistributionQuery(t *testing.T) { cdc := MakeEncodingConfig(t).Codec - pCtx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) + pCtx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) keeper := keepers.WasmKeeper example := InstantiateReflectExampleContract(t, pCtx, keepers) @@ -646,7 +646,7 @@ func TestDistributionQuery(t *testing.T) { func TestIBCListChannelsQuery(t *testing.T) { cdc := MakeEncodingConfig(t).Codec - pCtx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) + pCtx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) keeper := keepers.WasmKeeper nonIbcExample := InstantiateReflectExampleContract(t, pCtx, keepers) ibcExample := InstantiateReflectExampleContract(t, pCtx, keepers) diff --git a/x/wasm/keeper/reflect_test.go b/x/wasm/keeper/reflect_test.go index c53360bbf2..95d9dff4a6 100644 --- a/x/wasm/keeper/reflect_test.go +++ b/x/wasm/keeper/reflect_test.go @@ -24,8 +24,8 @@ import ( ) const ( - CyberpunkFeatures = "staking,mask,stargate,cosmwasm_1_1,cosmwasm_1_2,cosmwasm_1_3,cosmwasm_1_4" - ReflectFeatures = CyberpunkFeatures + CyberpunkCapabilities = "staking,mask,stargate,cosmwasm_1_1,cosmwasm_1_2,cosmwasm_1_3,cosmwasm_1_4" + ReflectCapabilities = CyberpunkCapabilities ) func mustUnmarshal(t *testing.T, data []byte, res interface{}) { @@ -36,7 +36,7 @@ func mustUnmarshal(t *testing.T, data []byte, res interface{}) { func TestReflectContractSend(t *testing.T) { cdc := MakeEncodingConfig(t).Codec - ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc))) + ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc))) accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) @@ -115,7 +115,7 @@ func TestReflectContractSend(t *testing.T) { func TestReflectCustomMsg(t *testing.T) { cdc := MakeEncodingConfig(t).Codec - ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) + ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins())) accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) @@ -205,7 +205,7 @@ func TestReflectCustomMsg(t *testing.T) { } func TestRustPanicIsHandled(t *testing.T) { - ctx, keepers := CreateTestInput(t, false, CyberpunkFeatures) + ctx, keepers := CreateTestInput(t, false, CyberpunkCapabilities) keeper := keepers.ContractKeeper creator := keepers.Faucet.NewFundedRandomAccount(ctx, sdk.NewCoins(sdk.NewInt64Coin("denom", 100000))...) diff --git a/x/wasm/keeper/submsg_test.go b/x/wasm/keeper/submsg_test.go index 99ead92795..5f8c4932c6 100644 --- a/x/wasm/keeper/submsg_test.go +++ b/x/wasm/keeper/submsg_test.go @@ -27,7 +27,7 @@ import ( // Try a simple send, no gas limit to for a sanity check before trying table tests func TestDispatchSubMsgSuccessCase(t *testing.T) { - ctx, keepers := CreateTestInput(t, false, ReflectFeatures) + ctx, keepers := CreateTestInput(t, false, ReflectCapabilities) accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.WasmKeeper, keepers.BankKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) @@ -112,7 +112,7 @@ func TestDispatchSubMsgErrorHandling(t *testing.T) { subGasLimit := uint64(300_000) // prep - create one chain and upload the code - ctx, keepers := CreateTestInput(t, false, ReflectFeatures) + ctx, keepers := CreateTestInput(t, false, ReflectCapabilities) ctx = ctx.WithGasMeter(storetypes.NewInfiniteGasMeter()) ctx = ctx.WithBlockGasMeter(storetypes.NewInfiniteGasMeter()) keeper := keepers.WasmKeeper @@ -367,7 +367,7 @@ func TestDispatchSubMsgEncodeToNoSdkMsg(t *testing.T) { Bank: nilEncoder, } - ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageHandler(NewSDKMessageHandler(MakeTestCodec(t), nil, customEncoders))) + ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageHandler(NewSDKMessageHandler(MakeTestCodec(t), nil, customEncoders))) keeper := keepers.WasmKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000)) @@ -433,7 +433,7 @@ func TestDispatchSubMsgEncodeToNoSdkMsg(t *testing.T) { // Try a simple send, no gas limit to for a sanity check before trying table tests func TestDispatchSubMsgConditionalReplyOn(t *testing.T) { - ctx, keepers := CreateTestInput(t, false, ReflectFeatures) + ctx, keepers := CreateTestInput(t, false, ReflectCapabilities) keeper := keepers.WasmKeeper deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000))