Incorrect argument types when calling a compass-evm logic call functi…

…on (#477)
palomachain · Sep 15, 2022 · 948922c · 948922c
1 parent 13147dc
commit 948922c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/x/evm/keeper/errors.go b/x/evm/keeper/errors.go
@@ -10,4 +10,6 @@ const (
 	ErrConsensusNotAchieved                        = whoops.String("evm: consensus not achieved")
 	ErrCannotAddSupportForChainThatExists          = whoops.Errorf("chain info already exists: %s")
 	ErrCannotActiveSmartContractThatIsNotDeploying = whoops.String("trying to activate a smart contract that is not currently deploying")
+
+	ErrWasmExecuteMessageNotValid = whoops.String("message is not valid")
 )
diff --git a/x/evm/keeper/keeper.go b/x/evm/keeper/keeper.go
@@ -9,7 +9,6 @@ import (
 	"strings"
 	"time"
 
-	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -311,27 +310,27 @@ type ExecuteEVMFromCosmWasm struct {
 	Payload []byte `json:"payload"`
 }
 
-func (e ExecuteEVMFromCosmWasm) valid() bool {
+func (e ExecuteEVMFromCosmWasm) valid() error {
 	zero := ExecuteEVMFromCosmWasm{}
 	if e.TargetContractInfo == zero.TargetContractInfo {
-		return false
+		return whoops.String("target contract info is empty")
 	}
 	if len(e.Payload) == 0 {
-		return false
+		return whoops.String("payload bytes is empty")
 	}
 	// todo: add more in the future
-	return true
+	return nil
 }
 
 func (k Keeper) WasmMessengerHandler() wasmutil.MessengerFnc {
 	return func(ctx sdk.Context, contractAddr sdk.AccAddress, contractIBCPortID string, msg wasmvmtypes.CosmosMsg) ([]sdk.Event, [][]byte, error) {
 		var executeMsg ExecuteEVMFromCosmWasm
 		err := json.Unmarshal(msg.Custom, &executeMsg)
 		if err != nil {
-			return nil, nil, whoops.Wrap(err, wasmtypes.ErrUnknownMsg)
+			return nil, nil, err
 		}
-		if !executeMsg.valid() {
-			return nil, nil, wasmtypes.ErrUnknownMsg
+		if err = executeMsg.valid(); err != nil {
+			return nil, nil, whoops.Wrap(err, ErrWasmExecuteMessageNotValid)
 		}
 
 		ci, err := k.GetChainInfo(ctx, executeMsg.TargetContractInfo.ChainReferenceID)

diff --git a/x/evm/keeper/keeper_test.go b/x/evm/keeper/keeper_test.go
@@ -8,7 +8,6 @@ import (
 	"strings"
 	"testing"
 
-	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
@@ -811,7 +810,7 @@ var _ = Describe("wasm message handler", func() {
 	Context("invalid message", func() {
 		When("message is empty", func() {
 			It("returns an error", func() {
-				Expect(subject()).To(MatchError(wasmtypes.ErrUnknownMsg))
+				Expect(subject()).To(MatchError(keeper.ErrWasmExecuteMessageNotValid))
 			})
 		})
 	})