feat: add runWithBesu field to MultiBlockExecutionEnvironement

Author: OlivierBBB

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

@@ -120,8 +120,7 @@ public MultiBlockExecutionEnvironmentBuilder addBlock(
   }
 
   public void run() {
-<<<<<<< HEAD
-      if (System.getenv().containsKey("RUN_WITH_BESU_NODE")) {
+      if (runWithBesuNode || System.getenv().containsKey("RUN_WITH_BESU_NODE")) {
           List<Transaction> transactionsIncludingNullTransactionsForEmptyBlocks = new ArrayList<>();
           for (BlockSnapshot block : blocks) {
               if (block.txs().isEmpty()) {
@@ -132,17 +131,6 @@ public void run() {
                       transactionsIncludingNullTransactionsForEmptyBlocks.add(txSnapshot.toTransaction());
                   }
               }
-=======
-    if (runWithBesuNode || 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());
->>>>>>> c2c824704 (feat: add runWithBesu field to MultiBlockExecutionEnvironement)
           }
           BesuExecutionTools besuExecTools =
                   new BesuExecutionTools(
@@ -168,33 +156,6 @@ >>>>>>> c2c824704 (feat: add runWithBesu field to MultiBlockExecutionEnvironemen
                   .build()
                   .replay(testsChain, testInfo, conflationSnapshot);
       }
-<<<<<<< HEAD
-=======
-      BesuExecutionTools besuExecTools =
-          new BesuExecutionTools(
-              Optional.of(testInfo),
-              chainConfig,
-              ToyExecutionEnvironmentV2.DEFAULT_COINBASE_ADDRESS,
-              accounts,
-              transactionsIncludingNullTransactionsForEmptyBlocks,
-              true,
-              null);
-      besuExecTools.executeTest();
-      return;
-    }
-    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() {