CipherLabs
/
besu
mirror of https://github.com/hyperledger/besu
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Acceptance Test Cleanup (#1458)

Browse Source 
Clean up Acceptance tests to follow our coding conventions
For builders, don't use get/set for properties.
Otherwise use get/set for properties.
Signed-off-by: Adrian Sutton <adrian.sutton@consensys.net>
pull/2/head
Danno Ferrin 6 years ago committed by GitHub
parent 20fa61ac8f
commit 052e3f93fc
18 changed files with 96 additions and 100 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java
  2. 2
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java
  3. 2
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/P2pDisabledAcceptanceTest.java
  4. 2
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/jsonrpc/Clique.java
  5. 12
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/NodeConfiguration.java
  6. 20
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNode.java
  7. 6
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java
  8. 4
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java
  9. 6
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/Cluster.java
  10. 2
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java
  11. 22
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/factory/PantheonFactoryConfigurationBuilder.java
  12. 92
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/factory/PantheonNodeFactory.java
  13. 10
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/factory/PermissionedNodeBuilder.java
  14. 6
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketConnection.java
  15. 2
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java
  16. 2
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java
  17. 2
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/LocalConfigNodePermissioningAcceptanceTest.java
  18. 2
      acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeSmartContractNodePermissioningAcceptanceTestBase.java

2
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java
Unescape View File

@ -30,7 +30,7 @@ public class ClusterNoDiscoveryAcceptanceTest extends AcceptanceTestBase {
@Before
public void setUp() throws Exception {
final ClusterConfiguration clusterConfiguration =
new ClusterConfigurationBuilder().setAwaitPeerDiscovery(false).build();
new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
noDiscoveryCluster = new Cluster(clusterConfiguration, net);
noDiscoveryNode = pantheon.createNodeWithNoDiscovery("noDiscovery");
fullNode = pantheon.createArchiveNode("node2");

2
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java
Unescape View File

@ -32,7 +32,7 @@ public class ClusterThreadNodeRunnerAcceptanceTest extends AcceptanceTestBase {
@Before
public void setUp() throws Exception {
final ClusterConfiguration clusterConfiguration =
new ClusterConfigurationBuilder().setAwaitPeerDiscovery(false).build();
new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
final PantheonNodeRunner pantheonNodeRunner = new ThreadPantheonNodeRunner();
noDiscoveryCluster = new Cluster(clusterConfiguration, net, pantheonNodeRunner);
final PantheonNode noDiscoveryNode = pantheon.createNodeWithNoDiscovery("noDiscovery");

2
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/P2pDisabledAcceptanceTest.java
Unescape View File

@ -28,7 +28,7 @@ public class P2pDisabledAcceptanceTest extends AcceptanceTestBase {
@Before
public void setUp() throws Exception {
final ClusterConfiguration clusterConfiguration =
new ClusterConfigurationBuilder().setAwaitPeerDiscovery(false).build();
new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
p2pDisabledCluster = new Cluster(clusterConfiguration, net);
node = pantheon.createNodeWithP2pDisabled("node1");

2
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/jsonrpc/Clique.java
Unescape View File

@ -87,7 +87,7 @@ public class Clique {
}
private int cliqueBlockPeriod(final PantheonNode node) {
final String config = node.genesisConfigProvider().createGenesisConfig(emptyList()).get();
final String config = node.getGenesisConfigProvider().createGenesisConfig(emptyList()).get();
final GenesisConfigFile genesisConfigFile = GenesisConfigFile.fromConfig(config);
final CliqueConfigOptions cliqueConfigOptions =
genesisConfigFile.getConfigOptions().getCliqueConfigOptions();

12
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/NodeConfiguration.java
Unescape View File

@ -18,21 +18,21 @@ import java.util.Optional;
public interface NodeConfiguration {
void bootnodes(List<URI> bootnodes);
void getBootnodes(List<URI> bootnodes);
List<URI> bootnodes();
List<URI> getBootnodes();
void useWebSocketsForJsonRpc();
void useAuthenticationTokenInHeaderForJsonRpc(String token);
Optional<Integer> jsonRpcWebSocketPort();
Optional<Integer> getJsonRpcWebSocketPort();
String hostName();
String getHostName();
boolean jsonRpcEnabled();
boolean isJsonRpcEnabled();
GenesisConfigProvider genesisConfigProvider();
GenesisConfigProvider getGenesisConfigProvider();
Optional<String> getGenesisConfig();

20
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNode.java
Unescape View File

@ -138,7 +138,8 @@ public class PantheonNode implements NodeConfiguration, RunnableNode, AutoClosea
LOG.info("Created PantheonNode {}", this.toString());
}
private boolean isJsonRpcEnabled() {
@Override
public boolean isJsonRpcEnabled() {
return jsonRpcConfiguration().isEnabled();
}
@ -213,7 +214,7 @@ public class PantheonNode implements NodeConfiguration, RunnableNode, AutoClosea
}
@Override
public Optional<Integer> jsonRpcWebSocketPort() {
public Optional<Integer> getJsonRpcWebSocketPort() {
if (isWebSocketsRpcEnabled()) {
return Optional.of(Integer.valueOf(portsProperties.getProperty("ws-rpc")));
} else {
@ -222,7 +223,7 @@ public class PantheonNode implements NodeConfiguration, RunnableNode, AutoClosea
}
@Override
public String hostName() {
public String getHostName() {
return LOCALHOST;
}
@ -370,7 +371,7 @@ public class PantheonNode implements NodeConfiguration, RunnableNode, AutoClosea
@Override
public void awaitPeerDiscovery(final Condition condition) {
if (jsonRpcEnabled()) {
if (this.isJsonRpcEnabled()) {
verify(condition);
}
}
@ -394,11 +395,6 @@ public class PantheonNode implements NodeConfiguration, RunnableNode, AutoClosea
return homeDirectory;
}
@Override
public boolean jsonRpcEnabled() {
return isJsonRpcEnabled();
}
JsonRpcConfiguration jsonRpcConfiguration() {
return jsonRpcConfiguration;
}
@ -444,7 +440,7 @@ public class PantheonNode implements NodeConfiguration, RunnableNode, AutoClosea
}
@Override
public List<URI> bootnodes() {
public List<URI> getBootnodes() {
return unmodifiableList(bootnodes);
}
@ -459,7 +455,7 @@ public class PantheonNode implements NodeConfiguration, RunnableNode, AutoClosea
}
@Override
public void bootnodes(final List<URI> bootnodes) {
public void getBootnodes(final List<URI> bootnodes) {
this.bootnodes.clear();
this.bootnodes.addAll(bootnodes);
}
@ -516,7 +512,7 @@ public class PantheonNode implements NodeConfiguration, RunnableNode, AutoClosea
}
@Override
public GenesisConfigProvider genesisConfigProvider() {
public GenesisConfigProvider getGenesisConfigProvider() {
return genesisConfigProvider;
}

6
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java
Unescape View File

@ -94,11 +94,11 @@ public class ProcessPantheonNodeRunner implements PantheonNodeRunner {
params.add("--bootnodes");
if (!node.bootnodes().isEmpty()) {
params.add(node.bootnodes().stream().map(URI::toString).collect(Collectors.joining(",")));
if (!node.getBootnodes().isEmpty()) {
params.add(node.getBootnodes().stream().map(URI::toString).collect(Collectors.joining(",")));
}
if (node.jsonRpcEnabled()) {
if (node.isJsonRpcEnabled()) {
params.add("--rpc-http-enabled");
params.add("--rpc-http-host");
params.add(node.jsonRpcListenHost().get());

4
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java
Unescape View File

@ -61,7 +61,7 @@ public class ThreadPantheonNodeRunner implements PantheonNodeRunner {
final MetricsSystem noOpMetricsSystem = new NoOpMetricsSystem();
final List<EnodeURL> bootnodes =
node.getConfiguration().bootnodes().stream()
node.getConfiguration().getBootnodes().stream()
.map(EnodeURL::fromURI)
.collect(Collectors.toList());
final EthNetworkConfig.Builder networkConfigBuilder =
@ -102,7 +102,7 @@ public class ThreadPantheonNodeRunner implements PantheonNodeRunner {
.pantheonController(pantheonController)
.ethNetworkConfig(ethNetworkConfig)
.discovery(node.isDiscoveryEnabled())
.p2pAdvertisedHost(node.hostName())
.p2pAdvertisedHost(node.getHostName())
.p2pListenPort(0)
.maxPeers(25)
.jsonRpcConfiguration(node.jsonRpcConfiguration())

6
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/Cluster.java
Unescape View File

@ -123,11 +123,11 @@ public class Cluster implements AutoCloseable {
}
private void startNode(final RunnableNode node) {
if (node.getConfiguration().bootnodes().isEmpty()) {
node.getConfiguration().bootnodes(bootnodes);
if (node.getConfiguration().getBootnodes().isEmpty()) {
node.getConfiguration().getBootnodes(bootnodes);
}
node.getConfiguration()
.genesisConfigProvider()
.getGenesisConfigProvider()
.createGenesisConfig(originalNodes)
.ifPresent(node.getConfiguration()::setGenesisConfig);
LOG.info(

2
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java
Unescape View File

@ -15,7 +15,7 @@ package tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster;
public class ClusterConfigurationBuilder {
private boolean awaitPeerDiscovery = true;
public ClusterConfigurationBuilder setAwaitPeerDiscovery(final boolean awaitPeerDiscovery) {
public ClusterConfigurationBuilder awaitPeerDiscovery(final boolean awaitPeerDiscovery) {
this.awaitPeerDiscovery = awaitPeerDiscovery;
return this;
}

22
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/factory/PantheonFactoryConfigurationBuilder.java
Unescape View File

@ -46,12 +46,12 @@ public class PantheonFactoryConfigurationBuilder {
private boolean discoveryEnabled = true;
private boolean bootnodeEligible = true;
public PantheonFactoryConfigurationBuilder setName(final String name) {
public PantheonFactoryConfigurationBuilder name(final String name) {
this.name = name;
return this;
}
public PantheonFactoryConfigurationBuilder setMiningParameters(
public PantheonFactoryConfigurationBuilder miningParameters(
final MiningParameters miningParameters) {
this.miningParameters = miningParameters;
return this;
@ -62,7 +62,7 @@ public class PantheonFactoryConfigurationBuilder {
return this;
}
public PantheonFactoryConfigurationBuilder setJsonRpcConfiguration(
public PantheonFactoryConfigurationBuilder jsonRpcConfiguration(
final JsonRpcConfiguration jsonRpcConfiguration) {
this.jsonRpcConfiguration = jsonRpcConfiguration;
return this;
@ -97,13 +97,13 @@ public class PantheonFactoryConfigurationBuilder {
return this;
}
public PantheonFactoryConfigurationBuilder setWebSocketConfiguration(
public PantheonFactoryConfigurationBuilder webSocketConfiguration(
final WebSocketConfiguration webSocketConfiguration) {
this.webSocketConfiguration = webSocketConfiguration;
return this;
}
public PantheonFactoryConfigurationBuilder setMetricsConfiguration(
public PantheonFactoryConfigurationBuilder metricsConfiguration(
final MetricsConfiguration metricsConfiguration) {
this.metricsConfiguration = metricsConfiguration;
return this;
@ -137,34 +137,34 @@ public class PantheonFactoryConfigurationBuilder {
return this;
}
public PantheonFactoryConfigurationBuilder setPermissioningConfiguration(
public PantheonFactoryConfigurationBuilder permissioningConfiguration(
final PermissioningConfiguration permissioningConfiguration) {
this.permissioningConfiguration = Optional.of(permissioningConfiguration);
return this;
}
public PantheonFactoryConfigurationBuilder setKeyFilePath(final String keyFilePath) {
public PantheonFactoryConfigurationBuilder keyFilePath(final String keyFilePath) {
this.keyFilePath = Optional.of(keyFilePath);
return this;
}
public PantheonFactoryConfigurationBuilder setDevMode(final boolean devMode) {
public PantheonFactoryConfigurationBuilder devMode(final boolean devMode) {
this.devMode = devMode;
return this;
}
public PantheonFactoryConfigurationBuilder setGenesisConfigProvider(
public PantheonFactoryConfigurationBuilder genesisConfigProvider(
final GenesisConfigProvider genesisConfigProvider) {
this.genesisConfigProvider = genesisConfigProvider;
return this;
}
public PantheonFactoryConfigurationBuilder setP2pEnabled(final Boolean p2pEnabled) {
public PantheonFactoryConfigurationBuilder p2pEnabled(final Boolean p2pEnabled) {
this.p2pEnabled = p2pEnabled;
return this;
}
public PantheonFactoryConfigurationBuilder setDiscoveryEnabled(final boolean discoveryEnabled) {
public PantheonFactoryConfigurationBuilder discoveryEnabled(final boolean discoveryEnabled) {
this.discoveryEnabled = discoveryEnabled;
return this;
}

92
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/factory/PantheonNodeFactory.java
Unescape View File

@ -66,7 +66,7 @@ public class PantheonNodeFactory {
public PantheonNode createMinerNode(final String name) throws IOException {
return create(
new PantheonFactoryConfigurationBuilder()
.setName(name)
.name(name)
.miningEnabled()
.jsonRpcEnabled()
.webSocketEnabled()
@ -78,10 +78,10 @@ public class PantheonNodeFactory {
throws IOException {
return create(
new PantheonFactoryConfigurationBuilder()
.setName(name)
.name(name)
.miningEnabled()
.jsonRpcEnabled()
.setKeyFilePath(keyFilePath)
.keyFilePath(keyFilePath)
.enablePrivateTransactions(privacyParameters)
.webSocketEnabled()
.build());
@ -92,9 +92,9 @@ public class PantheonNodeFactory {
throws IOException {
return create(
new PantheonFactoryConfigurationBuilder()
.setName(name)
.name(name)
.jsonRpcEnabled()
.setKeyFilePath(keyFilePath)
.keyFilePath(keyFilePath)
.enablePrivateTransactions(privacyParameters)
.webSocketEnabled()
.build());
@ -103,7 +103,7 @@ public class PantheonNodeFactory {
public PantheonNode createArchiveNode(final String name) throws IOException {
return create(
new PantheonFactoryConfigurationBuilder()
.setName(name)
.name(name)
.jsonRpcEnabled()
.webSocketEnabled()
.build());
@ -112,7 +112,7 @@ public class PantheonNodeFactory {
public Node createArchiveNodeThatMustNotBeTheBootnode(final String name) throws IOException {
return create(
new PantheonFactoryConfigurationBuilder()
.setName(name)
.name(name)
.jsonRpcEnabled()
.webSocketEnabled()
.bootnodeEligible(false)
@ -123,10 +123,10 @@ public class PantheonNodeFactory {
throws IOException {
return create(
new PantheonFactoryConfigurationBuilder()
.setName(name)
.setJsonRpcConfiguration(jsonRpcConfigWithAdmin())
.name(name)
.jsonRpcConfiguration(jsonRpcConfigWithAdmin())
.webSocketEnabled()
.setDiscoveryEnabled(false)
.discoveryEnabled(false)
.build());
}
@ -134,7 +134,7 @@ public class PantheonNodeFactory {
throws IOException, URISyntaxException {
return create(
new PantheonFactoryConfigurationBuilder()
.setName(name)
.name(name)
.jsonRpcEnabled()
.jsonRpcAuthenticationEnabled()
.webSocketEnabled()
@ -145,7 +145,7 @@ public class PantheonNodeFactory {
throws IOException, URISyntaxException {
return create(
new PantheonFactoryConfigurationBuilder()
.setName(name)
.name(name)
.webSocketEnabled()
.webSocketAuthenticationEnabled()
.build());
@ -154,23 +154,23 @@ public class PantheonNodeFactory {
public PantheonNode createNodeWithP2pDisabled(final String name) throws IOException {
return create(
new PantheonFactoryConfigurationBuilder()
.setName(name)
.setP2pEnabled(false)
.setJsonRpcConfiguration(createJsonRpcEnabledConfig())
.name(name)
.p2pEnabled(false)
.jsonRpcConfiguration(createJsonRpcEnabledConfig())
.build());
}
public PantheonNode createNodeWithP2pDisabledAndAdmin(final String name) throws IOException {
return create(
new PantheonFactoryConfigurationBuilder()
.setName(name)
.setP2pEnabled(false)
.setJsonRpcConfiguration(jsonRpcConfigWithAdmin())
.name(name)
.p2pEnabled(false)
.jsonRpcConfiguration(jsonRpcConfigWithAdmin())
.build());
}
public PantheonNode createArchiveNodeWithRpcDisabled(final String name) throws IOException {
return create(new PantheonFactoryConfigurationBuilder().setName(name).build());
return create(new PantheonFactoryConfigurationBuilder().name(name).build());
}
public PantheonNode createArchiveNodeWithRpcApis(
@ -182,38 +182,38 @@ public class PantheonNodeFactory {
return create(
new PantheonFactoryConfigurationBuilder()
.setName(name)
.setJsonRpcConfiguration(jsonRpcConfig)
.setWebSocketConfiguration(webSocketConfig)
.name(name)
.jsonRpcConfiguration(jsonRpcConfig)
.webSocketConfiguration(webSocketConfig)
.build());
}
public PantheonNode createNodeWithNoDiscovery(final String name) throws IOException {
return create(
new PantheonFactoryConfigurationBuilder().setName(name).setDiscoveryEnabled(false).build());
new PantheonFactoryConfigurationBuilder().name(name).discoveryEnabled(false).build());
}
public PantheonNode createCliqueNode(final String name) throws IOException {
return create(
new PantheonFactoryConfigurationBuilder()
.setName(name)
.name(name)
.miningEnabled()
.setJsonRpcConfiguration(createJsonRpcConfigWithClique())
.setWebSocketConfiguration(createWebSocketEnabledConfig())
.setDevMode(false)
.setGenesisConfigProvider(this::createCliqueGenesisConfig)
.jsonRpcConfiguration(createJsonRpcConfigWithClique())
.webSocketConfiguration(createWebSocketEnabledConfig())
.devMode(false)
.genesisConfigProvider(this::createCliqueGenesisConfig)
.build());
}
public PantheonNode createIbftNode(final String name) throws IOException {
return create(
new PantheonFactoryConfigurationBuilder()
.setName(name)
.name(name)
.miningEnabled()
.setJsonRpcConfiguration(createJsonRpcConfigWithIbft())
.setWebSocketConfiguration(createWebSocketEnabledConfig())
.setDevMode(false)
.setGenesisConfigProvider(this::createIbftGenesisConfig)
.jsonRpcConfiguration(createJsonRpcConfigWithIbft())
.webSocketConfiguration(createWebSocketEnabledConfig())
.devMode(false)
.genesisConfigProvider(this::createIbftGenesisConfig)
.build());
}
@ -222,11 +222,11 @@ public class PantheonNodeFactory {
final String genesisFile = readGenesisFile(genesisPath);
return create(
new PantheonFactoryConfigurationBuilder()
.setName(name)
.name(name)
.jsonRpcEnabled()
.webSocketEnabled()
.setGenesisConfigProvider((a) -> Optional.of(genesisFile))
.setDevMode(false)
.genesisConfigProvider((a) -> Optional.of(genesisFile))
.devMode(false)
.bootnodeEligible(canBeBootnode)
.build());
}
@ -236,12 +236,12 @@ public class PantheonNodeFactory {
return create(
new PantheonFactoryConfigurationBuilder()
.setName(name)
.name(name)
.miningEnabled()
.setJsonRpcConfiguration(createJsonRpcConfigWithClique())
.setWebSocketConfiguration(createWebSocketEnabledConfig())
.setDevMode(false)
.setGenesisConfigProvider(
.jsonRpcConfiguration(createJsonRpcConfigWithClique())
.webSocketConfiguration(createWebSocketEnabledConfig())
.devMode(false)
.genesisConfigProvider(
nodes ->
createGenesisConfigForValidators(
asList(validators), nodes, this::createCliqueGenesisConfig))
@ -253,12 +253,12 @@ public class PantheonNodeFactory {
return create(
new PantheonFactoryConfigurationBuilder()
.setName(name)
.name(name)
.miningEnabled()
.setJsonRpcConfiguration(createJsonRpcConfigWithIbft())
.setWebSocketConfiguration(createWebSocketEnabledConfig())
.setDevMode(false)
.setGenesisConfigProvider(
.jsonRpcConfiguration(createJsonRpcConfigWithIbft())
.webSocketConfiguration(createWebSocketEnabledConfig())
.devMode(false)
.genesisConfigProvider(
nodes ->
createGenesisConfigForValidators(
asList(validators), nodes, this::createIbftGenesisConfig))

10
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/factory/PermissionedNodeBuilder.java
Unescape View File

@ -148,15 +148,15 @@ public class PermissionedNodeBuilder {
final PantheonFactoryConfigurationBuilder builder = new PantheonFactoryConfigurationBuilder();
builder
.setName(name)
.setJsonRpcConfiguration(jsonRpcConfigWithPermApiEnabled())
.setPermissioningConfiguration(permissioningConfiguration)
.name(name)
.jsonRpcConfiguration(jsonRpcConfigWithPermApiEnabled())
.permissioningConfiguration(permissioningConfiguration)
.bootnodeEligible(false)
.miningEnabled();
if (genesisFile != null) {
builder.setGenesisConfigProvider((a) -> Optional.of(genesisFile));
builder.setDevMode(false);
builder.genesisConfigProvider((a) -> Optional.of(genesisFile));
builder.devMode(false);
}
try {

6
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketConnection.java
Unescape View File

@ -40,14 +40,14 @@ public class WebSocketConnection {
private volatile WebSocket connection;
public WebSocketConnection(final Vertx vertx, final NodeConfiguration node) {
if (!node.jsonRpcWebSocketPort().isPresent()) {
if (!node.getJsonRpcWebSocketPort().isPresent()) {
throw new IllegalStateException(
"Can't start websocket connection for node with RPC disabled");
}
subscriptionEvents = new ConcurrentLinkedDeque<>();
options = new RequestOptions();
options.setPort(node.jsonRpcWebSocketPort().get());
options.setHost(node.hostName());
options.setPort(node.getJsonRpcWebSocketPort().get());
options.setHost(node.getHostName());
connect(vertx);
}

2
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java
Unescape View File

@ -31,7 +31,7 @@ public class HttpServiceLoginAcceptanceTest extends AcceptanceTestBase {
@Before
public void setUp() throws IOException, URISyntaxException {
final ClusterConfiguration clusterConfiguration =
new ClusterConfigurationBuilder().setAwaitPeerDiscovery(false).build();
new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
authenticatedCluster = new Cluster(clusterConfiguration, net);
node = pantheon.createArchiveNodeWithAuthentication("node1");

2
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java
Unescape View File

@ -31,7 +31,7 @@ public class AdminAddPeerAcceptanceTest extends AcceptanceTestBase {
@Before
public void setUp() throws Exception {
final ClusterConfiguration clusterConfiguration =
new ClusterConfigurationBuilder().setAwaitPeerDiscovery(false).build();
new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
noDiscoveryCluster = new Cluster(clusterConfiguration, net);
nodeA = pantheon.createArchiveNodeWithDiscoveryDisabledAndAdmin("nodeA");
nodeB = pantheon.createArchiveNodeWithDiscoveryDisabledAndAdmin("nodeB");

2
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/LocalConfigNodePermissioningAcceptanceTest.java
Unescape View File

@ -32,7 +32,7 @@ public class LocalConfigNodePermissioningAcceptanceTest extends AcceptanceTestBa
@Before
public void setUp() throws Exception {
final ClusterConfiguration clusterConfiguration =
new ClusterConfigurationBuilder().setAwaitPeerDiscovery(false).build();
new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
permissionedCluster = new Cluster(clusterConfiguration, net);
bootnode = pantheon.createArchiveNode("bootnode");

2
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeSmartContractNodePermissioningAcceptanceTestBase.java
Unescape View File

@ -45,7 +45,7 @@ class NodeSmartContractNodePermissioningAcceptanceTestBase extends AcceptanceTes
private Cluster permissionedCluster() {
final ClusterConfiguration clusterConfiguration =
new ClusterConfigurationBuilder().setAwaitPeerDiscovery(false).build();
new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
return new Cluster(clusterConfiguration, net);
}

Write Preview
Loading…
Cancel
Save