Use reflect contract from 1.5

This commit is contained in:
Christoph Otter
2024-02-27 17:38:17 +01:00
parent 044caabe9e
commit 1ee2c49136
7 changed files with 9 additions and 9 deletions

View File

@@ -18,10 +18,10 @@ import (
"github.com/CosmWasm/wasmd/x/wasm/types" "github.com/CosmWasm/wasmd/x/wasm/types"
) )
// InstantiateStargateReflectContract stores and instantiates a pre 2.0 reflect contract instance. // InstantiateStargateReflectContract stores and instantiates the reflect contract shipped with CosmWasm 1.5.3.
// This instance still expects the old CosmosMsg.Stargate variant instead of the new CosmosMsg.Any. // 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 { func InstantiateStargateReflectContract(t *testing.T, chain *ibctesting.TestChain) sdk.AccAddress {
codeID := chain.StoreCodeFile("../../x/wasm/keeper/testdata/stargate_reflect.wasm").CodeID codeID := chain.StoreCodeFile("../../x/wasm/keeper/testdata/reflect_1_5.wasm").CodeID
contractAddr := chain.InstantiateContract(codeID, []byte(`{}`)) contractAddr := chain.InstantiateContract(codeID, []byte(`{}`))
require.NotEmpty(t, contractAddr) require.NotEmpty(t, contractAddr)
return contractAddr return contractAddr

View File

@@ -194,7 +194,7 @@ func TestOnIBCPacketReceive(t *testing.T) {
myMockContractAddr := chainA.SeedNewContractInstance() // setups env but uses mock contract myMockContractAddr := chainA.SeedNewContractInstance() // setups env but uses mock contract
// setup chain B contracts // setup chain B contracts
reflectID := chainB.StoreCodeFile("./keeper/testdata/stargate_reflect.wasm").CodeID reflectID := chainB.StoreCodeFile("./keeper/testdata/reflect_1_5.wasm").CodeID
initMsg, err := json.Marshal(wasmkeeper.IBCReflectInitMsg{ReflectCodeID: reflectID}) initMsg, err := json.Marshal(wasmkeeper.IBCReflectInitMsg{ReflectCodeID: reflectID})
require.NoError(t, err) require.NoError(t, err)
codeID := chainB.StoreCodeFile("./keeper/testdata/ibc_reflect.wasm").CodeID codeID := chainB.StoreCodeFile("./keeper/testdata/ibc_reflect.wasm").CodeID

View File

@@ -16,7 +16,7 @@ import (
func TestIBCReflectContract(t *testing.T) { func TestIBCReflectContract(t *testing.T) {
// scenario: // scenario:
// chain A: ibc_reflect_send.wasm // chain A: ibc_reflect_send.wasm
// chain B: stargate_reflect.wasm + ibc_reflect.wasm // chain B: reflect_1_5.wasm + ibc_reflect.wasm
// //
// Chain A "ibc_reflect_send" sends a IBC packet "on channel connect" event to chain B "ibc_reflect" // 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. // "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 codeID := chainA.StoreCodeFile("./keeper/testdata/ibc_reflect_send.wasm").CodeID
sendContractAddr := chainA.InstantiateContract(codeID, initMsg) sendContractAddr := chainA.InstantiateContract(codeID, initMsg)
reflectID := chainB.StoreCodeFile("./keeper/testdata/stargate_reflect.wasm").CodeID reflectID := chainB.StoreCodeFile("./keeper/testdata/reflect_1_5.wasm").CodeID
initMsg = wasmkeeper.IBCReflectInitMsg{ initMsg = wasmkeeper.IBCReflectInitMsg{
ReflectCodeID: reflectID, ReflectCodeID: reflectID,
}.GetBytes(t) }.GetBytes(t)

View File

@@ -20,7 +20,7 @@ import (
"github.com/CosmWasm/wasmd/x/wasm/types" "github.com/CosmWasm/wasmd/x/wasm/types"
) )
//go:embed testdata/stargate_reflect.wasm //go:embed testdata/reflect_1_5.wasm
var wasmContract []byte var wasmContract []byte
//go:embed testdata/hackatom.wasm //go:embed testdata/hackatom.wasm

View File

@@ -30,13 +30,13 @@ func TestSnapshotter(t *testing.T) {
wasmFiles []string wasmFiles []string
}{ }{
"single contract": { "single contract": {
wasmFiles: []string{"./testdata/stargate_reflect.wasm"}, wasmFiles: []string{"./testdata/reflect_1_5.wasm"},
}, },
"multiple contract": { "multiple contract": {
wasmFiles: []string{"./testdata/stargate_reflect.wasm", "./testdata/burner.wasm", "./testdata/stargate_reflect.wasm"}, wasmFiles: []string{"./testdata/reflect_1_5.wasm", "./testdata/burner.wasm", "./testdata/reflect_1_5.wasm"},
}, },
"duplicate contracts": { "duplicate contracts": {
wasmFiles: []string{"./testdata/stargate_reflect.wasm", "./testdata/stargate_reflect.wasm"}, wasmFiles: []string{"./testdata/reflect_1_5.wasm", "./testdata/reflect_1_5.wasm"},
}, },
} }
for name, spec := range specs { for name, spec := range specs {

BIN
x/wasm/keeper/testdata/reflect_1_5.wasm vendored Normal file

Binary file not shown.

Binary file not shown.