Skip to content

remove smart contract perm tests #8595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 19, 2025
+4 −512
Merged

remove smart contract perm tests #8595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d02cb8
remove smart contract perm tests
macfarla May 8, 2025
9fcb551
remove smart contract perm setup from test node builder
macfarla May 8, 2025
37fb657
Merge branch 'main' into rm-onchain-perm-tests
macfarla May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 1 addition & 54 deletions ...r/besu/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@
import static java.util.Collections.singletonList;
import static java.util.stream.Collectors.toList;

import org.hyperledger.besu.datatypes.Address;
import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
import org.hyperledger.besu.ethereum.permissioning.AllowlistPersistor;
import org.hyperledger.besu.ethereum.permissioning.AllowlistPersistor.ALLOWLIST_TYPE;
import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration;
import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration;
import org.hyperledger.besu.plugin.data.EnodeURL;
import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
Expand Down Expand Up @@ -62,13 +60,6 @@ public class PermissionedNodeBuilder {
private Path localConfigAccountsPermissioningFile = null;
private Collection<String> localConfigPermittedAccounts = null;

private boolean nodeSmartContractPermissioningEnabled = false;
private String nodePermissioningSmartContractAddress = null;
private int nodePermissioningSmartContractInterfaceVersion = 1;

private boolean accountSmartContractPermissioningEnabled = false;
private String accountPermissioningSmartContractAddress = null;

private List<String> staticNodes = new ArrayList<>();
private boolean isDnsEnabled = false;
private boolean mining = true;
Expand Down Expand Up @@ -122,25 +113,6 @@ public PermissionedNodeBuilder accountsPermittedInConfig(final List<String> acco
return this;
}

public PermissionedNodeBuilder nodesContractEnabled(final String address) {
this.nodeSmartContractPermissioningEnabled = true;
this.nodePermissioningSmartContractAddress = address;
return this;
}

public PermissionedNodeBuilder nodesContractV2Enabled(final String address) {
this.nodeSmartContractPermissioningEnabled = true;
this.nodePermissioningSmartContractAddress = address;
this.nodePermissioningSmartContractInterfaceVersion = 2;
return this;
}

public PermissionedNodeBuilder accountsContractEnabled(final String address) {
this.accountSmartContractPermissioningEnabled = true;
this.accountPermissioningSmartContractAddress = address;
return this;
}

public PermissionedNodeBuilder staticNodes(final List<String> staticNodes) {
this.staticNodes = staticNodes;
return this;
Expand Down Expand Up @@ -172,13 +144,8 @@ public BesuNode build() {
localPermConfig = Optional.of(localConfigPermissioningConfiguration());
}

Optional<SmartContractPermissioningConfiguration> smartContractPermConfig = Optional.empty();
if (nodeSmartContractPermissioningEnabled || accountSmartContractPermissioningEnabled) {
smartContractPermConfig = Optional.of(smartContractPermissioningConfiguration());
}

final PermissioningConfiguration permissioningConfiguration =
new PermissioningConfiguration(localPermConfig, smartContractPermConfig);
new PermissioningConfiguration(localPermConfig, Optional.empty());

final BesuNodeConfigurationBuilder builder = new BesuNodeConfigurationBuilder();
builder
Expand Down Expand Up @@ -251,26 +218,6 @@ private LocalPermissioningConfiguration localConfigPermissioningConfiguration()
return localPermissioningConfiguration;
}

private SmartContractPermissioningConfiguration smartContractPermissioningConfiguration() {
SmartContractPermissioningConfiguration config =
SmartContractPermissioningConfiguration.createDefault();
if (nodePermissioningSmartContractAddress != null) {
config.setNodeSmartContractAddress(
Address.fromHexString(nodePermissioningSmartContractAddress));
config.setSmartContractNodeAllowlistEnabled(true);
}

if (accountPermissioningSmartContractAddress != null) {
config.setAccountSmartContractAddress(
Address.fromHexString(accountPermissioningSmartContractAddress));
config.setSmartContractAccountAllowlistEnabled(true);
}

config.setNodeSmartContractInterfaceVersion(nodePermissioningSmartContractInterfaceVersion);

return config;
}

private Path createTemporaryPermissionsFile() {
final File tempFile;
try {
Expand Down
214 changes: 0 additions & 214 deletions besu/src/test/java/org/hyperledger/besu/cli/options/PermissionsOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@
import static org.mockito.Mockito.verify;

import org.hyperledger.besu.cli.CommandTestAbstract;
import org.hyperledger.besu.datatypes.Address;
import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration;
import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration;
import org.hyperledger.besu.plugin.data.EnodeURL;

import java.io.IOException;
Expand Down Expand Up @@ -83,218 +81,6 @@ public void errorIsRaisedIfStaticNodesAreNotAllowed(final @TempDir Path testFold
.contains(staticNodeURI.toString(), "not in nodes-allowlist");
}

@Test
public void nodePermissionsSmartContractWithoutOptionMustError() {
parseCommand("--permissions-nodes-contract-address");

Mockito.verifyNoInteractions(mockRunnerBuilder);

assertThat(commandErrorOutput.toString(UTF_8))
.startsWith("Missing required parameter for option '--permissions-nodes-contract-address'");
assertThat(commandOutput.toString(UTF_8)).isEmpty();
}

@Test
public void nodePermissionsEnabledWithoutContractAddressMustError() {
parseCommand("--permissions-nodes-contract-enabled");

Mockito.verifyNoInteractions(mockRunnerBuilder);

assertThat(commandErrorOutput.toString(UTF_8))
.contains("No node permissioning contract address specified");
assertThat(commandOutput.toString(UTF_8)).isEmpty();
}

@Test
public void nodePermissionsEnabledWithInvalidContractAddressMustError() {
parseCommand(
"--permissions-nodes-contract-enabled",
"--permissions-nodes-contract-address",
"invalid-smart-contract-address");

Mockito.verifyNoInteractions(mockRunnerBuilder);

assertThat(commandErrorOutput.toString(UTF_8)).contains("Invalid value");
assertThat(commandOutput.toString(UTF_8)).isEmpty();
}

@Test
public void nodePermissionsEnabledWithTooShortContractAddressMustError() {
parseCommand(
"--permissions-nodes-contract-enabled", "--permissions-nodes-contract-address", "0x1234");

Mockito.verifyNoInteractions(mockRunnerBuilder);

assertThat(commandErrorOutput.toString(UTF_8)).contains("Invalid value");
assertThat(commandOutput.toString(UTF_8)).isEmpty();
}

@Test
public void nodePermissionsSmartContractMustUseOption() {

final String smartContractAddress = "0x0000000000000000000000000000000000001234";

parseCommand(
"--permissions-nodes-contract-enabled",
"--permissions-nodes-contract-address",
smartContractAddress);
final SmartContractPermissioningConfiguration smartContractPermissioningConfiguration =
new SmartContractPermissioningConfiguration();
smartContractPermissioningConfiguration.setNodeSmartContractAddress(
Address.fromHexString(smartContractAddress));
smartContractPermissioningConfiguration.setSmartContractNodeAllowlistEnabled(true);

verify(mockRunnerBuilder)
.permissioningConfiguration(permissioningConfigurationArgumentCaptor.capture());
verify(mockRunnerBuilder).build();

final PermissioningConfiguration config =
permissioningConfigurationArgumentCaptor.getValue().get();
assertThat(config.getSmartContractConfig().get())
.usingRecursiveComparison()
.isEqualTo(smartContractPermissioningConfiguration);

assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).isEmpty();
}

@Test
public void nodePermissionsContractVersionDefaultValue() {
final SmartContractPermissioningConfiguration expectedConfig =
new SmartContractPermissioningConfiguration();
expectedConfig.setNodeSmartContractAddress(
Address.fromHexString("0x0000000000000000000000000000000000001234"));
expectedConfig.setSmartContractNodeAllowlistEnabled(true);
expectedConfig.setNodeSmartContractInterfaceVersion(1);

parseCommand(
"--permissions-nodes-contract-enabled",
"--permissions-nodes-contract-address",
"0x0000000000000000000000000000000000001234");

verify(mockRunnerBuilder)
.permissioningConfiguration(permissioningConfigurationArgumentCaptor.capture());
verify(mockRunnerBuilder).build();

final PermissioningConfiguration config =
permissioningConfigurationArgumentCaptor.getValue().get();
assertThat(config.getSmartContractConfig().get())
.usingRecursiveComparison()
.isEqualTo(expectedConfig);

assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).isEmpty();
}

@Test
public void nodePermissionsContractVersionSetsValue() {
final SmartContractPermissioningConfiguration expectedConfig =
new SmartContractPermissioningConfiguration();
expectedConfig.setNodeSmartContractAddress(
Address.fromHexString("0x0000000000000000000000000000000000001234"));
expectedConfig.setSmartContractNodeAllowlistEnabled(true);
expectedConfig.setNodeSmartContractInterfaceVersion(2);

parseCommand(
"--permissions-nodes-contract-enabled",
"--permissions-nodes-contract-address",
"0x0000000000000000000000000000000000001234",
"--permissions-nodes-contract-version",
"2");

verify(mockRunnerBuilder)
.permissioningConfiguration(permissioningConfigurationArgumentCaptor.capture());
verify(mockRunnerBuilder).build();

final PermissioningConfiguration config =
permissioningConfigurationArgumentCaptor.getValue().get();
assertThat(config.getSmartContractConfig().get())
.usingRecursiveComparison()
.isEqualTo(expectedConfig);

assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).isEmpty();
}

@Test
public void accountPermissionsSmartContractWithoutOptionMustError() {
parseCommand("--permissions-accounts-contract-address");

Mockito.verifyNoInteractions(mockRunnerBuilder);

assertThat(commandErrorOutput.toString(UTF_8))
.startsWith(
"Missing required parameter for option '--permissions-accounts-contract-address'");
assertThat(commandOutput.toString(UTF_8)).isEmpty();
}

@Test
public void accountPermissionsEnabledWithoutContractAddressMustError() {
parseCommand("--permissions-accounts-contract-enabled");

Mockito.verifyNoInteractions(mockRunnerBuilder);

assertThat(commandErrorOutput.toString(UTF_8))
.contains("No account permissioning contract address specified");
assertThat(commandOutput.toString(UTF_8)).isEmpty();
}

@Test
public void accountPermissionsEnabledWithInvalidContractAddressMustError() {
parseCommand(
"--permissions-accounts-contract-enabled",
"--permissions-accounts-contract-address",
"invalid-smart-contract-address");

Mockito.verifyNoInteractions(mockRunnerBuilder);

assertThat(commandErrorOutput.toString(UTF_8)).contains("Invalid value");
assertThat(commandOutput.toString(UTF_8)).isEmpty();
}

@Test
public void accountPermissionsEnabledWithTooShortContractAddressMustError() {
parseCommand(
"--permissions-accounts-contract-enabled",
"--permissions-accounts-contract-address",
"0x1234");

Mockito.verifyNoInteractions(mockRunnerBuilder);

assertThat(commandErrorOutput.toString(UTF_8)).contains("Invalid value");
assertThat(commandOutput.toString(UTF_8)).isEmpty();
}

@Test
public void accountPermissionsSmartContractMustUseOption() {
final String smartContractAddress = "0x0000000000000000000000000000000000001234";

parseCommand(
"--permissions-accounts-contract-enabled",
"--permissions-accounts-contract-address",
smartContractAddress);
final SmartContractPermissioningConfiguration smartContractPermissioningConfiguration =
new SmartContractPermissioningConfiguration();
smartContractPermissioningConfiguration.setAccountSmartContractAddress(
Address.fromHexString(smartContractAddress));
smartContractPermissioningConfiguration.setSmartContractAccountAllowlistEnabled(true);

verify(mockRunnerBuilder)
.permissioningConfiguration(permissioningConfigurationArgumentCaptor.capture());
final PermissioningConfiguration permissioningConfiguration =
permissioningConfigurationArgumentCaptor.getValue().get();
assertThat(permissioningConfiguration.getSmartContractConfig()).isPresent();

final SmartContractPermissioningConfiguration effectiveSmartContractConfig =
permissioningConfiguration.getSmartContractConfig().get();
assertThat(effectiveSmartContractConfig.isSmartContractAccountAllowlistEnabled()).isTrue();
assertThat(effectiveSmartContractConfig.getAccountSmartContractAddress())
.isEqualTo(Address.fromHexString(smartContractAddress));

assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
assertThat(commandOutput.toString(UTF_8)).isEmpty();
}

@Test
public void nodePermissioningTomlPathWithoutOptionMustDisplayUsage() {
parseCommand("--permissions-nodes-config-file");
Expand Down
Loading
Loading