Skip to content

Commit d92226e

Browse files
macfarlajflo
macfarla
authored and
jflo
committed
removed tests for pki qbft and add deprecation notice (hyperledger#6979)
* removed tests for pki qbft and add deprecation notice Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * remove more PKI and CMS creation utils from tests Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Justin Florentine <justin+github@florentine.us>
1 parent 0ec9aba commit d92226e

27 files changed

+1
-2396
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
### Upcoming Breaking Changes
1111
- Receipt compaction will be enabled by default in a future version of Besu. After this change it will not be possible to downgrade to the previous Besu version.
12+
- PKI-backed QBFT will be removed in a future version of Besu. Other forms of QBFT will remain unchanged.
1213

1314
### Deprecations
1415

‎acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java

-8
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
3636
import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
3737
import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
38-
import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration;
3938
import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
4039
import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.NodeConfiguration;
4140
import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider;
@@ -132,7 +131,6 @@ public class BesuNode implements NodeConfiguration, RunnableNode, AutoCloseable
132131
private final List<String> staticNodes;
133132
private boolean isDnsEnabled = false;
134133
private Optional<Integer> exitCode = Optional.empty();
135-
private Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration = Optional.empty();
136134
private final boolean isStrictTxReplayProtectionEnabled;
137135
private final Map<String, String> environment;
138136

@@ -169,7 +167,6 @@ public BesuNode(
169167
final Optional<PrivacyParameters> privacyParameters,
170168
final List<String> runCommand,
171169
final Optional<KeyPair> keyPair,
172-
final Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration,
173170
final boolean isStrictTxReplayProtectionEnabled,
174171
final Map<String, String> environment)
175172
throws IOException {
@@ -230,7 +227,6 @@ public BesuNode(
230227
this.staticNodes = staticNodes;
231228
this.isDnsEnabled = isDnsEnabled;
232229
privacyParameters.ifPresent(this::setPrivacyParameters);
233-
this.pkiKeyStoreConfiguration = pkiKeyStoreConfiguration;
234230
this.environment = environment;
235231
LOG.info("Created BesuNode {}", this);
236232
}
@@ -763,10 +759,6 @@ public List<String> getRunCommand() {
763759
return runCommand;
764760
}
765761

766-
public Optional<PkiKeyStoreConfiguration> getPkiKeyStoreConfiguration() {
767-
return pkiKeyStoreConfiguration;
768-
}
769-
770762
public boolean isStrictTxReplayProtectionEnabled() {
771763
return isStrictTxReplayProtectionEnabled;
772764
}

‎acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java

-27
Original file line numberDiff line numberDiff line change
@@ -377,33 +377,6 @@ public void startNode(final BesuNode node) {
377377
permissioningConfiguration.getNodeSmartContractInterfaceVersion()));
378378
});
379379

380-
node.getPkiKeyStoreConfiguration()
381-
.ifPresent(
382-
pkiConfig -> {
383-
params.add("--Xpki-block-creation-enabled");
384-
385-
params.add("--Xpki-block-creation-keystore-certificate-alias");
386-
params.add(pkiConfig.getCertificateAlias());
387-
388-
params.add("--Xpki-block-creation-keystore-type");
389-
params.add(pkiConfig.getKeyStoreType());
390-
391-
params.add("--Xpki-block-creation-keystore-file");
392-
params.add(pkiConfig.getKeyStorePath().toAbsolutePath().toString());
393-
394-
params.add("--Xpki-block-creation-keystore-password-file");
395-
params.add(pkiConfig.getKeyStorePasswordPath().toAbsolutePath().toString());
396-
397-
params.add("--Xpki-block-creation-truststore-type");
398-
params.add(pkiConfig.getTrustStoreType());
399-
400-
params.add("--Xpki-block-creation-truststore-file");
401-
params.add(pkiConfig.getTrustStorePath().toAbsolutePath().toString());
402-
403-
params.add("--Xpki-block-creation-truststore-password-file");
404-
params.add(pkiConfig.getTrustStorePasswordPath().toAbsolutePath().toString());
405-
});
406-
407380
params.addAll(node.getExtraCLIOptions());
408381

409382
params.add("--key-value-storage");

‎acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java

-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.hyperledger.besu.cli.config.EthNetworkConfig;
2222
import org.hyperledger.besu.cli.config.NetworkName;
2323
import org.hyperledger.besu.config.GenesisConfigFile;
24-
import org.hyperledger.besu.consensus.qbft.pki.PkiBlockCreationConfigurationProvider;
2524
import org.hyperledger.besu.controller.BesuController;
2625
import org.hyperledger.besu.controller.BesuControllerBuilder;
2726
import org.hyperledger.besu.crypto.KeyPairUtil;
@@ -253,9 +252,6 @@ public void startNode(final BesuNode node) {
253252
.isRevertReasonEnabled(node.isRevertReasonEnabled())
254253
.storageProvider(storageProvider)
255254
.gasLimitCalculator(GasLimitCalculator.constant())
256-
.pkiBlockCreationConfiguration(
257-
node.getPkiKeyStoreConfiguration()
258-
.map(pkiConfig -> new PkiBlockCreationConfigurationProvider().load(pkiConfig)))
259255
.evmConfiguration(EvmConfiguration.DEFAULT)
260256
.maxPeers(maxPeers)
261257
.maxRemotelyInitiatedPeers(15)

‎acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java

-64
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode;
4040
import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationFactory;
4141
import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationFactory.CliqueOptions;
42-
import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.pki.PkiKeystoreConfigurationFactory;
4342

4443
import java.io.File;
4544
import java.io.IOException;
@@ -57,8 +56,6 @@
5756
public class BesuNodeFactory {
5857

5958
private final NodeConfigurationFactory node = new NodeConfigurationFactory();
60-
private final PkiKeystoreConfigurationFactory pkiKeystoreConfigurationFactory =
61-
new PkiKeystoreConfigurationFactory();
6259

6360
public BesuNode create(final BesuNodeConfiguration config) throws IOException {
6461
return new BesuNode(
@@ -94,7 +91,6 @@ public BesuNode create(final BesuNodeConfiguration config) throws IOException {
9491
config.getPrivacyParameters(),
9592
config.getRunCommand(),
9693
config.getKeyPair(),
97-
config.getPkiKeyStoreConfiguration(),
9894
config.isStrictTxReplayProtectionEnabled(),
9995
config.getEnvironment());
10096
}
@@ -517,31 +513,6 @@ public BesuNode createQbftNode(final String name) throws IOException {
517513
.build());
518514
}
519515

520-
public BesuNode createPkiQbftJKSNode(final String name) throws IOException {
521-
return createPkiQbftNode(KeyStoreWrapper.KEYSTORE_TYPE_JKS, name);
522-
}
523-
524-
public BesuNode createPkiQbftPKCS11Node(final String name) throws IOException {
525-
return createPkiQbftNode(KeyStoreWrapper.KEYSTORE_TYPE_PKCS11, name);
526-
}
527-
528-
public BesuNode createPkiQbftPKCS12Node(final String name) throws IOException {
529-
return createPkiQbftNode(KeyStoreWrapper.KEYSTORE_TYPE_PKCS12, name);
530-
}
531-
532-
public BesuNode createPkiQbftNode(final String type, final String name) throws IOException {
533-
return create(
534-
new BesuNodeConfigurationBuilder()
535-
.name(name)
536-
.miningEnabled()
537-
.jsonRpcConfiguration(node.createJsonRpcWithQbftEnabledConfig(false))
538-
.webSocketConfiguration(node.createWebSocketEnabledConfig())
539-
.devMode(false)
540-
.genesisConfigProvider(GenesisConfigurationFactory::createQbftGenesisConfig)
541-
.pkiBlockCreationEnabled(pkiKeystoreConfigurationFactory.createPkiConfig(type, name))
542-
.build());
543-
}
544-
545516
public BesuNode createCustomGenesisNode(
546517
final String name, final String genesisPath, final boolean canBeBootnode) throws IOException {
547518
return createCustomGenesisNode(name, genesisPath, canBeBootnode, false);
@@ -699,41 +670,6 @@ public BesuNode createQbftNodeWithContractBasedValidators(
699670
.build());
700671
}
701672

702-
public BesuNode createPkiQbftJKSNodeWithValidators(final String name, final String... validators)
703-
throws IOException {
704-
return createPkiQbftNodeWithValidators(KeyStoreWrapper.KEYSTORE_TYPE_JKS, name, validators);
705-
}
706-
707-
public BesuNode createPkiQbftPKCS11NodeWithValidators(
708-
final String name, final String... validators) throws IOException {
709-
return createPkiQbftNodeWithValidators(KeyStoreWrapper.KEYSTORE_TYPE_PKCS11, name, validators);
710-
}
711-
712-
public BesuNode createPkiQbftPKCS12NodeWithValidators(
713-
final String name, final String... validators) throws IOException {
714-
return createPkiQbftNodeWithValidators(KeyStoreWrapper.KEYSTORE_TYPE_PKCS12, name, validators);
715-
}
716-
717-
public BesuNode createPkiQbftNodeWithValidators(
718-
final String type, final String name, final String... validators) throws IOException {
719-
720-
return create(
721-
new BesuNodeConfigurationBuilder()
722-
.name(name)
723-
.miningEnabled()
724-
.jsonRpcConfiguration(node.createJsonRpcWithQbftEnabledConfig(false))
725-
.webSocketConfiguration(node.createWebSocketEnabledConfig())
726-
.devMode(false)
727-
.pkiBlockCreationEnabled(pkiKeystoreConfigurationFactory.createPkiConfig(type, name))
728-
.genesisConfigProvider(
729-
nodes ->
730-
node.createGenesisConfigForValidators(
731-
asList(validators),
732-
nodes,
733-
GenesisConfigurationFactory::createQbftGenesisConfig))
734-
.build());
735-
}
736-
737673
public BesuNode createNodeWithStaticNodes(final String name, final List<Node> staticNodes)
738674
throws IOException {
739675

‎acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PkiKeystoreConfigurationFactory.java

-196
This file was deleted.

0 commit comments

Comments
 (0)