remove deprecated PoAMetricsService and IbftQueryService (besu-eth#8940)

* remove deprecated interfaces
* update plugin api hash

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

Author: macfarla

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Breaking Changes
 - Change in behavior for `eth_estimateGas`, to improve accuracy, when used on a network with a base fee market, the internal transaction simulation does not anymore underprice transactions, so if there are no gas pricing related fields specified in the request, then gas price for the transaction is set to the base fee value [#8888](https://github.com/hyperledger/besu/pull/8888)
+- Remove PoAMetricsService and IbftQueryService which have been deprecated since 2019 and are replaced by PoaQueryService and BftQueryService respectively [#8940](https://github.com/hyperledger/besu/pull/8940)
 - Remove deprecated `Quantity.getValue` method (deprecated since 2019) [#8968](https://github.com/hyperledger/besu/pull/8968)
 
 ### Upcoming Breaking Changes

app/src/main/java/org/hyperledger/besu/controller/BftQueryPluginServiceFactory.java

@@ -20,7 +20,6 @@
 import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
 import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.plugin.services.metrics.PoAMetricsService;
 import org.hyperledger.besu.plugin.services.query.BftQueryService;
 import org.hyperledger.besu.plugin.services.query.PoaQueryService;
 import org.hyperledger.besu.services.BesuPluginContextImpl;
@@ -65,6 +64,5 @@ public void appendPluginServices(final BesuPluginContextImpl besuContext) {
             blockInterface, blockchain, validatorProvider, nodeKey, consensusMechanismName);
     besuContext.addService(BftQueryService.class, service);
     besuContext.addService(PoaQueryService.class, service);
-    besuContext.addService(PoAMetricsService.class, service);
   }
 }

app/src/main/java/org/hyperledger/besu/controller/CliqueQueryPluginServiceFactory.java

@@ -19,7 +19,6 @@
 import org.hyperledger.besu.consensus.common.PoaQueryServiceImpl;
 import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.plugin.services.metrics.PoAMetricsService;
 import org.hyperledger.besu.plugin.services.query.PoaQueryService;
 import org.hyperledger.besu.services.BesuPluginContextImpl;
 
@@ -46,6 +45,5 @@ public void appendPluginServices(final BesuPluginContextImpl besuContext) {
     final PoaQueryServiceImpl service =
         new PoaQueryServiceImpl(blockInterface, blockchain, nodeKey);
     besuContext.addService(PoaQueryService.class, service);
-    besuContext.addService(PoAMetricsService.class, service);
   }
 }

app/src/main/java/org/hyperledger/besu/controller/IbftQueryPluginServiceFactory.java

@@ -20,9 +20,7 @@
 import org.hyperledger.besu.consensus.ibft.queries.IbftQueryServiceImpl;
 import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.plugin.services.metrics.PoAMetricsService;
 import org.hyperledger.besu.plugin.services.query.BftQueryService;
-import org.hyperledger.besu.plugin.services.query.IbftQueryService;
 import org.hyperledger.besu.plugin.services.query.PoaQueryService;
 import org.hyperledger.besu.services.BesuPluginContextImpl;
 
@@ -57,9 +55,7 @@ public IbftQueryPluginServiceFactory(
   public void appendPluginServices(final BesuPluginContextImpl besuContext) {
     final IbftQueryServiceImpl service =
         new IbftQueryServiceImpl(blockInterface, blockchain, nodeKey);
-    besuContext.addService(IbftQueryService.class, service);
     besuContext.addService(PoaQueryService.class, service);
-    besuContext.addService(PoAMetricsService.class, service);
 
     final BftQueryServiceImpl bftService =
         new BftQueryServiceImpl(blockInterface, blockchain, validatorProvider, nodeKey, "ibft");

consensus/common/src/main/java/org/hyperledger/besu/consensus/common/PoaQueryServiceImpl.java

@@ -18,14 +18,13 @@
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.plugin.data.BlockHeader;
-import org.hyperledger.besu.plugin.services.metrics.PoAMetricsService;
 import org.hyperledger.besu.plugin.services.query.PoaQueryService;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
 /** The Poa query service. */
-public class PoaQueryServiceImpl implements PoaQueryService, PoAMetricsService {
+public class PoaQueryServiceImpl implements PoaQueryService {
 
   private final BlockInterface blockInterface;
   private final Blockchain blockchain;

consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/queries/IbftQueryServiceImpl.java

@@ -22,15 +22,15 @@
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.plugin.services.query.IbftQueryService;
+import org.hyperledger.besu.plugin.services.query.BftQueryService;
 
 import java.util.Collection;
 import java.util.Collections;
 
 import org.apache.tuweni.bytes.Bytes32;
 
 /** The Ibft query service. */
-public class IbftQueryServiceImpl extends PoaQueryServiceImpl implements IbftQueryService {
+public class IbftQueryServiceImpl extends PoaQueryServiceImpl implements BftQueryService {
 
   private final BftBlockInterface blockInterface;
 
@@ -70,4 +70,9 @@ private BlockHeader getHeaderFromChain(
     final Hash blockHash = Hash.wrap(Bytes32.wrap(header.getBlockHash().toArray()));
     return getBlockchain().getBlockHeader(blockHash).orElseThrow();
   }
+
+  @Override
+  public String getConsensusMechanismName() {
+    return "ibft";
+  }
 }

ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/snap/SnapServerTest.java

@@ -74,7 +74,7 @@
 public class SnapServerTest {
   static Random rand = new Random();
 
-  // Paramaterized test to exercise BONSAI and BONSAI_ARCHIVE
+  // Parameterized test to exercise BONSAI and BONSAI_ARCHIVE
   public static Collection<Object[]> flatDbMode() {
     return Arrays.asList(new Object[][] {{FlatDbMode.FULL}, {FlatDbMode.ARCHIVE}});
   }

metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryGauge.java

@@ -21,7 +21,6 @@
 import io.opentelemetry.api.metrics.Meter;
 
 /** The Open telemetry gauge. */
-@SuppressWarnings("removal") // remove when deprecated LabelledGauge is removed
 public class OpenTelemetryGauge extends OpenTelemetryLabelledSuppliedMetric
     implements LabelledSuppliedMetric {
   /**

plugin-api/build.gradle

@@ -71,7 +71,7 @@ Calculated : ${currentHash}
 tasks.register('checkAPIChanges', FileStateChecker) {
   description = "Checks that the API for the Plugin-API project does not change without deliberate thought"
   files = sourceSets.main.allJava.files
-  knownHash = 'IoOg4tWjHeQ/DDOnBtIcIknUhHe+jGHgk4ez0zDHDf8='
+  knownHash = 'AmeuFlj4qvlMpv3pPDxnWZgKcXRe2/tDRAI+H0h4smU='
 }
 check.dependsOn('checkAPIChanges')