Skip to content

Commit ddc4f59

Browse files
authored
fix: tidy up after replay tests PR (#2471)
This tidies two things up after the replay tests PR. Firstly, the `build.gradle` file for the reference-tests is updated to use `JUNIT_TESTS_PARALLELISM` to match the github workflow; secondly, the disable replay test in BlockhashTest is removed, since it was a duplicate. Specifically, the replay tests for BlockHash are now in `pragueReplayTests/BlockHashTests`.
1 parent 75e4632 commit ddc4f59

File tree

3 files changed

+8
-18
lines changed

3 files changed

+8
-18
lines changed

arithmetization/src/test/java/net/consensys/linea/pragueReplayTests/SepoliaTests.java renamed to arithmetization/src/test/java/net/consensys/linea/pragueReplayTests/BlockHashTests.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,19 @@
2626

2727
@Tag("replay")
2828
@ExtendWith(UnitTestWatcher.class)
29-
public class SepoliaTests extends TracerTestBase {
29+
public class BlockHashTests extends TracerTestBase {
3030

3131
@Test
32-
void block_19562398(TestInfo testInfo) {
32+
void someHistoricalHashesAreChecked(TestInfo testInfo) {
3333
replay(SEPOLIA_PRAGUE_TESTCONFIG, "prague/19562398.sepolia.prague.json.gz", testInfo);
3434
}
3535

36+
/**
37+
* The purpose of this second replay tests is to provide two consecutive conflation to the prover,
38+
* with BLOCKHASH checking the "historical hashes" in both conflations.
39+
*/
3640
@Test
37-
void block_19562399_19562417(TestInfo testInfo) {
41+
void conflationFollowingThePreviousOneWithAgainHistoricalBlockhashesChecked(TestInfo testInfo) {
3842
replay(SEPOLIA_PRAGUE_TESTCONFIG, "prague/19562399-19562417.sepolia.prague.json.gz", testInfo);
3943
}
4044
}

arithmetization/src/test/java/net/consensys/linea/zktracer/module/blockhash/BlockhashTest.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515

1616
package net.consensys.linea.zktracer.module.blockhash;
1717

18-
import static net.consensys.linea.ReplayTestTools.replay;
19-
import static net.consensys.linea.zktracer.ChainConfig.SEPOLIA_PRAGUE_TESTCONFIG;
2018
import static net.consensys.linea.zktracer.Trace.BLOCKHASH_MAX_HISTORY;
2119

2220
import java.util.List;
@@ -32,7 +30,6 @@
3230
import org.hyperledger.besu.datatypes.Hash;
3331
import org.hyperledger.besu.datatypes.Wei;
3432
import org.hyperledger.besu.ethereum.core.Transaction;
35-
import org.junit.jupiter.api.Disabled;
3633
import org.junit.jupiter.api.Tag;
3734
import org.junit.jupiter.api.Test;
3835
import org.junit.jupiter.api.TestInfo;
@@ -100,17 +97,6 @@ void singleBlockBigRangeBlockhashTest(TestInfo testInfo) {
10097
.run(chainConfig, testInfo);
10198
}
10299

103-
/**
104-
* The purpose of this second replay tests is to provide two consecutive conflation to the prover,
105-
* with BLOCKHASH checking the "historical hashes" in both conflations.
106-
*/
107-
@Tag("replay")
108-
@Disabled("Disabled, see comment")
109-
@Test
110-
void conflationFollowingThePreviousOneWithAgainHistoricalBlockhashesChecked(TestInfo testInfo) {
111-
replay(SEPOLIA_PRAGUE_TESTCONFIG, "19562399-19562417.mainnet.json.gz", testInfo);
112-
}
113-
114100
/**
115101
* This test calls the tracer through the RPC, using a besu node. It computes several block, each
116102
* block containing a BLOCKHASH opcode with different argument (in range, ridiculously not in

reference-tests/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ tasks.register('referenceExecutionSpecBlockchainTests', Test) {
7878
systemProperty("junit.jupiter.execution.parallel.mode.classes.default", "concurrent")
7979
systemProperty("junit.jupiter.execution.parallel.config.strategy", "fixed")
8080
systemProperty("junit.jupiter.execution.parallel.config.fixed.parallelism",
81-
System.getenv().getOrDefault("REFERENCE_TESTS_PARALLELISM", "1").toInteger())
81+
System.getenv().getOrDefault("JUNIT_TESTS_PARALLELISM", "1").toInteger())
8282
}
8383

8484
useJUnitPlatform {

0 commit comments

Comments
 (0)