feat: add runWithBesu field to MultiBlockExecutionEnvironement

Author: OlivierBBB

testing/src/main/java/net/consensys/linea/testing/MultiBlockExecutionEnvironment.java

@@ -16,9 +16,7 @@
 package net.consensys.linea.testing;
 
 import static net.consensys.linea.reporting.TracerTestBase.chainConfig;
-import static net.consensys.linea.reporting.TracerTestBase.fork;
 import static net.consensys.linea.testing.ToyExecutionEnvironmentV2.DEFAULT_BLOCK_NUMBER;
-import static net.consensys.linea.zktracer.ChainConfig.MAINNET_TESTCONFIG;
 import static net.consensys.linea.zktracer.Trace.LINEA_BLOCK_GAS_LIMIT;
 
 import java.math.BigInteger;
@@ -55,6 +53,7 @@ public class MultiBlockExecutionEnvironment {
   @Builder.Default private final long startingBlockNumber = DEFAULT_BLOCK_NUMBER;
   @Builder.Default private final boolean systemContractDeployedPriorToConflation = true;
   @Builder.Default private final Boolean runWithBesuNode = false;
+
   /**
    * A transaction validator of each transaction; by default, it asserts that the transaction was
    * successfully processed.
@@ -120,20 +119,11 @@ public MultiBlockExecutionEnvironmentBuilder addBlock(
   }
 
   public void run() {
-<<<<<<< HEAD
-      if (System.getenv().containsKey("RUN_WITH_BESU_NODE")) {
-          List<Transaction> transactionsIncludingNullTransactionsForEmptyBlocks = new ArrayList<>();
-          for (BlockSnapshot block : blocks) {
-              if (block.txs().isEmpty()) {
-                  // Add a null transaction to represent an empty block
-                  transactionsIncludingNullTransactionsForEmptyBlocks.add(null);
-              } else {
-                  for (TransactionSnapshot txSnapshot : block.txs()) {
-                      transactionsIncludingNullTransactionsForEmptyBlocks.add(txSnapshot.toTransaction());
-                  }
-              }
-=======
     if (runWithBesuNode || System.getenv().containsKey("RUN_WITH_BESU_NODE")) {
+      // When runnning with a Besu node, the list of transactions present in blocks is not followed
+      // as set originally.
+      // With the below, it collects all the transactions in all blocks, and dispatches them one per
+      // block
       List<Transaction> transactionsIncludingNullTransactionsForEmptyBlocks = new ArrayList<>();
       for (BlockSnapshot block : blocks) {
         if (block.txs().isEmpty()) {
@@ -142,34 +132,9 @@ public void run() {
         } else {
           for (TransactionSnapshot txSnapshot : block.txs()) {
             transactionsIncludingNullTransactionsForEmptyBlocks.add(txSnapshot.toTransaction());
->>>>>>> c2c824704 (feat: add runWithBesu field to MultiBlockExecutionEnvironement)
           }
-          BesuExecutionTools besuExecTools =
-                  new BesuExecutionTools(
-                          Optional.of(testInfo),
-                          MAINNET_TESTCONFIG(CANCUN), // TODO: make configurable ?
-                          ToyExecutionEnvironmentV2.DEFAULT_COINBASE_ADDRESS,
-                          accounts,
-                          transactionsIncludingNullTransactionsForEmptyBlocks,
-                          true,
-                          null);
-          besuExecTools.executeTest();
-      } else {
-          final ConflationSnapshot conflationSnapshot = buildConflationSnapshot();
-          final Map<Long, Hash> historicalBlockhashes = conflationSnapshot.historicalBlockHashes();
-          // Remove the last block number as it's not part of the historical blockhashes
-          historicalBlockhashes.remove(conflationSnapshot.lastBlockNumber());
-          tracer = new ZkTracer(chainConfig, historicalBlockhashes);
-          ReplayExecutionEnvironment.builder()
-                  .zkTracer(tracer)
-                  .useCoinbaseAddressFromBlockHeader(true)
-                  .transactionProcessingResultValidator(transactionProcessingResultValidator)
-                  .systemContractDeployedPriorToConflation(systemContractDeployedPriorToConflation)
-                  .build()
-                  .replay(testsChain, testInfo, conflationSnapshot);
+        }
       }
-<<<<<<< HEAD
-=======
       BesuExecutionTools besuExecTools =
           new BesuExecutionTools(
               Optional.of(testInfo),
@@ -180,21 +145,20 @@ >>>>>>> c2c824704 (feat: add runWithBesu field to MultiBlockExecutionEnvironemen
               true,
               null);
       besuExecTools.executeTest();
-      return;
+    } else {
+      final ConflationSnapshot conflationSnapshot = buildConflationSnapshot();
+      final Map<Long, Hash> historicalBlockhashes = conflationSnapshot.historicalBlockHashes();
+      // Remove the last block number as it's not part of the historical blockhashes
+      historicalBlockhashes.remove(conflationSnapshot.lastBlockNumber());
+      tracer = new ZkTracer(chainConfig, historicalBlockhashes);
+      ReplayExecutionEnvironment.builder()
+          .zkTracer(tracer)
+          .useCoinbaseAddressFromBlockHeader(true)
+          .transactionProcessingResultValidator(transactionProcessingResultValidator)
+          .systemContractDeployedPriorToConflation(systemContractDeployedPriorToConflation)
+          .build()
+          .replay(testsChain, testInfo, conflationSnapshot);
     }
-    final ConflationSnapshot conflationSnapshot = buildConflationSnapshot();
-    final Map<Long, Hash> historicalBlockhashes = conflationSnapshot.historicalBlockHashes();
-    // Remove the last block number as it's not part of the historical blockhashes
-    historicalBlockhashes.remove(conflationSnapshot.lastBlockNumber());
-    tracer = new ZkTracer(chainConfig, historicalBlockhashes);
-    ReplayExecutionEnvironment.builder()
-        .zkTracer(tracer)
-        .useCoinbaseAddressFromBlockHeader(true)
-        .transactionProcessingResultValidator(transactionProcessingResultValidator)
-        .systemContractDeployedPriorToConflation(systemContractDeployedPriorToConflation)
-        .build()
-        .replay(testsChain, testInfo, conflationSnapshot);
->>>>>>> 68a7a6f97 (feat: configurable fork)
   }
 
   public Hub getHub() {