feat: set via_ir to true

cartesi · Dec 12, 2024 · 6c58d83 · 6c58d83
1 parent dd918b6
commit 6c58d83
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/prt/contracts/foundry.toml b/prt/contracts/foundry.toml
@@ -2,6 +2,7 @@
 src = "src"
 out = "out"
 libs = ["lib"]
+via_ir = true
 
 allow_paths = ['../../machine/step/']
 remappings = [

diff --git a/prt/contracts/test/Clock.t.sol b/prt/contracts/test/Clock.t.sol
@@ -62,10 +62,10 @@ contract ClockTest is Test {
         clock1.advanceClock();
         assertTrue(clock1.hasTimeLeft(), "clock1 should have time left");
 
-        vm.warp(block.timestamp + clock1Allowance - 1);
+        vm.warp(vm.getBlockTimestamp() + clock1Allowance - 1);
         assertTrue(clock1.hasTimeLeft(), "clock1 should have time left");
 
-        vm.warp(block.timestamp + clock1Allowance);
+        vm.warp(vm.getBlockTimestamp() + clock1Allowance);
         assertTrue(!clock1.hasTimeLeft(), "clock1 should run out of time");
 
         vm.expectRevert("can't advance clock with no time left");

diff --git a/prt/contracts/test/MultiTournament.t.sol b/prt/contracts/test/MultiTournament.t.sol
@@ -55,7 +55,7 @@ contract MultiTournamentTest is Util, Test {
         );
 
         // player 0 should win after fast forward time to tournament finishes
-        uint256 _t = block.timestamp;
+        uint256 _t = vm.getBlockTimestamp();
         uint256 _tournamentFinish =
             _t + Time.Duration.unwrap(ArbitrationConstants.MAX_ALLOWANCE);
 
@@ -298,7 +298,7 @@ contract MultiTournamentTest is Util, Test {
         assertFalse(_finished, "winner should be zero node");
 
         // player 0 should win after fast forward time to inner tournament finishes
-        uint256 _t = block.timestamp;
+        uint256 _t = vm.getBlockTimestamp();
         // the delay is increased when a match is created
         uint256 _rootTournamentFinish = _t
             + Time.Duration.unwrap(ArbitrationConstants.MAX_ALLOWANCE)
@@ -370,7 +370,7 @@ contract MultiTournamentTest is Util, Test {
         (_finished, _winner,) = middleTournament.innerTournamentWinner();
         assertTrue(_winner.isZero(), "winner should be zero node");
 
-        _t = block.timestamp;
+        _t = vm.getBlockTimestamp();
         // the delay is increased when a match is created
         _rootTournamentFinish =
             _t + Time.Duration.unwrap(ArbitrationConstants.MAX_ALLOWANCE);
@@ -450,7 +450,7 @@ contract MultiTournamentTest is Util, Test {
             topTournament.getMatch(_matchId.hashFromId());
         assertTrue(_match.exists(), "match should exist");
 
-        uint256 _t = block.timestamp;
+        uint256 _t = vm.getBlockTimestamp();
         // the delay is increased when a match is created
         uint256 _rootTournamentFinish =
             _t + 2 * Time.Duration.unwrap(ArbitrationConstants.MAX_ALLOWANCE);

diff --git a/prt/contracts/test/Tournament.t.sol b/prt/contracts/test/Tournament.t.sol
@@ -61,7 +61,7 @@ contract TournamentTest is Util, Test {
     function testTimeout() public {
         topTournament = Util.initializePlayer0Tournament(factory);
 
-        uint256 _t = block.timestamp;
+        uint256 _t = vm.getBlockTimestamp();
         // the delay is increased when a match is created
         uint256 _tournamentFinishWithMatch = _t
             + Time.Duration.unwrap(ArbitrationConstants.MAX_ALLOWANCE)
@@ -114,7 +114,7 @@ contract TournamentTest is Util, Test {
         );
 
         topTournament = Util.initializePlayer0Tournament(factory);
-        _t = block.timestamp;
+        _t = vm.getBlockTimestamp();
 
         // the delay is increased when a match is created
         _tournamentFinishWithMatch = _t