diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java index a0f21603c1..aebed6f605 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java @@ -17,7 +17,6 @@ import tech.pegasys.pantheon.cli.EthNetworkConfig; import tech.pegasys.pantheon.ethereum.jsonrpc.RpcApi; import tech.pegasys.pantheon.ethereum.jsonrpc.RpcApis; -import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfiguration; import java.io.File; import java.io.IOException; @@ -75,17 +74,6 @@ public void startNode(final PantheonNode node) { params.add("--bootnodes"); params.add(String.join(",", node.bootnodes().toString())); - final PermissioningConfiguration permissioningConfiguration = - node.getPermissioningConfiguration(); - if (permissioningConfiguration.isNodeWhitelistSet()) { - params.add("--nodes-whitelist"); - params.add(String.join(",", permissioningConfiguration.getNodeWhitelist().toString())); - } - if (permissioningConfiguration.isAccountWhitelistSet()) { - params.add("--accounts-whitelist"); - params.add(String.join(",", permissioningConfiguration.getAccountWhitelist().toString())); - } - if (node.jsonRpcEnabled()) { params.add("--rpc-enabled"); params.add("--rpc-listen"); diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java b/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java index 3823343484..e289ad6ac6 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java @@ -453,29 +453,6 @@ private Long configureRefreshDelay(final Long refreshDelay) { ) private final Boolean permissionsAccountsEnabled = false; - // Permissioning: A list of whitelist nodes can be passed. - @Option( - names = {"--nodes-whitelist"}, - description = - "Comma separated enode URLs for permissioned networks. " - + "Not intended to be used with mainnet or public testnets.", - split = ",", - arity = "0..*", - converter = EnodeToURIPropertyConverter.class - ) - private final Collection nodesWhitelist = null; - - @Option( - names = {"--accounts-whitelist"}, - paramLabel = "", - description = - "Comma separated hex strings of account public keys " - + "for permissioned/role-based transactions. You may specify an empty list.", - split = ",", - arity = "0..*" - ) - private final Collection accountsWhitelist = null; - @Option( names = {"--privacy-url"}, description = "The URL on which enclave is running " diff --git a/pantheon/src/test/resources/everything_config.toml b/pantheon/src/test/resources/everything_config.toml index fd0ca59039..a910d3053d 100644 --- a/pantheon/src/test/resources/everything_config.toml +++ b/pantheon/src/test/resources/everything_config.toml @@ -64,8 +64,6 @@ miner-extra-data="0x444F4E27542050414E4943202120484F444C2C20484F444C2C20484F444C min-gas-price="1" # Permissioning -accounts-whitelist=["0x0000000000000000000000000000000000000009"] -nodes-whitelist=["all"] permissions-nodes-enabled=false permissions-accounts-enabled=false