Skip to content

Commit 85a724f

Browse files
fab-10claude
andcommitted
Remove Clique RPC APIs and remaining DSL test infrastructure (Phase 2)
Delete the Clique JSON-RPC method implementations (clique_getSigners, clique_propose, clique_discard, clique_proposals, clique_getSignerMetrics, clique_getSignersAtHash) and all supporting classes: - consensus/clique/.../jsonrpc/ (production + test, 12 files) - CliqueQueryPluginServiceFactory (replaced with NoopPluginServiceFactory) - Acceptance-test DSL: condition/clique/ and transaction/clique/ packages - NodeRequests: drop CliqueRequestFactory field and clique() accessor - AcceptanceTestBase: drop clique/cliqueTransactions fields - BesuNode: remove CliqueRequestFactory from NodeRequests construction - NodeConfigurationFactory: remove createJsonRpcWithCliqueEnabledConfig() - BftConditions / AwaitValidatorSetChange: inline "latest" constant Remove RpcMethod entries CLIQUE_* and RpcApis.CLIQUE enum value. CliqueBesuControllerBuilder no longer overrides createAdditionalJsonRpcMethodFactory. Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 771ce96 commit 85a724f

40 files changed

+792
-2244
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Blockchain;
2222
import org.hyperledger.besu.tests.acceptance.dsl.condition.admin.AdminConditions;
2323
import org.hyperledger.besu.tests.acceptance.dsl.condition.bft.BftConditions;
24-
import org.hyperledger.besu.tests.acceptance.dsl.condition.clique.CliqueConditions;
2524
import org.hyperledger.besu.tests.acceptance.dsl.condition.eth.EthConditions;
2625
import org.hyperledger.besu.tests.acceptance.dsl.condition.login.LoginConditions;
2726
import org.hyperledger.besu.tests.acceptance.dsl.condition.net.NetConditions;
@@ -37,7 +36,6 @@
3736
import org.hyperledger.besu.tests.acceptance.dsl.transaction.account.AccountTransactions;
3837
import org.hyperledger.besu.tests.acceptance.dsl.transaction.admin.AdminTransactions;
3938
import org.hyperledger.besu.tests.acceptance.dsl.transaction.bft.BftTransactions;
40-
import org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions;
4139
import org.hyperledger.besu.tests.acceptance.dsl.transaction.contract.ContractTransactions;
4240
import org.hyperledger.besu.tests.acceptance.dsl.transaction.debug.DebugTransactions;
4341
import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions;
@@ -84,8 +82,6 @@ public class AcceptanceTestBase {
8482
protected final AdminConditions admin;
8583
protected final AdminTransactions adminTransactions;
8684
protected final Blockchain blockchain;
87-
protected final CliqueConditions clique;
88-
protected final CliqueTransactions cliqueTransactions;
8985
protected final Cluster cluster;
9086
protected final ContractVerifier contractVerifier;
9187
protected final ContractTransactions contractTransactions;
@@ -113,14 +109,12 @@ protected AcceptanceTestBase() {
113109
ethTransactions = new EthTransactions();
114110
accounts = new Accounts(ethTransactions);
115111
adminTransactions = new AdminTransactions();
116-
cliqueTransactions = new CliqueTransactions();
117112
bftTransactions = new BftTransactions();
118113
accountTransactions = new AccountTransactions(accounts);
119114
permissioningTransactions = new PermissioningTransactions();
120115
contractTransactions = new ContractTransactions();
121116
minerTransactions = new MinerTransactions();
122117
blockchain = new Blockchain(ethTransactions);
123-
clique = new CliqueConditions(ethTransactions, cliqueTransactions);
124118
eth = new EthConditions(ethTransactions);
125119
bft = new BftConditions(bftTransactions);
126120
login = new LoginConditions();

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
package org.hyperledger.besu.tests.acceptance.dsl.condition.bft;
1616

1717
import static org.assertj.core.api.Assertions.assertThat;
18-
import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST;
19-
2018
import org.hyperledger.besu.datatypes.Address;
2119
import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
2220
import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
@@ -40,6 +38,6 @@ public void verify(final Node node) {
4038
WaitUtils.waitFor(
4139
60,
4240
() ->
43-
assertThat(node.execute(bft.createGetValidators(LATEST))).isNotEqualTo(initialSigners));
41+
assertThat(node.execute(bft.createGetValidators("latest"))).isNotEqualTo(initialSigners));
4442
}
4543
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
*/
1515
package org.hyperledger.besu.tests.acceptance.dsl.condition.bft;
1616

17-
import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST;
18-
1917
import org.hyperledger.besu.datatypes.Address;
2018
import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
2119
import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
@@ -56,7 +54,7 @@ private Address[] validatorAddresses(final BesuNode[] validators) {
5654
}
5755

5856
public Condition awaitValidatorSetChange(final Node node) {
59-
return new AwaitValidatorSetChange(node.execute(bft.createGetValidators(LATEST)), bft);
57+
return new AwaitValidatorSetChange(node.execute(bft.createGetValidators("latest")), bft);
6058
}
6159

6260
public Condition noProposals() {

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/CliqueConditions.java

Lines changed: 0 additions & 132 deletions
This file was deleted.

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java

Lines changed: 0 additions & 46 deletions
This file was deleted.

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectProposals.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidators.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)