Skip to content

Commit a6fe36d

Browse files
webmaster128webmaster128
authored
Rename some more "features" to "capabilities" (#1679)
* Format code * Rename {Reflect,Cyberpunk}Features -> {Reflect,Cyberpunk}Capabilities
1 parent 606289a commit a6fe36d

File tree

5 files changed

+19
-20
lines changed

5 files changed

+19
-20
lines changed

‎tests/system/cli.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,6 @@ func (c WasmdCli) IsInCometBftValset(valPubKey cryptotypes.PubKey) (cmtservice.G
389389
return valResult, found
390390
}
391391

392-
393392
// SubmitGovProposal submit a gov v1 proposal
394393
func (c WasmdCli) SubmitGovProposal(proposalJson string, args ...string) string {
395394
if len(args) == 0 {

‎x/wasm/keeper/addresses_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package keeper
33
import (
44
"encoding/json"
55
"fmt"
6-
tmbytes "github.com/cometbft/cometbft/libs/bytes"
76
"testing"
87

8+
tmbytes "github.com/cometbft/cometbft/libs/bytes"
99
"github.com/stretchr/testify/require"
1010

1111
sdk "github.com/cosmos/cosmos-sdk/types"

‎x/wasm/keeper/query_plugin_integration_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
func TestMaskReflectCustomQuery(t *testing.T) {
2929
cdc := MakeEncodingConfig(t).Codec
30-
ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
30+
ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
3131
keeper := keepers.WasmKeeper
3232

3333
deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000))
@@ -75,7 +75,7 @@ func TestMaskReflectCustomQuery(t *testing.T) {
7575

7676
func TestReflectStargateQuery(t *testing.T) {
7777
cdc := MakeEncodingConfig(t).Codec
78-
ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
78+
ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
7979
keeper := keepers.WasmKeeper
8080

8181
funds := sdk.NewCoins(sdk.NewInt64Coin("denom", 320000))
@@ -118,7 +118,7 @@ func TestReflectStargateQuery(t *testing.T) {
118118

119119
func TestReflectTotalSupplyQuery(t *testing.T) {
120120
cdc := MakeEncodingConfig(t).Codec
121-
ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
121+
ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
122122
keeper := keepers.WasmKeeper
123123
// upload code
124124
codeID := StoreReflectContract(t, ctx, keepers).CodeID
@@ -169,7 +169,7 @@ func TestReflectTotalSupplyQuery(t *testing.T) {
169169

170170
func TestReflectInvalidStargateQuery(t *testing.T) {
171171
cdc := MakeEncodingConfig(t).Codec
172-
ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
172+
ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
173173
keeper := keepers.WasmKeeper
174174

175175
funds := sdk.NewCoins(sdk.NewInt64Coin("denom", 320000))
@@ -250,7 +250,7 @@ type reflectState struct {
250250

251251
func TestMaskReflectWasmQueries(t *testing.T) {
252252
cdc := MakeEncodingConfig(t).Codec
253-
ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
253+
ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
254254
keeper := keepers.WasmKeeper
255255

256256
deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000))
@@ -320,7 +320,7 @@ func TestMaskReflectWasmQueries(t *testing.T) {
320320

321321
func TestWasmRawQueryWithNil(t *testing.T) {
322322
cdc := MakeEncodingConfig(t).Codec
323-
ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
323+
ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
324324
keeper := keepers.WasmKeeper
325325

326326
deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000))
@@ -363,7 +363,7 @@ func TestWasmRawQueryWithNil(t *testing.T) {
363363
}
364364

365365
func TestQueryDenomsIntegration(t *testing.T) {
366-
ctx, keepers := CreateTestInput(t, false, CyberpunkFeatures)
366+
ctx, keepers := CreateTestInput(t, false, CyberpunkCapabilities)
367367
ck, k := keepers.ContractKeeper, keepers.WasmKeeper
368368
creator := keepers.Faucet.NewFundedRandomAccount(ctx, sdk.NewCoins(sdk.NewInt64Coin("denom", 100000))...)
369369

@@ -477,7 +477,7 @@ func TestQueryDenomsIntegration(t *testing.T) {
477477

478478
func TestDistributionQuery(t *testing.T) {
479479
cdc := MakeEncodingConfig(t).Codec
480-
pCtx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
480+
pCtx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
481481
keeper := keepers.WasmKeeper
482482

483483
example := InstantiateReflectExampleContract(t, pCtx, keepers)
@@ -646,7 +646,7 @@ func TestDistributionQuery(t *testing.T) {
646646

647647
func TestIBCListChannelsQuery(t *testing.T) {
648648
cdc := MakeEncodingConfig(t).Codec
649-
pCtx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
649+
pCtx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
650650
keeper := keepers.WasmKeeper
651651
nonIbcExample := InstantiateReflectExampleContract(t, pCtx, keepers)
652652
ibcExample := InstantiateReflectExampleContract(t, pCtx, keepers)

‎x/wasm/keeper/reflect_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
)
2525

2626
const (
27-
CyberpunkFeatures = "staking,mask,stargate,cosmwasm_1_1,cosmwasm_1_2,cosmwasm_1_3,cosmwasm_1_4"
28-
ReflectFeatures = CyberpunkFeatures
27+
CyberpunkCapabilities = "staking,mask,stargate,cosmwasm_1_1,cosmwasm_1_2,cosmwasm_1_3,cosmwasm_1_4"
28+
ReflectCapabilities = CyberpunkCapabilities
2929
)
3030

3131
func mustUnmarshal(t *testing.T, data []byte, res interface{}) {
@@ -36,7 +36,7 @@ func mustUnmarshal(t *testing.T, data []byte, res interface{}) {
3636

3737
func TestReflectContractSend(t *testing.T) {
3838
cdc := MakeEncodingConfig(t).Codec
39-
ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)))
39+
ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)))
4040
accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper
4141

4242
deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000))
@@ -115,7 +115,7 @@ func TestReflectContractSend(t *testing.T) {
115115

116116
func TestReflectCustomMsg(t *testing.T) {
117117
cdc := MakeEncodingConfig(t).Codec
118-
ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
118+
ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageEncoders(reflectEncoders(cdc)), WithQueryPlugins(reflectPlugins()))
119119
accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.ContractKeeper, keepers.BankKeeper
120120

121121
deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000))
@@ -205,7 +205,7 @@ func TestReflectCustomMsg(t *testing.T) {
205205
}
206206

207207
func TestRustPanicIsHandled(t *testing.T) {
208-
ctx, keepers := CreateTestInput(t, false, CyberpunkFeatures)
208+
ctx, keepers := CreateTestInput(t, false, CyberpunkCapabilities)
209209
keeper := keepers.ContractKeeper
210210

211211
creator := keepers.Faucet.NewFundedRandomAccount(ctx, sdk.NewCoins(sdk.NewInt64Coin("denom", 100000))...)

‎x/wasm/keeper/submsg_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
// Try a simple send, no gas limit to for a sanity check before trying table tests
2929
func TestDispatchSubMsgSuccessCase(t *testing.T) {
30-
ctx, keepers := CreateTestInput(t, false, ReflectFeatures)
30+
ctx, keepers := CreateTestInput(t, false, ReflectCapabilities)
3131
accKeeper, keeper, bankKeeper := keepers.AccountKeeper, keepers.WasmKeeper, keepers.BankKeeper
3232

3333
deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000))
@@ -112,7 +112,7 @@ func TestDispatchSubMsgErrorHandling(t *testing.T) {
112112
subGasLimit := uint64(300_000)
113113

114114
// prep - create one chain and upload the code
115-
ctx, keepers := CreateTestInput(t, false, ReflectFeatures)
115+
ctx, keepers := CreateTestInput(t, false, ReflectCapabilities)
116116
ctx = ctx.WithGasMeter(storetypes.NewInfiniteGasMeter())
117117
ctx = ctx.WithBlockGasMeter(storetypes.NewInfiniteGasMeter())
118118
keeper := keepers.WasmKeeper
@@ -367,7 +367,7 @@ func TestDispatchSubMsgEncodeToNoSdkMsg(t *testing.T) {
367367
Bank: nilEncoder,
368368
}
369369

370-
ctx, keepers := CreateTestInput(t, false, ReflectFeatures, WithMessageHandler(NewSDKMessageHandler(MakeTestCodec(t), nil, customEncoders)))
370+
ctx, keepers := CreateTestInput(t, false, ReflectCapabilities, WithMessageHandler(NewSDKMessageHandler(MakeTestCodec(t), nil, customEncoders)))
371371
keeper := keepers.WasmKeeper
372372

373373
deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000))
@@ -433,7 +433,7 @@ func TestDispatchSubMsgEncodeToNoSdkMsg(t *testing.T) {
433433

434434
// Try a simple send, no gas limit to for a sanity check before trying table tests
435435
func TestDispatchSubMsgConditionalReplyOn(t *testing.T) {
436-
ctx, keepers := CreateTestInput(t, false, ReflectFeatures)
436+
ctx, keepers := CreateTestInput(t, false, ReflectCapabilities)
437437
keeper := keepers.WasmKeeper
438438

439439
deposit := sdk.NewCoins(sdk.NewInt64Coin("denom", 100000))

0 commit comments

Comments
 (0)