From 5dc97d5c0d9fdd07371d1726a0449686fb92148c Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Mon, 26 Feb 2024 11:35:51 +0100 Subject: [PATCH] Rename reflect.wasm to stargate_reflect.wasm --- tests/e2e/reflect_helper.go | 2 +- x/wasm/ibc_integration_test.go | 2 +- x/wasm/ibc_reflect_test.go | 4 ++-- x/wasm/keeper/msg_server_integration_test.go | 2 +- x/wasm/keeper/snapshotter_integration_test.go | 6 +++--- x/wasm/keeper/test_common.go | 2 +- .../{reflect.wasm => stargate_reflect.wasm} | Bin 7 files changed, 9 insertions(+), 9 deletions(-) rename x/wasm/keeper/testdata/{reflect.wasm => stargate_reflect.wasm} (100%) diff --git a/tests/e2e/reflect_helper.go b/tests/e2e/reflect_helper.go index f73aa111..095413e2 100644 --- a/tests/e2e/reflect_helper.go +++ b/tests/e2e/reflect_helper.go @@ -21,7 +21,7 @@ import ( // InstantiateStargateReflectContract stores and instantiates a pre 2.0 reflect contract instance. // This instance still expects the old CosmosMsg.Stargate variant instead of the new CosmosMsg.Any. func InstantiateStargateReflectContract(t *testing.T, chain *ibctesting.TestChain) sdk.AccAddress { - codeID := chain.StoreCodeFile("../../x/wasm/keeper/testdata/reflect.wasm").CodeID + codeID := chain.StoreCodeFile("../../x/wasm/keeper/testdata/stargate_reflect.wasm").CodeID contractAddr := chain.InstantiateContract(codeID, []byte(`{}`)) require.NotEmpty(t, contractAddr) return contractAddr diff --git a/x/wasm/ibc_integration_test.go b/x/wasm/ibc_integration_test.go index 8bcd2c31..ea0a5f17 100644 --- a/x/wasm/ibc_integration_test.go +++ b/x/wasm/ibc_integration_test.go @@ -194,7 +194,7 @@ func TestOnIBCPacketReceive(t *testing.T) { myMockContractAddr := chainA.SeedNewContractInstance() // setups env but uses mock contract // setup chain B contracts - reflectID := chainB.StoreCodeFile("./keeper/testdata/reflect.wasm").CodeID + reflectID := chainB.StoreCodeFile("./keeper/testdata/stargate_reflect.wasm").CodeID initMsg, err := json.Marshal(wasmkeeper.IBCReflectInitMsg{ReflectCodeID: reflectID}) require.NoError(t, err) codeID := chainB.StoreCodeFile("./keeper/testdata/ibc_reflect.wasm").CodeID diff --git a/x/wasm/ibc_reflect_test.go b/x/wasm/ibc_reflect_test.go index 2d847f8f..4d4670e4 100644 --- a/x/wasm/ibc_reflect_test.go +++ b/x/wasm/ibc_reflect_test.go @@ -16,7 +16,7 @@ import ( func TestIBCReflectContract(t *testing.T) { // scenario: // chain A: ibc_reflect_send.wasm - // chain B: reflect.wasm + ibc_reflect.wasm + // chain B: stargate_reflect.wasm + ibc_reflect.wasm // // Chain A "ibc_reflect_send" sends a IBC packet "on channel connect" event to chain B "ibc_reflect" // "ibc_reflect" sends a submessage to "reflect" which is returned as submessage. @@ -32,7 +32,7 @@ func TestIBCReflectContract(t *testing.T) { codeID := chainA.StoreCodeFile("./keeper/testdata/ibc_reflect_send.wasm").CodeID sendContractAddr := chainA.InstantiateContract(codeID, initMsg) - reflectID := chainB.StoreCodeFile("./keeper/testdata/reflect.wasm").CodeID + reflectID := chainB.StoreCodeFile("./keeper/testdata/stargate_reflect.wasm").CodeID initMsg = wasmkeeper.IBCReflectInitMsg{ ReflectCodeID: reflectID, }.GetBytes(t) diff --git a/x/wasm/keeper/msg_server_integration_test.go b/x/wasm/keeper/msg_server_integration_test.go index 06881bea..614e0d39 100644 --- a/x/wasm/keeper/msg_server_integration_test.go +++ b/x/wasm/keeper/msg_server_integration_test.go @@ -20,7 +20,7 @@ import ( "github.com/CosmWasm/wasmd/x/wasm/types" ) -//go:embed testdata/reflect.wasm +//go:embed testdata/stargate_reflect.wasm var wasmContract []byte //go:embed testdata/hackatom.wasm diff --git a/x/wasm/keeper/snapshotter_integration_test.go b/x/wasm/keeper/snapshotter_integration_test.go index eb216285..aff85919 100644 --- a/x/wasm/keeper/snapshotter_integration_test.go +++ b/x/wasm/keeper/snapshotter_integration_test.go @@ -30,13 +30,13 @@ func TestSnapshotter(t *testing.T) { wasmFiles []string }{ "single contract": { - wasmFiles: []string{"./testdata/reflect.wasm"}, + wasmFiles: []string{"./testdata/stargate_reflect.wasm"}, }, "multiple contract": { - wasmFiles: []string{"./testdata/reflect.wasm", "./testdata/burner.wasm", "./testdata/reflect.wasm"}, + wasmFiles: []string{"./testdata/stargate_reflect.wasm", "./testdata/burner.wasm", "./testdata/stargate_reflect.wasm"}, }, "duplicate contracts": { - wasmFiles: []string{"./testdata/reflect.wasm", "./testdata/reflect.wasm"}, + wasmFiles: []string{"./testdata/stargate_reflect.wasm", "./testdata/stargate_reflect.wasm"}, }, } for name, spec := range specs { diff --git a/x/wasm/keeper/test_common.go b/x/wasm/keeper/test_common.go index 15a6aa89..dbf52df0 100644 --- a/x/wasm/keeper/test_common.go +++ b/x/wasm/keeper/test_common.go @@ -679,7 +679,7 @@ type ExampleInstance struct { Deposit sdk.Coins } -// InstantiateReflectExampleContract load and instantiate the "./testdata/reflect.wasm" contract +// InstantiateReflectExampleContract load and instantiate the "./testdata/reflect_2_0.wasm" contract func InstantiateReflectExampleContract(t testing.TB, ctx sdk.Context, keepers TestKeepers) ExampleInstance { example := StoreReflectContract(t, ctx, keepers) initialAmount := sdk.NewCoins(sdk.NewInt64Coin("denom", 100)) diff --git a/x/wasm/keeper/testdata/reflect.wasm b/x/wasm/keeper/testdata/stargate_reflect.wasm similarity index 100% rename from x/wasm/keeper/testdata/reflect.wasm rename to x/wasm/keeper/testdata/stargate_reflect.wasm