Remove Clique RPC APIs and management infrastructure (Phase 2)

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java

@@ -21,7 +21,6 @@
 import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Blockchain;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.admin.AdminConditions;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.bft.BftConditions;
-import org.hyperledger.besu.tests.acceptance.dsl.condition.clique.CliqueConditions;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.eth.EthConditions;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.login.LoginConditions;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.net.NetConditions;
@@ -37,7 +36,6 @@
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.account.AccountTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.admin.AdminTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.bft.BftTransactions;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.contract.ContractTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.debug.DebugTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions;
@@ -84,8 +82,6 @@ public class AcceptanceTestBase {
   protected final AdminConditions admin;
   protected final AdminTransactions adminTransactions;
   protected final Blockchain blockchain;
-  protected final CliqueConditions clique;
-  protected final CliqueTransactions cliqueTransactions;
   protected final Cluster cluster;
   protected final ContractVerifier contractVerifier;
   protected final ContractTransactions contractTransactions;
@@ -113,14 +109,12 @@ protected AcceptanceTestBase() {
     ethTransactions = new EthTransactions();
     accounts = new Accounts(ethTransactions);
     adminTransactions = new AdminTransactions();
-    cliqueTransactions = new CliqueTransactions();
     bftTransactions = new BftTransactions();
     accountTransactions = new AccountTransactions(accounts);
     permissioningTransactions = new PermissioningTransactions();
     contractTransactions = new ContractTransactions();
     minerTransactions = new MinerTransactions();
     blockchain = new Blockchain(ethTransactions);
-    clique = new CliqueConditions(ethTransactions, cliqueTransactions);
     eth = new EthConditions(ethTransactions);
     bft = new BftConditions(bftTransactions);
     login = new LoginConditions();

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/bft/AwaitValidatorSetChange.java

@@ -15,7 +15,6 @@
 package org.hyperledger.besu.tests.acceptance.dsl.condition.bft;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST;
 
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
@@ -40,6 +39,7 @@ public void verify(final Node node) {
     WaitUtils.waitFor(
         60,
         () ->
-            assertThat(node.execute(bft.createGetValidators(LATEST))).isNotEqualTo(initialSigners));
+            assertThat(node.execute(bft.createGetValidators("latest")))
+                .isNotEqualTo(initialSigners));
   }
 }

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/bft/BftConditions.java

@@ -14,8 +14,6 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.condition.bft;
 
-import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST;
-
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
@@ -56,7 +54,7 @@ private Address[] validatorAddresses(final BesuNode[] validators) {
   }
 
   public Condition awaitValidatorSetChange(final Node node) {
-    return new AwaitValidatorSetChange(node.execute(bft.createGetValidators(LATEST)), bft);
+    return new AwaitValidatorSetChange(node.execute(bft.createGetValidators("latest")), bft);
   }
 
   public Condition noProposals() {