e2e test fix

zeta-chain · Jun 6, 2024 · b497cbc · b497cbc
1 parent 8333985
commit b497cbc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/x/crosschain/keeper/cctx_gateway_zevm.go b/x/crosschain/keeper/cctx_gateway_zevm.go
@@ -20,7 +20,7 @@ func NewCCTXGatewayZEVM(crosschainKeeper Keeper) CCTXGatewayZEVM {
 
 // InitiateOutbound handles evm deposit and immediately validates pending outbound
 func (c CCTXGatewayZEVM) InitiateOutbound(ctx sdk.Context, cctx *types.CrossChainTx) (newCCTXStatus types.CctxStatus) {
-	tmpCtx, _ := ctx.CacheContext()
+	tmpCtx, commit := ctx.CacheContext()
 	isContractReverted, err := c.crosschainKeeper.HandleEVMDeposit(tmpCtx, cctx)
 
 	if err != nil && !isContractReverted {
@@ -30,5 +30,10 @@ func (c CCTXGatewayZEVM) InitiateOutbound(ctx sdk.Context, cctx *types.CrossChai
 	}
 
 	cctx.SetPendingOutbound("")
-	return c.crosschainKeeper.ValidateOutboundZEVM(ctx, cctx, err, isContractReverted)
+	newCCTXStatus = c.crosschainKeeper.ValidateOutboundZEVM(ctx, cctx, err, isContractReverted)
+	if newCCTXStatus == types.CctxStatus_OutboundMined {
+		commit()
+	}
+
+	return newCCTXStatus
 }
diff --git a/x/crosschain/keeper/cctx_orchestrator.go b/x/crosschain/keeper/cctx_orchestrator.go
@@ -41,7 +41,6 @@ func (k Keeper) ValidateOutboundZEVM(
 	depositErr error,
 	isContractReverted bool,
 ) (newCCTXStatus types.CctxStatus) {
-	tmpCtx, commit := ctx.CacheContext()
 	if depositErr != nil && isContractReverted {
 		tmpCtxRevert, commitRevert := ctx.CacheContext()
 		// contract call reverted; should refund via a revert tx
@@ -60,8 +59,7 @@ func (k Keeper) ValidateOutboundZEVM(
 		commitRevert()
 		return types.CctxStatus_PendingRevert
 	}
-	k.validateSuccessfulOutbound(tmpCtx, cctx, "", false)
-	commit()
+	k.validateSuccessfulOutbound(ctx, cctx, "", false)
 	return types.CctxStatus_OutboundMined
 }