squash merge main

Signed-off-by: garyschulte <[email protected]>

.circleci/config.yml

@@ -211,7 +211,7 @@ jobs:
       - capture_test_results
 
   acceptanceTests:
-    parallelism: 2
+    parallelism: 4
     executor: xl_machine_executor # needs the machine executor since privacy test uses container tests (docker)
     steps:
       - prepare

acceptance-tests/tests/build.gradle

@@ -98,7 +98,7 @@ sourceSets {
   }
 }
 
-processTestResources.dependsOn(':acceptance-tests:test-plugins:testPluginsJar')
+processTestResources.dependsOn(':acceptance-tests:test-plugins:testPluginsJar',':acceptance-tests:test-plugins:jar')
 
 task acceptanceTest(type: Test) {
   inputs.property "integration.date", LocalTime.now() // so it runs at every invocation

besu/src/main/java/org/hyperledger/besu/services/TraceServiceImpl.java

@@ -162,7 +162,6 @@ public void trace(
           blocks.forEach(
               block -> {
                 results.addAll(trace(blockchain, block, chainUpdater, tracer));
-                tracer.traceEndBlock(block.getHeader(), block.getBody());
               });
           afterTracing.accept(chainUpdater.getNextUpdater());
           return Optional.of(results);
@@ -180,7 +179,6 @@ private Optional<List<TransactionProcessingResult>> trace(
             block.getHash(),
             traceableState ->
                 Optional.of(trace(blockchain, block, new ChainUpdater(traceableState), tracer)));
-    tracer.traceEndBlock(block.getHeader(), block.getBody());
 
     return results;
   }

besu/src/test/java/org/hyperledger/besu/PrivacyReorgTest.java

@@ -81,7 +81,7 @@
 @SuppressWarnings("rawtypes")
 public class PrivacyReorgTest {
 
-  @TempDir private static Path folder;
+  @TempDir private Path folder;
 
   private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
       Suppliers.memoize(SignatureAlgorithmFactory::getInstance);

besu/src/test/java/org/hyperledger/besu/RunnerTest.java

@@ -122,7 +122,7 @@ public void stopVertx() {
     vertx.close();
   }
 
-  @TempDir private static Path temp;
+  @TempDir private Path temp;
 
   @Test
   public void getFixedNodes() {

besu/src/test/java/org/hyperledger/besu/services/TraceServiceImplTest.java

@@ -15,31 +15,46 @@
 package org.hyperledger.besu.services;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Transaction;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
 import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.evm.log.Log;
 import org.hyperledger.besu.evm.worldstate.WorldView;
+import org.hyperledger.besu.plugin.data.BlockBody;
+import org.hyperledger.besu.plugin.data.BlockHeader;
 import org.hyperledger.besu.plugin.data.BlockTraceResult;
 import org.hyperledger.besu.plugin.data.TransactionTraceResult;
 import org.hyperledger.besu.plugin.services.TraceService;
 import org.hyperledger.besu.plugin.services.tracer.BlockAwareOperationTracer;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.LongStream;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 class TraceServiceImplTest {
 
   TraceService traceService;
@@ -73,19 +88,40 @@ void shouldRetrieveStateUpdatePostTracingForOneBlock() {
     final long persistedNonceForAccount =
         worldStateArchive.getMutable().get(addressToVerify).getNonce();
 
+    final long blockNumber = 2;
+
+    final BlockAwareOperationTracer opTracer = mock(BlockAwareOperationTracer.class);
+
     traceService.trace(
-        2,
-        2,
+        blockNumber,
+        blockNumber,
         worldState -> {
           assertThat(worldState.get(addressToVerify).getNonce()).isEqualTo(1);
         },
         worldState -> {
           assertThat(worldState.get(addressToVerify).getNonce()).isEqualTo(2);
         },
-        BlockAwareOperationTracer.NO_TRACING);
+        opTracer);
 
     assertThat(worldStateArchive.getMutable().get(addressToVerify).getNonce())
         .isEqualTo(persistedNonceForAccount);
+
+    final Block tracedBlock = blockchain.getBlockByNumber(blockNumber).get();
+
+    verify(opTracer).traceStartBlock(tracedBlock.getHeader(), tracedBlock.getBody());
+
+    tracedBlock
+        .getBody()
+        .getTransactions()
+        .forEach(
+            tx -> {
+              verify(opTracer).traceStartTransaction(any(), eq(tx));
+              verify(opTracer)
+                  .traceEndTransaction(
+                      any(), eq(tx), anyBoolean(), any(), any(), anyLong(), anyLong());
+            });
+
+    verify(opTracer).traceEndBlock(tracedBlock.getHeader(), tracedBlock.getBody());
   }
 
   @Test
@@ -96,20 +132,44 @@ void shouldRetrieveStateUpdatePostTracingForAllBlocks() {
     final long persistedNonceForAccount =
         worldStateArchive.getMutable().get(addressToVerify).getNonce();
 
+    final long startBlock = 1;
+    final long endBlock = 32;
+    final BlockAwareOperationTracer opTracer = mock(BlockAwareOperationTracer.class);
+
     traceService.trace(
-        0,
-        32,
+        startBlock,
+        endBlock,
         worldState -> {
           assertThat(worldState.get(addressToVerify).getNonce()).isEqualTo(0);
         },
         worldState -> {
           assertThat(worldState.get(addressToVerify).getNonce())
               .isEqualTo(persistedNonceForAccount);
         },
-        BlockAwareOperationTracer.NO_TRACING);
+        opTracer);
 
     assertThat(worldStateArchive.getMutable().get(addressToVerify).getNonce())
         .isEqualTo(persistedNonceForAccount);
+
+    LongStream.rangeClosed(startBlock, endBlock)
+        .mapToObj(blockchain::getBlockByNumber)
+        .map(Optional::get)
+        .forEach(
+            tracedBlock -> {
+              verify(opTracer).traceStartBlock(tracedBlock.getHeader(), tracedBlock.getBody());
+              tracedBlock
+                  .getBody()
+                  .getTransactions()
+                  .forEach(
+                      tx -> {
+                        verify(opTracer).traceStartTransaction(any(), eq(tx));
+                        verify(opTracer)
+                            .traceEndTransaction(
+                                any(), eq(tx), anyBoolean(), any(), any(), anyLong(), anyLong());
+                      });
+
+              verify(opTracer).traceEndBlock(tracedBlock.getHeader(), tracedBlock.getBody());
+            });
   }
 
   @Test
@@ -197,8 +257,16 @@ private static class TxStartEndTracer implements BlockAwareOperationTracer {
     public long txEndGasUsed;
     public Long txEndTimeNs;
 
+    private final Set<Transaction> traceStartTxCalled = new HashSet<>();
+    private final Set<Transaction> traceEndTxCalled = new HashSet<>();
+    private final Set<Hash> traceStartBlockCalled = new HashSet<>();
+    private final Set<Hash> traceEndBlockCalled = new HashSet<>();
+
     @Override
     public void traceStartTransaction(final WorldView worldView, final Transaction transaction) {
+      if (!traceStartTxCalled.add(transaction)) {
+        fail("traceStartTransaction already called for tx " + transaction);
+      }
       txStartWorldView = worldView;
       txStartTransaction = transaction;
     }
@@ -212,6 +280,9 @@ public void traceEndTransaction(
         final List<Log> logs,
         final long gasUsed,
         final long timeNs) {
+      if (!traceEndTxCalled.add(transaction)) {
+        fail("traceEndTransaction already called for tx " + transaction);
+      }
       txEndWorldView = worldView;
       txEndTransaction = transaction;
       txEndStatus = status;
@@ -220,5 +291,19 @@ public void traceEndTransaction(
       txEndGasUsed = gasUsed;
       txEndTimeNs = timeNs;
     }
+
+    @Override
+    public void traceStartBlock(final BlockHeader blockHeader, final BlockBody blockBody) {
+      if (!traceStartBlockCalled.add(blockHeader.getBlockHash())) {
+        fail("traceStartBlock already called for block " + blockHeader);
+      }
+    }
+
+    @Override
+    public void traceEndBlock(final BlockHeader blockHeader, final BlockBody blockBody) {
+      if (!traceEndBlockCalled.add(blockHeader.getBlockHash())) {
+        fail("traceEndBlock already called for block " + blockHeader);
+      }
+    }
   }
 }

consensus/common/build.gradle

@@ -53,11 +53,11 @@ dependencies {
   testImplementation project( path: ':crypto:services', configuration: 'testSupportArtifacts')
   testImplementation project(':metrics:core')
 
-  testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.awaitility:awaitility'
   testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
 
   testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 

consensus/common/src/test/java/org/hyperledger/besu/consensus/common/CombinedProtocolScheduleFactoryTest.java

@@ -35,11 +35,11 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class CombinedProtocolScheduleFactoryTest {
 
   private final CombinedProtocolScheduleFactory combinedProtocolScheduleFactory =

consensus/common/src/test/java/org/hyperledger/besu/consensus/common/ForksScheduleTest.java

@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ForksScheduleTest {
 

consensus/common/src/test/java/org/hyperledger/besu/consensus/common/MigratingMiningCoordinatorTest.java

@@ -16,6 +16,7 @@
 
 import static java.util.Collections.emptyList;
 import static org.hyperledger.besu.ethereum.core.BlockHeader.GENESIS_BLOCK_NUMBER;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
@@ -40,13 +41,13 @@
 import java.util.function.Consumer;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class MigratingMiningCoordinatorTest {
 
   @Mock private BftMiningCoordinator coordinator1;
@@ -58,7 +59,7 @@ public class MigratingMiningCoordinatorTest {
   private ForksSchedule<MiningCoordinator> coordinatorSchedule;
   private static final long MIGRATION_BLOCK_NUMBER = 5L;
 
-  @Before
+  @BeforeEach
   public void setup() {
     coordinatorSchedule = createCoordinatorSchedule(coordinator1, coordinator2);
     final Block block = new Block(blockHeader, blockBody);
@@ -87,13 +88,12 @@ public void startShouldRegisterThisCoordinatorAsObserver() {
   @Test
   public void startShouldUnregisterDelegateCoordinatorAsObserver() {
     final BftMiningCoordinator delegateCoordinator = createDelegateCoordinator();
-    when(blockchain.observeBlockAdded(delegateCoordinator)).thenReturn(1L);
+    lenient().when(blockchain.observeBlockAdded(delegateCoordinator)).thenReturn(1L);
     final MigratingMiningCoordinator coordinator =
         new MigratingMiningCoordinator(
             createCoordinatorSchedule(delegateCoordinator, coordinator2), blockchain);
 
     coordinator.start();
-
     verify(blockchain).observeBlockAdded(coordinator);
     verify(blockchain).observeBlockAdded(delegateCoordinator);
     verify(blockchain).removeObserver(1L);

consensus/common/src/test/java/org/hyperledger/besu/consensus/common/MigratingProtocolContextTest.java

@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 public class MigratingProtocolContextTest {

consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BaseBftProtocolScheduleBuilderTest.java

@@ -42,7 +42,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BaseBftProtocolScheduleBuilderTest {
 

consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BaseForksSchedulesFactoryTest.java

@@ -30,7 +30,7 @@
 import java.util.function.Consumer;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public abstract class BaseForksSchedulesFactoryTest<
     C extends BftConfigOptions, M extends MutableBftConfigOptions> {

consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BftEventQueueTest.java

@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BftEventQueueTest {
   private static final int MAX_QUEUE_SIZE = 1000;

consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BftForksScheduleFactoryTest.java

@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 public class BftForksScheduleFactoryTest {

consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BftHelpersTest.java

@@ -15,7 +15,7 @@
 package org.hyperledger.besu.consensus.common.bft;
 
 import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BftHelpersTest {