From 33213bba614cdb85115da43f9deddd5a636d636a Mon Sep 17 00:00:00 2001 From: Edmund Edgar Date: Sat, 2 Mar 2024 08:28:37 +0000 Subject: [PATCH] Revert "Use child1 for the "no" fork and child2 for the "yes" fork to match what we did in L1GlobalChainInfoPublisher" This reverts commit 532759beac0180315f5687431bf161e761178551. --- contracts/L1ForkArbitrator.sol | 4 ++-- test/ForkableRealityETH.t.sol | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contracts/L1ForkArbitrator.sol b/contracts/L1ForkArbitrator.sol index 37e97925..9babe8c1 100644 --- a/contracts/L1ForkArbitrator.sol +++ b/contracts/L1ForkArbitrator.sol @@ -103,7 +103,7 @@ contract L1ForkArbitrator is IArbitratorCore, IArbitratorErrors { if (child1 == address(0) || child2 == address(0)) revert NotForkedYet(); IRealityETH(child1).assignWinnerAndSubmitAnswerByArbitrator( arbitratingQuestionId, - bytes32(uint256(0)), + bytes32(uint256(1)), payer, lastHistoryHash, lastAnswer, @@ -111,7 +111,7 @@ contract L1ForkArbitrator is IArbitratorCore, IArbitratorErrors { ); IRealityETH(child2).assignWinnerAndSubmitAnswerByArbitrator( arbitratingQuestionId, - bytes32(uint256(1)), + bytes32(uint256(0)), payer, lastHistoryHash, lastAnswer, diff --git a/test/ForkableRealityETH.t.sol b/test/ForkableRealityETH.t.sol index 04238246..2834eef8 100644 --- a/test/ForkableRealityETH.t.sol +++ b/test/ForkableRealityETH.t.sol @@ -1405,13 +1405,13 @@ contract ForkableRealityETHTest is Test { ForkableRealityETH_ERC20(forkableRealityETH2a).resultFor( forkOverQuestionId ), - bytes32(uint256(0)) + bytes32(uint256(1)) ); assertEq( ForkableRealityETH_ERC20(forkableRealityETH2b).resultFor( forkOverQuestionId ), - bytes32(uint256(1)) + bytes32(uint256(0)) ); } }