Upgrade Mockito (#6397)

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

CHANGELOG.md

@@ -15,6 +15,7 @@
 - Upgrade dependencies [#6377](https://github.com/hyperledger/besu/pull/6377)
 - Upgrade `com.fasterxml.jackson` dependencies [#6378](https://github.com/hyperledger/besu/pull/6378) 
 - Upgrade Guava dependency [#6396](https://github.com/hyperledger/besu/pull/6396)
+- Upgrade Mockito [#6397](https://github.com/hyperledger/besu/pull/6397)
 
 ### Bug fixes
 - INTERNAL_ERROR from `eth_estimateGas` JSON/RPC calls [#6344](https://github.com/hyperledger/besu/issues/6344)

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/HandlerFactory.java

@@ -22,6 +22,7 @@ import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import io.opentelemetry.api.trace.Tracer;
@@ -35,7 +36,8 @@ public class HandlerFactory {
     assert methods != null && globalOptions != null;
     return TimeoutHandler.handler(
         Optional.of(globalOptions),
-        methods.keySet().stream().collect(Collectors.toMap(String::new, ignored -> globalOptions)));
+        methods.keySet().stream()
+            .collect(Collectors.toMap(Function.identity(), ignored -> globalOptions)));
   }
 
   public static Handler<RoutingContext> authentication(

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlock.java

@@ -46,15 +46,15 @@ public class DebugTraceBlock implements JsonRpcMethod {
   private static final Logger LOG = LoggerFactory.getLogger(DebugTraceBlock.class);
   private final Supplier<BlockTracer> blockTracerSupplier;
   private final BlockHeaderFunctions blockHeaderFunctions;
-  private final BlockchainQueries blockchain;
+  private final BlockchainQueries blockchainQueries;
 
   public DebugTraceBlock(
       final Supplier<BlockTracer> blockTracerSupplier,
       final BlockHeaderFunctions blockHeaderFunctions,
-      final BlockchainQueries blockchain) {
+      final BlockchainQueries blockchainQueries) {
     this.blockTracerSupplier = blockTracerSupplier;
     this.blockHeaderFunctions = blockHeaderFunctions;
-    this.blockchain = blockchain;
+    this.blockchainQueries = blockchainQueries;
   }
 
   @Override
@@ -79,18 +79,17 @@ public class DebugTraceBlock implements JsonRpcMethod {
             .map(TransactionTraceParams::traceOptions)
             .orElse(TraceOptions.DEFAULT);
 
-    if (this.blockchain.blockByHash(block.getHeader().getParentHash()).isPresent()) {
+    if (this.blockchainQueries.blockByHash(block.getHeader().getParentHash()).isPresent()) {
       final Collection<DebugTraceTransactionResult> results =
           Tracer.processTracing(
-                  blockchain,
+                  blockchainQueries,
                   Optional.of(block.getHeader()),
-                  mutableWorldState -> {
-                    return blockTracerSupplier
+                  mutableWorldState ->
+                      blockTracerSupplier
                           .get()
                           .trace(mutableWorldState, block, new DebugOperationTracer(traceOptions))
                           .map(BlockTrace::getTransactionTraces)
-                        .map(DebugTraceTransactionResult::of);
-                  })
+                          .map(DebugTraceTransactionResult::of))
               .orElse(null);
       return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), results);
     } else {

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostAllowlistTest.java

@@ -17,7 +17,6 @@ package org.hyperledger.besu.ethereum.api.jsonrpc;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.DEFAULT_RPC_APIS;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
 import org.hyperledger.besu.ethereum.ProtocolContext;
@@ -98,7 +97,6 @@ public class JsonRpcHttpServiceHostAllowlistTest {
     supportedCapabilities.add(EthProtocol.ETH63);
 
     rpcMethods =
-        spy(
         new JsonRpcMethodsFactory()
             .methods(
                 CLIENT_VERSION,
@@ -129,7 +127,7 @@ public class JsonRpcHttpServiceHostAllowlistTest {
                 mock(EthPeers.class),
                 vertx,
                 mock(ApiConfiguration.class),
-                    Optional.empty()));
+                Optional.empty());
     service = createJsonRpcHttpService();
     service.start().join();
 

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java

@@ -19,7 +19,6 @@ import static java.util.concurrent.TimeUnit.MINUTES;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.util.Lists.list;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
 import org.hyperledger.besu.ethereum.ProtocolContext;
@@ -129,7 +128,6 @@ public class JsonRpcHttpServiceLoginTest {
         new StubGenesisConfigOptions().constantinopleBlock(0).chainId(CHAIN_ID);
 
     rpcMethods =
-        spy(
         new JsonRpcMethodsFactory()
             .methods(
                 CLIENT_VERSION,
@@ -159,7 +157,7 @@ public class JsonRpcHttpServiceLoginTest {
                 mock(EthPeers.class),
                 vertx,
                 mock(ApiConfiguration.class),
-                    Optional.empty()));
+                Optional.empty());
     service = createJsonRpcHttpService();
     jwtAuth = service.authenticationService.get().getJwtAuthProvider();
     service.start().join();

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java

@@ -17,7 +17,6 @@ package org.hyperledger.besu.ethereum.api.jsonrpc;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
@@ -201,7 +200,6 @@ public class JsonRpcHttpServiceRpcApisTest {
     supportedCapabilities.add(EthProtocol.ETH63);
 
     final Map<String, JsonRpcMethod> rpcMethods =
-        spy(
         new JsonRpcMethodsFactory()
             .methods(
                 CLIENT_VERSION,
@@ -231,7 +229,7 @@ public class JsonRpcHttpServiceRpcApisTest {
                 mock(EthPeers.class),
                 vertx,
                 mock(ApiConfiguration.class),
-                    Optional.empty()));
+                Optional.empty());
     final JsonRpcHttpService jsonRpcHttpService =
         new JsonRpcHttpService(
             vertx,
@@ -302,8 +300,7 @@ public class JsonRpcHttpServiceRpcApisTest {
       final WebSocketConfiguration webSocketConfiguration,
       final P2PNetwork p2pNetwork,
       final MetricsConfiguration metricsConfiguration,
-      final NatService natService)
-      throws Exception {
+      final NatService natService) {
     final Set<Capability> supportedCapabilities = new HashSet<>();
     supportedCapabilities.add(EthProtocol.ETH62);
     supportedCapabilities.add(EthProtocol.ETH63);
@@ -311,7 +308,6 @@ public class JsonRpcHttpServiceRpcApisTest {
     webSocketConfiguration.setPort(0);
 
     final Map<String, JsonRpcMethod> rpcMethods =
-        spy(
         new JsonRpcMethodsFactory()
             .methods(
                 CLIENT_VERSION,
@@ -341,7 +337,7 @@ public class JsonRpcHttpServiceRpcApisTest {
                 mock(EthPeers.class),
                 vertx,
                 mock(ApiConfiguration.class),
-                    Optional.empty()));
+                Optional.empty());
     final JsonRpcHttpService jsonRpcHttpService =
         new JsonRpcHttpService(
             vertx,
@@ -425,8 +421,7 @@ public class JsonRpcHttpServiceRpcApisTest {
         "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_services\"}", JSON);
   }
 
-  public JsonRpcHttpService getJsonRpcHttpService(final boolean[] enabledNetServices)
-      throws Exception {
+  public JsonRpcHttpService getJsonRpcHttpService(final boolean[] enabledNetServices) {
 
     JsonRpcConfiguration jsonRpcConfiguration = JsonRpcConfiguration.createDefault();
     WebSocketConfiguration webSocketConfiguration = WebSocketConfiguration.createDefault();

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java

@@ -17,10 +17,7 @@ package org.hyperledger.besu.ethereum.api.jsonrpc;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.datatypes.Address;
@@ -1389,8 +1386,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
                 + "\"}",
             JSON);
 
-    when(rpcMethods.get(any(String.class))).thenReturn(null);
-    when(rpcMethods.containsKey(any(String.class))).thenReturn(false);
+    try (var unused = disableRpcMethod(methodName)) {
 
       try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
         assertThat(resp.code()).isEqualTo(200);
@@ -1399,23 +1395,21 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
         testHelper.assertValidJsonRpcError(
             json, id, expectedError.getCode(), expectedError.getMessage());
       }
-
-    verify(rpcMethods).containsKey(methodName);
-    verify(rpcMethods).get(methodName);
-
-    reset(rpcMethods);
+    }
   }
 
   @Test
   public void exceptionallyHandleJsonSingleRequest() throws Exception {
+    final String methodName = "foo";
     final JsonRpcMethod jsonRpcMethod = mock(JsonRpcMethod.class);
-    when(jsonRpcMethod.getName()).thenReturn("foo");
+    when(jsonRpcMethod.getName()).thenReturn(methodName);
     when(jsonRpcMethod.response(any())).thenThrow(new RuntimeException("test exception"));
 
-    doReturn(jsonRpcMethod).when(rpcMethods).get("foo");
+    try (var unused = addRpcMethod(methodName, jsonRpcMethod)) {
 
       final RequestBody body =
-        RequestBody.create("{\"jsonrpc\":\"2.0\",\"id\":\"666\",\"method\":\"foo\"}", JSON);
+          RequestBody.create(
+              "{\"jsonrpc\":\"2.0\",\"id\":\"666\",\"method\":\"" + methodName + "\"}", JSON);
 
       try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
         assertThat(resp.code()).isEqualTo(200);
@@ -1425,18 +1419,23 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
             json, "666", expectedError.getCode(), expectedError.getMessage());
       }
     }
+  }
 
   @Test
   public void exceptionallyHandleJsonBatchRequest() throws Exception {
+    final String methodName = "foo";
     final JsonRpcMethod jsonRpcMethod = mock(JsonRpcMethod.class);
-    when(jsonRpcMethod.getName()).thenReturn("foo");
+    when(jsonRpcMethod.getName()).thenReturn(methodName);
     when(jsonRpcMethod.response(any())).thenThrow(new RuntimeException("test exception"));
-    doReturn(jsonRpcMethod).when(rpcMethods).get("foo");
+
+    try (var unused = addRpcMethod(methodName, jsonRpcMethod)) {
 
       final RequestBody body =
           RequestBody.create(
               "[{\"jsonrpc\":\"2.0\",\"id\":\"000\",\"method\":\"web3_clientVersion\"},"
-                + "{\"jsonrpc\":\"2.0\",\"id\":\"111\",\"method\":\"foo\"},"
+                  + "{\"jsonrpc\":\"2.0\",\"id\":\"111\",\"method\":\""
+                  + methodName
+                  + "\"},"
                   + "{\"jsonrpc\":\"2.0\",\"id\":\"222\",\"method\":\"net_version\"}]",
               JSON);
 
@@ -1450,6 +1449,7 @@ public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
         testHelper.assertValidJsonRpcResult(array.getJsonObject(2), "222");
       }
     }
+  }
 
   @Test
   public void batchRequest() throws Exception {

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTestBase.java

@@ -16,7 +16,6 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc;
 
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
 import org.hyperledger.besu.ethereum.ProtocolContext;
@@ -72,8 +71,9 @@ public class JsonRpcHttpServiceTestBase {
   protected final JsonRpcTestHelper testHelper = new JsonRpcTestHelper();
 
   private static final Vertx vertx = Vertx.vertx();
-
   protected static Map<String, JsonRpcMethod> rpcMethods;
+  private static Map<String, JsonRpcMethod> disabledRpcMethods;
+  private static Set<String> addedRpcMethods;
   protected static JsonRpcHttpService service;
   protected static OkHttpClient client;
   protected static String baseUrl;
@@ -106,7 +106,6 @@ public class JsonRpcHttpServiceTestBase {
     supportedCapabilities.add(EthProtocol.ETH63);
 
     rpcMethods =
-        spy(
         new JsonRpcMethodsFactory()
             .methods(
                 CLIENT_VERSION,
@@ -138,7 +137,10 @@ public class JsonRpcHttpServiceTestBase {
                 ethPeersMock,
                 vertx,
                 mock(ApiConfiguration.class),
-                    Optional.empty()));
+                Optional.empty());
+    disabledRpcMethods = new HashMap<>();
+    addedRpcMethods = new HashSet<>();
+
     service = createJsonRpcHttpService(createLimitedJsonRpcConfig());
     service.start().join();
 
@@ -189,6 +191,22 @@ public class JsonRpcHttpServiceTestBase {
     return new Request.Builder().get().url(baseUrl + path).build();
   }
 
+  protected AutoCloseable disableRpcMethod(final String methodName) {
+    disabledRpcMethods.put(methodName, rpcMethods.remove(methodName));
+    return () -> resetRpcMethods();
+  }
+
+  protected AutoCloseable addRpcMethod(final String methodName, final JsonRpcMethod method) {
+    rpcMethods.put(methodName, method);
+    addedRpcMethods.add(methodName);
+    return () -> resetRpcMethods();
+  }
+
+  protected void resetRpcMethods() {
+    disabledRpcMethods.forEach(rpcMethods::put);
+    addedRpcMethods.forEach(rpcMethods::remove);
+  }
+
   /** Tears down the HTTP server. */
   @AfterAll
   public static void shutdownServer() {

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsClientAuthTest.java

@@ -21,7 +21,6 @@ import static org.hyperledger.besu.ethereum.api.tls.KnownClientFileUtil.writeToK
 import static org.hyperledger.besu.ethereum.api.tls.TlsClientAuthConfiguration.Builder.aTlsClientAuthConfiguration;
 import static org.hyperledger.besu.ethereum.api.tls.TlsConfiguration.Builder.aTlsConfiguration;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
 import org.hyperledger.besu.ethereum.ProtocolContext;
@@ -112,7 +111,6 @@ public class JsonRpcHttpServiceTlsClientAuthTest {
     supportedCapabilities.add(EthProtocol.ETH63);
 
     rpcMethods =
-        spy(
         new JsonRpcMethodsFactory()
             .methods(
                 CLIENT_VERSION,
@@ -143,7 +141,7 @@ public class JsonRpcHttpServiceTlsClientAuthTest {
                 mock(EthPeers.class),
                 vertx,
                 mock(ApiConfiguration.class),
-                    Optional.empty()));
+                Optional.empty());
 
     System.setProperty("javax.net.ssl.trustStore", CLIENT_AS_CA_CERT.getKeyStoreFile().toString());
     System.setProperty(

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsMisconfigurationTest.java

@@ -20,7 +20,6 @@ import static org.hyperledger.besu.ethereum.api.tls.KnownClientFileUtil.writeToK
 import static org.hyperledger.besu.ethereum.api.tls.TlsClientAuthConfiguration.Builder.aTlsClientAuthConfiguration;
 import static org.hyperledger.besu.ethereum.api.tls.TlsConfiguration.Builder.aTlsConfiguration;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
 import org.hyperledger.besu.ethereum.ProtocolContext;
@@ -100,7 +99,6 @@ class JsonRpcHttpServiceTlsMisconfigurationTest {
     supportedCapabilities.add(EthProtocol.ETH63);
 
     rpcMethods =
-        spy(
         new JsonRpcMethodsFactory()
             .methods(
                 CLIENT_VERSION,
@@ -131,7 +129,7 @@ class JsonRpcHttpServiceTlsMisconfigurationTest {
                 mock(EthPeers.class),
                 vertx,
                 mock(ApiConfiguration.class),
-                    Optional.empty()));
+                Optional.empty());
   }
 
   @AfterEach

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsTest.java

@@ -20,7 +20,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.DEFAULT_RPC_APIS;
 import static org.hyperledger.besu.ethereum.api.tls.TlsConfiguration.Builder.aTlsConfiguration;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
 import org.hyperledger.besu.ethereum.ProtocolContext;
@@ -101,7 +100,6 @@ public class JsonRpcHttpServiceTlsTest {
     supportedCapabilities.add(EthProtocol.ETH63);
 
     rpcMethods =
-        spy(
         new JsonRpcMethodsFactory()
             .methods(
                 CLIENT_VERSION,
@@ -132,7 +130,7 @@ public class JsonRpcHttpServiceTlsTest {
                 mock(EthPeers.class),
                 vertx,
                 mock(ApiConfiguration.class),
-                    Optional.empty()));
+                Optional.empty());
     service = createJsonRpcHttpService(createJsonRpcConfig());
     service.start().join();
     baseUrl = service.url();

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBlockToFileTest.java

@@ -18,11 +18,12 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
@@ -30,28 +31,23 @@ import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Function;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-import org.mockito.Answers;
 
 public class DebugStandardTraceBlockToFileTest {
 
   // this tempDir is deliberately static
   @TempDir private static Path folder;
 
-  private final WorldStateArchive archive =
-      mock(WorldStateArchive.class, Answers.RETURNS_DEEP_STUBS);
   private final Blockchain blockchain = mock(Blockchain.class);
-  private final BlockchainQueries blockchainQueries =
-      spy(new BlockchainQueries(blockchain, archive));
+  private final BlockchainQueries blockchainQueries = mock(BlockchainQueries.class);
   private final TransactionTracer transactionTracer = mock(TransactionTracer.class);
   private final DebugStandardTraceBlockToFile debugStandardTraceBlockToFile =
       new DebugStandardTraceBlockToFile(() -> transactionTracer, blockchainQueries, folder);
@@ -76,20 +72,26 @@ public class DebugStandardTraceBlockToFileTest {
         new JsonRpcRequestContext(
             new JsonRpcRequest("2.0", "debug_standardTraceBlockToFile", params));
 
-    final List<String> paths = new ArrayList<>();
-    paths.add("path-1");
-
-    when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
+    final List<String> paths = List.of("path-1");
 
     when(blockchain.getBlockByHash(block.getHash())).thenReturn(Optional.of(block));
     when(blockchain.getBlockHeader(genesis.getHash())).thenReturn(Optional.of(genesis.getHeader()));
+    when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
+
+    when(blockchainQueries.getAndMapWorldState(any(), any()))
+        .thenAnswer(
+            invocationOnMock -> {
+              Function<Tracer.TraceableState, ? extends Optional<BlockTracer>> mapper =
+                  invocationOnMock.getArgument(1);
+              return mapper.apply(mock(Tracer.TraceableState.class));
+            });
 
     when(transactionTracer.traceTransactionToFile(
             any(MutableWorldState.class), eq(block.getHash()), any(), any()))
         .thenReturn(paths);
     final JsonRpcSuccessResponse response =
         (JsonRpcSuccessResponse) debugStandardTraceBlockToFile.response(request);
-    final List result = (ArrayList) response.getResult();
+    final List result = (List) response.getResult();
 
     assertThat(result.size()).isEqualTo(1);
   }

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockTest.java

@@ -18,9 +18,8 @@ import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.datatypes.Wei;
@@ -35,32 +34,25 @@ import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSucces
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType;
 import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.OptionalLong;
+import java.util.function.Function;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.jupiter.api.Test;
-import org.mockito.Answers;
-import org.mockito.Mockito;
 
 public class DebugTraceBlockTest {
 
   private final BlockTracer blockTracer = mock(BlockTracer.class);
-  private final WorldStateArchive archive =
-      mock(WorldStateArchive.class, Answers.RETURNS_DEEP_STUBS);
-  private final Blockchain blockchain = mock(Blockchain.class);
-  private final BlockchainQueries blockchainQueries =
-      spy(new BlockchainQueries(blockchain, archive));
+  private final BlockchainQueries blockchainQueries = mock(BlockchainQueries.class);
   private final DebugTraceBlock debugTraceBlock =
       new DebugTraceBlock(() -> blockTracer, new MainnetBlockHeaderFunctions(), blockchainQueries);
 
@@ -127,22 +119,25 @@ public class DebugTraceBlockTest {
     when(transaction2Trace.getResult()).thenReturn(transaction2Result);
     when(transaction1Result.getOutput()).thenReturn(Bytes.fromHexString("1234"));
     when(transaction2Result.getOutput()).thenReturn(Bytes.fromHexString("1234"));
-    when(blockTracer.trace(any(Tracer.TraceableState.class), Mockito.eq(block), any()))
+    when(blockTracer.trace(any(Tracer.TraceableState.class), eq(block), any()))
         .thenReturn(Optional.of(blockTrace));
 
-    when(blockchain.getBlockHeader(parentBlock.getHash()))
-        .thenReturn(Optional.of(parentBlock.getHeader()));
-    doAnswer(
-            invocation ->
+    when(blockchainQueries.blockByHash(parentBlock.getHash()))
+        .thenReturn(
             Optional.of(
                 new BlockWithMetadata<>(
                     parentBlock.getHeader(),
                     Collections.emptyList(),
                     Collections.emptyList(),
                     parentBlock.getHeader().getDifficulty(),
-                        parentBlock.calculateSize())))
-        .when(blockchainQueries)
-        .blockByHash(parentBlock.getHash());
+                    parentBlock.calculateSize())));
+    when(blockchainQueries.getAndMapWorldState(eq(parentBlock.getHash()), any()))
+        .thenAnswer(
+            invocationOnMock -> {
+              Function<Tracer.TraceableState, ? extends Optional<BlockTracer>> mapper =
+                  invocationOnMock.getArgument(1);
+              return mapper.apply(mock(Tracer.TraceableState.class));
+            });
 
     final JsonRpcSuccessResponse response =
         (JsonRpcSuccessResponse) debugTraceBlock.response(request);

ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncAlgSpec.java

@@ -165,7 +165,7 @@ public class BackwardSyncAlgSpec {
 
     ttdCaptor.getValue().onTTDReached(true);
 
-    voidCompletableFuture.get(100, TimeUnit.MILLISECONDS);
+    voidCompletableFuture.get(200, TimeUnit.MILLISECONDS);
     assertThat(voidCompletableFuture).isCompleted();
 
     verify(context.getSyncState()).unsubscribeTTDReached(88L);
@@ -192,7 +192,7 @@ public class BackwardSyncAlgSpec {
 
     completionCaptor.getValue().onInitialSyncCompleted();
 
-    voidCompletableFuture.get(100, TimeUnit.MILLISECONDS);
+    voidCompletableFuture.get(200, TimeUnit.MILLISECONDS);
     assertThat(voidCompletableFuture).isCompleted();
 
     verify(context.getSyncState()).unsubscribeTTDReached(88L);

ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/DeFramerTest.java

@@ -65,6 +65,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelId;
 import io.netty.channel.ChannelPipeline;
@@ -196,7 +197,7 @@ public class DeFramerTest {
     assertThat(out).isEmpty();
 
     // Next phase of pipeline should be setup
-    verify(pipeline, times(1)).addLast(any());
+    verify(pipeline, times(1)).addLast(any(ChannelHandler[].class));
 
     // Next message should be pushed out
     final PingMessage nextMessage = PingMessage.get();
@@ -204,7 +205,7 @@ public class DeFramerTest {
     when(framer.deframe(eq(nextData)))
         .thenReturn(new RawMessage(nextMessage.getCode(), nextMessage.getData()))
         .thenReturn(null);
-    verify(pipeline, times(1)).addLast(any());
+    verify(pipeline, times(1)).addLast(any(ChannelHandler[].class));
     deFramer.decode(ctx, nextData, out);
     assertThat(out.size()).isEqualTo(1);
   }
@@ -246,7 +247,7 @@ public class DeFramerTest {
     assertThat(peerConnection.getPeer().getEnodeURL()).isEqualTo(expectedEnode);
 
     // Next phase of pipeline should be setup
-    verify(pipeline, times(1)).addLast(any());
+    verify(pipeline, times(1)).addLast(any(ChannelHandler[].class));
 
     // Next message should be pushed out
     final PingMessage nextMessage = PingMessage.get();
@@ -254,7 +255,7 @@ public class DeFramerTest {
     when(framer.deframe(eq(nextData)))
         .thenReturn(new RawMessage(nextMessage.getCode(), nextMessage.getData()))
         .thenReturn(null);
-    verify(pipeline, times(1)).addLast(any());
+    verify(pipeline, times(1)).addLast(any(ChannelHandler[].class));
     deFramer.decode(ctx, nextData, out);
     assertThat(out.size()).isEqualTo(1);
   }
@@ -292,7 +293,7 @@ public class DeFramerTest {
     assertThat(out).isEmpty();
 
     // Next phase of pipeline should be setup
-    verify(pipeline, times(1)).addLast(any());
+    verify(pipeline, times(1)).addLast(any(ChannelHandler[].class));
   }
 
   @Test
@@ -321,7 +322,7 @@ public class DeFramerTest {
     assertThat(out).isEmpty();
 
     // Next phase of pipeline should be setup
-    verify(pipeline, times(1)).addLast(any());
+    verify(pipeline, times(1)).addLast(any(ChannelHandler[].class));
   }
 
   @Test

evm/src/test/java/org/hyperledger/besu/evm/operations/ChainIdOperationTest.java

@@ -27,7 +27,6 @@ import java.util.List;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -51,7 +50,7 @@ class ChainIdOperationTest {
   void shouldReturnChainId(final String chainIdString, final int expectedGas) {
     Bytes32 chainId = Bytes32.fromHexString(chainIdString);
     ChainIdOperation operation = new ChainIdOperation(new ConstantinopleGasCalculator(), chainId);
-    final ArgumentCaptor<Bytes> arg = ArgumentCaptor.forClass(UInt256.class);
+    final ArgumentCaptor<Bytes> arg = ArgumentCaptor.forClass(Bytes.class);
     when(messageFrame.getRemainingGas()).thenReturn(100L);
     operation.execute(messageFrame, null);
     Mockito.verify(messageFrame).getRemainingGas();

gradle/verification-metadata.xml

@@ -2858,12 +2858,12 @@
             <sha256 value="57e0c23ac60945aefb5a0c4a9339bea68a295364ca47c7a9079a032f79013abb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="net.bytebuddy" name="byte-buddy" version="1.12.19">
-         <artifact name="byte-buddy-1.12.19.jar">
-            <sha256 value="030704139e46f32c38d27060edee9e0676b0a0fff8a8be53461515154ba8a7be" origin="Generated by Gradle"/>
+      <component group="net.bytebuddy" name="byte-buddy" version="1.14.10">
+         <artifact name="byte-buddy-1.14.10.jar">
+            <sha256 value="30e6e0446437a67db37e2b7f7d33f50787ddfd970359319dfd05469daa2dcbce" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="byte-buddy-1.12.19.pom">
-            <sha256 value="435fb8664aa9b7e120c8dd6c707d4eafa642fa262dff6d5e3f71dc25c69e89eb" origin="Generated by Gradle"/>
+         <artifact name="byte-buddy-1.14.10.pom">
+            <sha256 value="cd58782845ff8eedf2ed83a0c3edf45eeeb99e14c05af8a2e901860ea080ceaf" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="net.bytebuddy" name="byte-buddy" version="1.14.11">
@@ -2874,17 +2874,17 @@
             <sha256 value="358449d6c73538584508dd8ae6cfde56baf4a34b767b71d9cc4644f0f1f4211a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="net.bytebuddy" name="byte-buddy-agent" version="1.12.19">
-         <artifact name="byte-buddy-agent-1.12.19.jar">
-            <sha256 value="3a70240de7cdcde04e7c504c2327d7035b9c25ae0206881e3bf4e6798a273ed8" origin="Generated by Gradle"/>
+      <component group="net.bytebuddy" name="byte-buddy-agent" version="1.14.10">
+         <artifact name="byte-buddy-agent-1.14.10.jar">
+            <sha256 value="67993a89d47ca58ff868802a4448ddd150e5fe4e5a5645ded990d7b4d557a6b9" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="byte-buddy-agent-1.12.19.pom">
-            <sha256 value="b5a2cff643681de1687fc40acd251feefdfca23e673e049fb3c3692b53526d4b" origin="Generated by Gradle"/>
+         <artifact name="byte-buddy-agent-1.14.10.pom">
+            <sha256 value="53bc97e9c6bf7c2d0e5f9cbac7d5de6b2924d916cf4b817e6a3a35929c796b4a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="net.bytebuddy" name="byte-buddy-parent" version="1.12.19">
-         <artifact name="byte-buddy-parent-1.12.19.pom">
-            <sha256 value="72ab6fef409e812921f4728b3c4b6ef4fa53bc25fabb0488fc2cae367368b54d" origin="Generated by Gradle"/>
+      <component group="net.bytebuddy" name="byte-buddy-parent" version="1.14.10">
+         <artifact name="byte-buddy-parent-1.14.10.pom">
+            <sha256 value="c698219060fb0e565a0f2c96094e92b20efe146fd61636b2c9e4c03bd9ba4a7b" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="net.bytebuddy" name="byte-buddy-parent" version="1.14.11">
@@ -5316,20 +5316,20 @@
             <sha256 value="d8531a746c988f7f68ed5f188cdea945006aea993ec5df9e524e0d27d61491da" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.mockito" name="mockito-core" version="4.11.0">
-         <artifact name="mockito-core-4.11.0.jar">
-            <sha256 value="4b909690cab288c761eb94c0bf0e814496cf3921d8affac84cd87774530351e5" origin="Generated by Gradle"/>
+      <component group="org.mockito" name="mockito-core" version="5.8.0">
+         <artifact name="mockito-core-5.8.0.jar">
+            <sha256 value="c320f662a03c2951edcc51a44b64d79a8e994373ff548453b5fdaf69debe4682" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockito-core-4.11.0.pom">
-            <sha256 value="2bc2e3c8c8b313fdac231f23822225b07831dc899d067072f49d5f8ae37e739a" origin="Generated by Gradle"/>
+         <artifact name="mockito-core-5.8.0.pom">
+            <sha256 value="74958acdde148f30bfa31ffc0858b62f71f63ccc2ceb4d8a8c67d7f428d43a2d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.mockito" name="mockito-junit-jupiter" version="4.11.0">
-         <artifact name="mockito-junit-jupiter-4.11.0.jar">
-            <sha256 value="f4b3694f60fccc7b520d8aea9b6c827d8e9949b652cad09fce10b546bf3ac537" origin="Generated by Gradle"/>
+      <component group="org.mockito" name="mockito-junit-jupiter" version="5.8.0">
+         <artifact name="mockito-junit-jupiter-5.8.0.jar">
+            <sha256 value="9f6ccc29654335b92ac20e800eb44949772031711185bed6a44a5f8bd56e476b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockito-junit-jupiter-4.11.0.pom">
-            <sha256 value="b724ad13e3e450cb022672fe5ca6f1d38d5d7485246a3ff3d278edf9321e3417" origin="Generated by Gradle"/>
+         <artifact name="mockito-junit-jupiter-5.8.0.pom">
+            <sha256 value="036ac84dd98ef3d56e7d8118e819060a58f611d30bd3a2c350c42702921177be" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.objenesis" name="objenesis" version="3.3">

gradle/versions.gradle

@@ -192,7 +192,7 @@ dependencyManagement {
       entry 'org.jupnp'
     }
 
-    dependencySet(group: 'org.mockito', version:'4.11.0') {
+    dependencySet(group: 'org.mockito', version:'5.8.0') {
       entry 'mockito-core'
       entry 'mockito-junit-jupiter'
     }