From 79bd915e2e2b9a0eae29aba748642ad34408498f Mon Sep 17 00:00:00 2001 From: Trent Mohay <37158202+rain-on@users.noreply.github.com> Date: Mon, 16 Sep 2019 21:42:25 +1000 Subject: [PATCH] Moving AT DSL into its own module (#3) This allows the acceptance testing DSL to be published as part of the Besu internal jar files - which in turn means the DSL can be reused in other projects. Signed-off-by: Trent Mohay --- acceptance-tests/build.gradle | 81 +------------------ acceptance-tests/dsl/build.gradle | 47 +++++++++++ .../acceptance/dsl/AcceptanceTestBase.java | 0 .../besu/tests/acceptance/dsl/BlockUtils.java | 0 .../acceptance/dsl/StaticNodesUtils.java | 0 .../besu/tests/acceptance/dsl/WaitUtils.java | 0 .../tests/acceptance/dsl/account/Account.java | 0 .../acceptance/dsl/account/Accounts.java | 0 .../acceptance/dsl/blockchain/Amount.java | 0 .../acceptance/dsl/blockchain/Blockchain.java | 0 .../acceptance/dsl/condition/Condition.java | 0 .../account/ExpectAccountBalance.java | 0 .../ExpectAccountBalanceNotChanging.java | 0 .../dsl/condition/admin/AdminConditions.java | 0 .../dsl/condition/admin/ExpectPeerAdded.java | 0 .../blockchain/ExpectBeneficiary.java | 0 .../blockchain/ExpectBlockNotCreated.java | 0 .../blockchain/ExpectBlockNumberAbove.java | 0 .../blockchain/ExpectMinimumBlockNumber.java | 0 .../clique/AwaitSignerSetChange.java | 0 .../condition/clique/CliqueConditions.java | 0 .../dsl/condition/clique/ExpectNonceVote.java | 0 .../dsl/condition/clique/ExpectProposals.java | 0 .../condition/clique/ExpectValidators.java | 0 .../clique/ExpectValidatorsAtBlock.java | 0 .../clique/ExpectValidatorsAtBlockHash.java | 0 .../clique/ExpectedBlockHasProposer.java | 0 .../dsl/condition/eth/EthConditions.java | 0 .../eth/ExpectEthAccountsException.java | 0 ...xpectEthGetTransactionReceiptIsAbsent.java | 0 .../eth/ExpectEthGetWorkException.java | 0 .../ExpectEthSendRawTransactionException.java | 0 ...ectSuccessfulEthGetTransactionReceipt.java | 0 ...fulEthGetTransactionReceiptWithReason.java | 0 ...EthGetTransactionReceiptWithoutReason.java | 0 .../eth/SanityCheckEthGetWorkValues.java | 0 .../ibft2/AwaitValidatorSetChange.java | 0 .../dsl/condition/ibft2/ExpectProposals.java | 0 .../dsl/condition/ibft2/ExpectValidators.java | 0 .../dsl/condition/ibft2/Ibft2Conditions.java | 0 .../condition/login/AwaitLoginResponse.java | 0 .../condition/login/ExpectLoginSuccess.java | 0 .../login/ExpectLoginUnauthorized.java | 0 .../dsl/condition/login/LoginConditions.java | 0 .../miner/MiningStatusCondition.java | 0 .../dsl/condition/net/AwaitNetPeerCount.java | 0 .../net/AwaitNetPeerCountException.java | 0 ...NetServicesReturnsAllServicesAsActive.java | 0 ...ctNetServicesReturnsOnlyJsonRpcActive.java | 0 .../ExpectNetVersionConnectionException.java | 0 ...etVersionConnectionExceptionWithCause.java | 0 .../net/ExpectNetVersionIsNotBlank.java | 0 .../ExpectNetVersionPermissionException.java | 0 ...PermissionJsonRpcUnauthorizedResponse.java | 0 .../dsl/condition/net/NetConditions.java | 0 ...tSmartContractPermissioningConditions.java | 0 .../AddAccountsToWhitelistSuccessfully.java | 0 .../dsl/condition/perm/AddNodeSuccess.java | 0 .../perm/GetExpectedAccountsWhitelist.java | 0 .../perm/GetNodesWhitelistPopulated.java | 0 ...eSmartContractPermissioningConditions.java | 0 .../perm/PermissioningConditions.java | 0 ...moveAccountsFromWhitelistSuccessfully.java | 0 .../dsl/condition/perm/RemoveNodeSuccess.java | 0 .../condition/perm/WaitForFalseResponse.java | 0 .../condition/perm/WaitForTrueResponse.java | 0 .../perm/WhiteListContainsKeyAndValue.java | 0 .../condition/web3/ExpectWeb3Sha3Equals.java | 0 .../dsl/condition/web3/Web3Conditions.java | 0 .../dsl/contract/ContractVerifier.java | 0 .../ExpectValidTransactionReceipt.java | 0 .../dsl/ethsigner/EthSignerClient.java | 0 .../dsl/ethsigner/EthSignerClientTest.java | 0 .../ethsigner/PrivateTransactionRequest.java | 0 .../ethsigner/testutil/EthSignerConfig.java | 0 .../testutil/EthSignerTestHarness.java | 0 .../testutil/EthSignerTestHarnessFactory.java | 0 .../tests/acceptance/dsl/node/BesuNode.java | 0 .../acceptance/dsl/node/BesuNodeRunner.java | 0 .../besu/tests/acceptance/dsl/node/Node.java | 0 .../dsl/node/ProcessBesuNodeRunner.java | 2 +- .../acceptance/dsl/node/RunnableNode.java | 0 .../dsl/node/ThreadBesuNodeRunner.java | 0 .../acceptance/dsl/node/cluster/Cluster.java | 0 .../node/cluster/ClusterConfiguration.java | 0 .../cluster/ClusterConfigurationBuilder.java | 0 .../configuration/BesuNodeConfiguration.java | 0 .../BesuNodeConfigurationBuilder.java | 0 .../node/configuration/BesuNodeFactory.java | 0 .../node/configuration/NodeConfiguration.java | 0 .../NodeConfigurationFactory.java | 0 .../genesis/GenesisConfigurationFactory.java | 0 .../genesis/GenesisConfigurationProvider.java | 0 .../PermissionedNodeBuilder.java | 0 .../privacy/PrivacyNodeConfiguration.java | 0 .../privacy/PrivacyNodeFactory.java | 0 .../privacy/PrivacyAcceptanceTestBase.java | 0 .../dsl/privacy/PrivacyCluster.java | 0 .../acceptance/dsl/privacy/PrivacyNode.java | 0 .../dsl/privacy/account/PrivacyAccount.java | 0 .../account/PrivacyAccountResolver.java | 0 .../EeaGetTransactionReceiptTransaction.java | 0 ...nternalErrorPrivateTransactionReceipt.java | 0 .../ExpectNoPrivateTransactionReceipt.java | 0 .../ExpectValidPrivacyGroupCreated.java | 0 ...ctValidPrivateContractDeployedReceipt.java | 0 .../ExpectValidPrivateTransactionReceipt.java | 0 .../privacy/condition/PrivateCondition.java | 0 .../condition/PrivateContractCondition.java | 0 .../condition/PrivateContractVerifier.java | 0 .../condition/PrivateTransactionVerifier.java | 0 .../CallPrivateSmartContractFunction.java | 0 ...DeployPrivateSmartContractTransaction.java | 0 ...ContractWithPrivacyGroupIdTransaction.java | 0 .../LoadPrivateSmartContractTransaction.java | 0 .../contract/PrivateContractTransactions.java | 0 .../CreatePrivacyGroupTransaction.java | 0 .../FindPrivacyGroupTransaction.java | 0 .../GetAllPrivacyMarkerTransactionHashes.java | 0 .../transaction/PrivacyTransactions.java | 0 .../dsl/pubsub/JsonRpcSuccessEvent.java | 0 .../acceptance/dsl/pubsub/Subscription.java | 0 .../dsl/pubsub/SubscriptionEvent.java | 0 .../acceptance/dsl/pubsub/WebSocket.java | 0 .../dsl/pubsub/WebSocketConnection.java | 0 .../acceptance/dsl/pubsub/WebSocketEvent.java | 0 .../CallSmartContractFunction.java | 0 .../DeploySmartContractTransaction.java | 0 .../dsl/transaction/NodeRequests.java | 0 .../dsl/transaction/Transaction.java | 0 .../account/AccountTransactions.java | 0 .../account/TransferTransaction.java | 0 .../account/TransferTransactionBuilder.java | 0 .../account/TransferTransactionSet.java | 0 .../transaction/admin/AddPeerTransaction.java | 0 .../admin/AdminRequestFactory.java | 0 .../transaction/admin/AdminTransactions.java | 0 .../dsl/transaction/clique/CliqueDiscard.java | 0 .../transaction/clique/CliqueGetSigners.java | 0 .../clique/CliqueGetSignersAtHash.java | 0 .../transaction/clique/CliqueProposals.java | 0 .../dsl/transaction/clique/CliquePropose.java | 0 .../clique/CliqueRequestFactory.java | 0 .../clique/CliqueTransactions.java | 0 .../contract/ContractTransactions.java | 0 .../eth/EthAccountsTransaction.java | 0 .../eth/EthBlockNumberTransaction.java | 0 .../eth/EthGetBalanceTransaction.java | 0 .../eth/EthGetBlockTransaction.java | 0 .../EthGetTransactionCountTransaction.java | 0 .../EthGetTransactionReceiptTransaction.java | 0 ...GetTransactionReceiptWithRevertReason.java | 0 .../eth/EthGetWorkTransaction.java | 0 .../transaction/eth/EthMiningTransaction.java | 0 .../eth/EthSendRawTransactionTransaction.java | 0 .../dsl/transaction/eth/EthTransactions.java | 0 .../dsl/transaction/ibft2/Ibft2Discard.java | 0 .../transaction/ibft2/Ibft2GetValidators.java | 0 .../ibft2/Ibft2GetValidatorsAtHash.java | 0 .../dsl/transaction/ibft2/Ibft2Proposals.java | 0 .../dsl/transaction/ibft2/Ibft2Propose.java | 0 .../ibft2/Ibft2RequestFactory.java | 0 .../transaction/ibft2/Ibft2Transactions.java | 0 .../login/LoginRequestFactory.java | 0 .../login/LoginSuccessfulTransaction.java | 0 .../transaction/login/LoginTransaction.java | 0 .../login/LoginUnauthorizedTransaction.java | 0 .../miner/MinerRequestFactory.java | 0 .../miner/MinerStartTransaction.java | 0 .../miner/MinerStopTransaction.java | 0 .../transaction/miner/MinerTransactions.java | 0 .../transaction/net/CustomRequestFactory.java | 0 .../net/NetPeerCountTransaction.java | 0 .../net/NetServicesTransaction.java | 0 .../dsl/transaction/net/NetTransactions.java | 0 .../net/NetVersionTransaction.java | 0 ...tPermissioningAllowAccountTransaction.java | 0 ...PermissioningForbidAccountTransaction.java | 0 ...ractPermissioningIsAllowedTransaction.java | 0 ...martContractPermissioningTransactions.java | 0 ...ractPermissioningAllowNodeTransaction.java | 0 ...sioningConnectionIsAllowedTransaction.java | 0 ...actPermissioningForbidNodeTransaction.java | 0 ...ractPermissioningIsAllowedTransaction.java | 0 ...martContractPermissioningTransactions.java | 0 ...PermAddAccountsToWhitelistTransaction.java | 0 .../perm/PermAddNodeTransaction.java | 0 .../PermGetAccountsWhitelistTransaction.java | 0 .../PermGetNodesWhitelistTransaction.java | 0 ...emoveAccountsFromWhitelistTransaction.java | 0 .../perm/PermRemoveNodeTransaction.java | 0 .../PermissioningJsonRpcRequestFactory.java | 0 .../perm/PermissioningTransactions.java | 0 .../privacy/PrivacyRequestFactory.java | 0 .../transaction/web3/Web3Sha3Transaction.java | 0 .../transaction/web3/Web3Transactions.java | 0 acceptance-tests/tests/build.gradle | 51 ++++++++++++ .../.gitignore | 0 .../README.md | 0 .../contracts/Migrations.sol | 0 .../contracts/SimpleAccountPermissioning.sol | 0 .../contracts/SimpleNodePermissioning.sol | 0 .../migrations/1_initial_migration.js | 0 .../migrations/2_deploy_contracts.js | 0 .../test/test-account-permissioning.js | 0 .../test/test-node-permissioning.js | 0 .../truffle.js | 0 .../acceptance/ClusterAcceptanceTest.java | 0 .../ClusterNoDiscoveryAcceptanceTest.java | 0 ...ClusterThreadNodeRunnerAcceptanceTest.java | 0 .../CreateAccountAcceptanceTest.java | 0 .../acceptance/MetricsAcceptanceTest.java | 0 .../acceptance/P2pDisabledAcceptanceTest.java | 0 .../RpcApisTogglesAcceptanceTest.java | 0 .../acceptance/StaticNodesAcceptanceTest.java | 0 .../CliqueDiscardRpcAcceptanceTest.java | 0 .../clique/CliqueGetSignersRpcTest.java | 0 .../clique/CliqueMiningAcceptanceTest.java | 0 .../CliqueProposalRpcAcceptanceTest.java | 0 .../CliqueProposeRpcAcceptanceTest.java | 0 .../clique/CliqueZeroValidators.java | 0 .../ibft2/Ibft2DiscardRpcAcceptanceTest.java | 0 .../ibft2/Ibft2MiningAcceptanceTest.java | 0 .../ibft2/Ibft2ProposalRpcAcceptanceTest.java | 0 .../ibft2/Ibft2ProposeRpcAcceptanceTest.java | 0 .../acceptance/ibft2/Ibft2ZeroValidators.java | 0 .../jsonrpc/EthGetWorkAcceptanceTest.java | 0 .../HttpServiceLoginAcceptanceTest.java | 0 .../jsonrpc/NetServicesAcceptanceTest.java | 0 .../jsonrpc/Web3Sha3AcceptanceTest.java | 0 .../WebsocketServiceLoginAcceptanceTest.java | 0 .../admin/AdminAddPeerAcceptanceTest.java | 0 .../mining/MiningAcceptanceTest.java | 0 ...AndOnChainPermissioningAcceptanceTest.java | 0 ...ocalConfigPermissioningAcceptanceTest.java | 0 ...rtContractPermissioningAcceptanceTest.java | 0 ...ntractPermissioningAcceptanceTestBase.java | 0 ...AndOnChainPermissioningAcceptanceTest.java | 0 ...ocalConfigPermissioningAcceptanceTest.java | 0 ...rtContractPermissioningAcceptanceTest.java | 0 ...ntractPermissioningAcceptanceTestBase.java | 0 ...tPermissioningOutOfSyncAcceptanceTest.java | 0 ...ermissioningStaticNodesAcceptanceTest.java | 0 .../WhitelistPersistorAcceptanceTest.java | 0 .../plugins/BesuEventsPluginTest.java | 0 .../plugins/PicoCLIOptionsPluginTest.java | 0 .../NewPendingTransactionAcceptanceTest.java | 0 .../DeploySmartContractAcceptanceTest.java | 0 .../DeployTransactionAcceptanceTest.java | 0 .../besu/tests/web3j/EventEmitter.sol | 0 .../web3j/EventEmitterAcceptanceTest.java | 0 .../besu/tests/web3j/RevertReason.sol | 0 .../web3j/RevertReasonAcceptanceTest.java | 0 .../besu/tests/web3j/SimpleStorage.sol | 0 .../tests/web3j/generated/EventEmitter.abi | 0 .../tests/web3j/generated/EventEmitter.bin | 0 .../tests/web3j/generated/EventEmitter.java | 0 .../tests/web3j/generated/RevertReason.abi | 0 .../tests/web3j/generated/RevertReason.bin | 0 .../tests/web3j/generated/RevertReason.java | 0 .../tests/web3j/generated/SimpleStorage.abi | 0 .../tests/web3j/generated/SimpleStorage.bin | 0 .../tests/web3j/generated/SimpleStorage.java | 0 ...loyPrivateSmartContractAcceptanceTest.java | 0 .../privacy/EnclaveErrorAcceptanceTest.java | 0 .../privacy/EthSignerAcceptanceTest.java | 0 .../Ibft2PrivacyClusterAcceptanceTest.java | 0 .../privacy/PrivacyClusterAcceptanceTest.java | 0 .../privacy/PrivacyGroupAcceptanceTest.java | 0 .../test/resources/authentication/auth.toml | 0 .../src/test/resources/clique/clique.json | 0 .../src/test/resources/ibft/ibft.json | 0 .../src/test/resources/ibft/privacy-ibft.json | 0 .../{ => tests}/src/test/resources/key | 0 .../{ => tests}/src/test/resources/key1 | 0 .../{ => tests}/src/test/resources/key2 | 0 .../{ => tests}/src/test/resources/log4j2.xml | 0 .../simple_permissioning_genesis.json | 0 settings.gradle | 3 +- 279 files changed, 102 insertions(+), 82 deletions(-) create mode 100644 acceptance-tests/dsl/build.gradle rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/StaticNodesUtils.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/WaitUtils.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/account/Account.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/account/Accounts.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Amount.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Blockchain.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/Condition.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalance.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalanceNotChanging.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/AdminConditions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/ExpectPeerAdded.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBeneficiary.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBlockNotCreated.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBlockNumberAbove.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectMinimumBlockNumber.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/CliqueConditions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectProposals.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidators.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/EthConditions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthAccountsException.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthGetTransactionReceiptIsAbsent.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthGetWorkException.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthSendRawTransactionException.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceipt.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithReason.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithoutReason.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/SanityCheckEthGetWorkValues.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/AwaitLoginResponse.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/ExpectLoginSuccess.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/ExpectLoginUnauthorized.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/LoginConditions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/miner/MiningStatusCondition.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/AwaitNetPeerCount.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/AwaitNetPeerCountException.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionException.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionExceptionWithCause.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionIsNotBlank.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionException.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionJsonRpcUnauthorizedResponse.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/NetConditions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AccountSmartContractPermissioningConditions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AddAccountsToWhitelistSuccessfully.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AddNodeSuccess.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/GetExpectedAccountsWhitelist.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningConditions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/PermissioningConditions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/RemoveAccountsFromWhitelistSuccessfully.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/RemoveNodeSuccess.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WaitForFalseResponse.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WaitForTrueResponse.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WhiteListContainsKeyAndValue.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/web3/ExpectWeb3Sha3Equals.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/condition/web3/Web3Conditions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/contract/ContractVerifier.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/contract/ExpectValidTransactionReceipt.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClient.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNodeRunner.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/Node.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java (99%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/RunnableNode.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/Cluster.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/ClusterConfiguration.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfiguration.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfiguration.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationProvider.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyCluster.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccount.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectInternalErrorPrivateTransactionReceipt.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectNoPrivateTransactionReceipt.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivacyGroupCreated.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateContractDeployedReceipt.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateCondition.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateContractCondition.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateContractVerifier.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/CallPrivateSmartContractFunction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/FindPrivacyGroupTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/Subscription.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/SubscriptionEvent.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocket.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketConnection.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketEvent.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/CallSmartContractFunction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/DeploySmartContractTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/NodeRequests.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/Transaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/AccountTransactions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AddPeerTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminRequestFactory.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminTransactions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueDiscard.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueProposals.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliquePropose.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/contract/ContractTransactions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthAccountsTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthBlockNumberTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetBalanceTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetBlockTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionCountTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithRevertReason.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetWorkTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthMiningTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthSendRawTransactionTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthTransactions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginSuccessfulTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginUnauthorizedTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerRequestFactory.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerStartTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerStopTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerTransactions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/CustomRequestFactory.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetPeerCountTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetServicesTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetTransactions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetVersionTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermAddAccountsToWhitelistTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermAddNodeTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermGetAccountsWhitelistTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermGetNodesWhitelistTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermRemoveAccountsFromWhitelistTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermRemoveNodeTransaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningTransactions.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/web3/Web3Sha3Transaction.java (100%) rename acceptance-tests/{src/test-support => dsl/src/main}/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/web3/Web3Transactions.java (100%) create mode 100644 acceptance-tests/tests/build.gradle rename acceptance-tests/{ => tests}/simple-permissioning-smart-contract/.gitignore (100%) rename acceptance-tests/{ => tests}/simple-permissioning-smart-contract/README.md (100%) rename acceptance-tests/{ => tests}/simple-permissioning-smart-contract/contracts/Migrations.sol (100%) rename acceptance-tests/{ => tests}/simple-permissioning-smart-contract/contracts/SimpleAccountPermissioning.sol (100%) rename acceptance-tests/{ => tests}/simple-permissioning-smart-contract/contracts/SimpleNodePermissioning.sol (100%) rename acceptance-tests/{ => tests}/simple-permissioning-smart-contract/migrations/1_initial_migration.js (100%) rename acceptance-tests/{ => tests}/simple-permissioning-smart-contract/migrations/2_deploy_contracts.js (100%) rename acceptance-tests/{ => tests}/simple-permissioning-smart-contract/test/test-account-permissioning.js (100%) rename acceptance-tests/{ => tests}/simple-permissioning-smart-contract/test/test-node-permissioning.js (100%) rename acceptance-tests/{ => tests}/simple-permissioning-smart-contract/truffle.js (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/CreateAccountAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/MetricsAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/P2pDisabledAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/RpcApisTogglesAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/StaticNodesAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueDiscardRpcAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueGetSignersRpcTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueMiningAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposalRpcAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposeRpcAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueZeroValidators.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2DiscardRpcAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2MiningAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposalRpcAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposeRpcAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ZeroValidators.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthGetWorkAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/WebsocketServiceLoginAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/mining/MiningAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalAndOnChainPermissioningAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalConfigPermissioningAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTestBase.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalAndOnChainPermissioningAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalConfigPermissioningAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTestBase.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningOutOfSyncAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodesSmartContractPermissioningStaticNodesAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/WhitelistPersistorAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BesuEventsPluginTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PicoCLIOptionsPluginTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/DeploySmartContractAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/DeployTransactionAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitter.sol (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitterAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/RevertReason.sol (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/RevertReasonAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/SimpleStorage.sol (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.abi (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.bin (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.abi (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.bin (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.abi (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.bin (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyGroupAcceptanceTest.java (100%) rename acceptance-tests/{ => tests}/src/test/resources/authentication/auth.toml (100%) rename acceptance-tests/{ => tests}/src/test/resources/clique/clique.json (100%) rename acceptance-tests/{ => tests}/src/test/resources/ibft/ibft.json (100%) rename acceptance-tests/{ => tests}/src/test/resources/ibft/privacy-ibft.json (100%) rename acceptance-tests/{ => tests}/src/test/resources/key (100%) rename acceptance-tests/{ => tests}/src/test/resources/key1 (100%) rename acceptance-tests/{ => tests}/src/test/resources/key2 (100%) rename acceptance-tests/{ => tests}/src/test/resources/log4j2.xml (100%) rename acceptance-tests/{ => tests}/src/test/resources/permissioning/simple_permissioning_genesis.json (100%) diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle index 1c1f088a78..e7af72ad80 100644 --- a/acceptance-tests/build.gradle +++ b/acceptance-tests/build.gradle @@ -11,83 +11,4 @@ * specific language governing permissions and limitations under the License. */ -dependencies { - - testSupportImplementation 'org.apache.logging.log4j:log4j-core' - testSupportImplementation 'org.apache.logging.log4j:log4j-slf4j-impl' - - testSupportImplementation project(':config') - testSupportImplementation project(':consensus:clique') - testSupportImplementation project(':consensus:ibft') - testSupportImplementation project(':crypto') - testSupportImplementation project(':enclave') - testSupportImplementation project(':ethereum:blockcreation') - testSupportImplementation project(':ethereum:core') - testSupportImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') - testSupportImplementation project(':ethereum:eth') - testSupportImplementation project(':ethereum:api') - testSupportImplementation project(':ethereum:p2p') - testSupportImplementation project(':ethereum:permissioning') - testSupportImplementation project(':ethereum:rlp') - testSupportImplementation project(':metrics:core') - testSupportImplementation project(':besu') - testSupportImplementation project(':plugin-api') - testSupportImplementation project(':plugins:rocksdb') - testSupportImplementation project(':services:kvstore') - testSupportImplementation project(':testutil') - testSupportImplementation project(':util') - - testSupportImplementation 'com.github.tomakehurst:wiremock-jre8' - testSupportImplementation 'com.google.guava:guava' - testSupportImplementation 'com.squareup.okhttp3:okhttp' - testSupportImplementation 'info.picocli:picocli' - testSupportImplementation 'io.reactivex.rxjava2:rxjava' - testSupportImplementation 'io.vertx:vertx-core' - testSupportImplementation 'junit:junit' - testSupportImplementation 'net.consensys:orion' - testSupportImplementation 'org.apache.logging.log4j:log4j-api' - testSupportImplementation 'org.assertj:assertj-core' - testSupportImplementation 'org.awaitility:awaitility' - testSupportImplementation 'org.java-websocket:Java-WebSocket' - testSupportImplementation 'org.web3j:abi' - testSupportImplementation 'org.web3j:pantheon' - testSupportImplementation 'org.web3j:crypto' - testSupportImplementation 'tech.pegasys.ethsigner.internal:core' - testSupportImplementation 'tech.pegasys.ethsigner.internal:file-based' - testSupportImplementation 'tech.pegasys.ethsigner.internal:signing-api' - - testImplementation 'junit:junit' - testImplementation 'net.consensys:orion' - testImplementation 'org.assertj:assertj-core' - testImplementation 'org.web3j:abi' - testImplementation 'org.web3j:pantheon' - testImplementation project(':ethereum:api') - testImplementation project(':enclave') - testImplementation 'org.awaitility:awaitility' - testImplementation project(':consensus:clique') - testImplementation project(':ethereum:permissioning') - testImplementation project(':util') - testImplementation project(':plugin-api') - testImplementation project(':besu') - testImplementation project(':ethereum:core') - testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') - testImplementation project(':testutil') - testImplementation 'tech.pegasys.ethsigner.internal:core' - testImplementation 'tech.pegasys.ethsigner.internal:file-based' -} - -test.enabled = false - -sourceSets { - test { resources { srcDirs "${rootDir}/besu/build/libs" } } -} - -processTestResources.dependsOn(':besu:testJar') - -task acceptanceTest(type: Test) { - dependsOn(rootProject.installDist) - systemProperty 'acctests.runBesuAsProcess', 'true' - mustRunAfter rootProject.subprojects*.test - description = 'Runs Besu acceptance tests.' - group = 'verification' -} +jar { enabled = false } diff --git a/acceptance-tests/dsl/build.gradle b/acceptance-tests/dsl/build.gradle new file mode 100644 index 0000000000..b15d83d861 --- /dev/null +++ b/acceptance-tests/dsl/build.gradle @@ -0,0 +1,47 @@ +dependencies { + + implementation 'org.apache.logging.log4j:log4j-core' + implementation 'org.apache.logging.log4j:log4j-slf4j-impl' + + implementation project(':config') + implementation project(':consensus:clique') + implementation project(':consensus:ibft') + implementation project(':crypto') + implementation project(':enclave') + implementation project(':ethereum:blockcreation') + implementation project(':ethereum:core') + implementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') + implementation project(':ethereum:eth') + implementation project(':ethereum:api') + implementation project(':ethereum:p2p') + implementation project(':ethereum:permissioning') + implementation project(':ethereum:rlp') + implementation project(':metrics:core') + implementation project(':besu') + implementation project(':plugin-api') + implementation project(':plugins:rocksdb') + implementation project(':services:kvstore') + implementation project(':testutil') + implementation project(':util') + + implementation 'com.github.tomakehurst:wiremock-jre8' + implementation 'com.google.guava:guava' + implementation 'com.squareup.okhttp3:okhttp' + implementation 'info.picocli:picocli' + implementation 'io.reactivex.rxjava2:rxjava' + implementation 'io.vertx:vertx-core' + implementation 'junit:junit' + implementation 'net.consensys:orion' + implementation 'org.apache.logging.log4j:log4j-api' + implementation 'org.assertj:assertj-core' + implementation 'org.awaitility:awaitility' + implementation 'org.java-websocket:Java-WebSocket' + implementation 'org.web3j:abi' + implementation 'org.web3j:pantheon' + implementation 'org.web3j:crypto' + implementation 'tech.pegasys.ethsigner.internal:core' + implementation 'tech.pegasys.ethsigner.internal:file-based' + implementation 'tech.pegasys.ethsigner.internal:signing-api' + + +} diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/StaticNodesUtils.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/StaticNodesUtils.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/StaticNodesUtils.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/StaticNodesUtils.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/WaitUtils.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/WaitUtils.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/WaitUtils.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/WaitUtils.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/account/Account.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/account/Account.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/account/Account.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/account/Account.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/account/Accounts.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/account/Accounts.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/account/Accounts.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/account/Accounts.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Amount.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Amount.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Amount.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Amount.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Blockchain.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Blockchain.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Blockchain.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Blockchain.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/Condition.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/Condition.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/Condition.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/Condition.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalance.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalance.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalance.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalance.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalanceNotChanging.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalanceNotChanging.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalanceNotChanging.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalanceNotChanging.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/AdminConditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/AdminConditions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/AdminConditions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/AdminConditions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/ExpectPeerAdded.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/ExpectPeerAdded.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/ExpectPeerAdded.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/ExpectPeerAdded.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBeneficiary.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBeneficiary.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBeneficiary.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBeneficiary.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBlockNotCreated.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBlockNotCreated.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBlockNotCreated.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBlockNotCreated.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBlockNumberAbove.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBlockNumberAbove.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBlockNumberAbove.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBlockNumberAbove.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectMinimumBlockNumber.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectMinimumBlockNumber.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectMinimumBlockNumber.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectMinimumBlockNumber.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/CliqueConditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/CliqueConditions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/CliqueConditions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/CliqueConditions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectProposals.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectProposals.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectProposals.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectProposals.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidators.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidators.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidators.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidators.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/EthConditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/EthConditions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/EthConditions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/EthConditions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthAccountsException.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthAccountsException.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthAccountsException.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthAccountsException.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthGetTransactionReceiptIsAbsent.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthGetTransactionReceiptIsAbsent.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthGetTransactionReceiptIsAbsent.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthGetTransactionReceiptIsAbsent.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthGetWorkException.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthGetWorkException.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthGetWorkException.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthGetWorkException.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthSendRawTransactionException.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthSendRawTransactionException.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthSendRawTransactionException.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthSendRawTransactionException.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceipt.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceipt.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceipt.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceipt.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithReason.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithReason.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithReason.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithReason.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithoutReason.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithoutReason.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithoutReason.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithoutReason.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/SanityCheckEthGetWorkValues.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/SanityCheckEthGetWorkValues.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/SanityCheckEthGetWorkValues.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/SanityCheckEthGetWorkValues.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/AwaitLoginResponse.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/AwaitLoginResponse.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/AwaitLoginResponse.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/AwaitLoginResponse.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/ExpectLoginSuccess.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/ExpectLoginSuccess.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/ExpectLoginSuccess.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/ExpectLoginSuccess.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/ExpectLoginUnauthorized.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/ExpectLoginUnauthorized.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/ExpectLoginUnauthorized.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/ExpectLoginUnauthorized.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/LoginConditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/LoginConditions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/LoginConditions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/LoginConditions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/miner/MiningStatusCondition.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/miner/MiningStatusCondition.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/miner/MiningStatusCondition.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/miner/MiningStatusCondition.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/AwaitNetPeerCount.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/AwaitNetPeerCount.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/AwaitNetPeerCount.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/AwaitNetPeerCount.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/AwaitNetPeerCountException.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/AwaitNetPeerCountException.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/AwaitNetPeerCountException.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/AwaitNetPeerCountException.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionException.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionException.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionException.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionException.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionExceptionWithCause.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionExceptionWithCause.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionExceptionWithCause.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionExceptionWithCause.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionIsNotBlank.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionIsNotBlank.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionIsNotBlank.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionIsNotBlank.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionException.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionException.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionException.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionException.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionJsonRpcUnauthorizedResponse.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionJsonRpcUnauthorizedResponse.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionJsonRpcUnauthorizedResponse.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionJsonRpcUnauthorizedResponse.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/NetConditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/NetConditions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/NetConditions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/NetConditions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AccountSmartContractPermissioningConditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AccountSmartContractPermissioningConditions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AccountSmartContractPermissioningConditions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AccountSmartContractPermissioningConditions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AddAccountsToWhitelistSuccessfully.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AddAccountsToWhitelistSuccessfully.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AddAccountsToWhitelistSuccessfully.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AddAccountsToWhitelistSuccessfully.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AddNodeSuccess.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AddNodeSuccess.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AddNodeSuccess.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AddNodeSuccess.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/GetExpectedAccountsWhitelist.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/GetExpectedAccountsWhitelist.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/GetExpectedAccountsWhitelist.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/GetExpectedAccountsWhitelist.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningConditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningConditions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningConditions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningConditions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/PermissioningConditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/PermissioningConditions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/PermissioningConditions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/PermissioningConditions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/RemoveAccountsFromWhitelistSuccessfully.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/RemoveAccountsFromWhitelistSuccessfully.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/RemoveAccountsFromWhitelistSuccessfully.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/RemoveAccountsFromWhitelistSuccessfully.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/RemoveNodeSuccess.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/RemoveNodeSuccess.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/RemoveNodeSuccess.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/RemoveNodeSuccess.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WaitForFalseResponse.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WaitForFalseResponse.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WaitForFalseResponse.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WaitForFalseResponse.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WaitForTrueResponse.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WaitForTrueResponse.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WaitForTrueResponse.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WaitForTrueResponse.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WhiteListContainsKeyAndValue.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WhiteListContainsKeyAndValue.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WhiteListContainsKeyAndValue.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WhiteListContainsKeyAndValue.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/web3/ExpectWeb3Sha3Equals.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/web3/ExpectWeb3Sha3Equals.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/web3/ExpectWeb3Sha3Equals.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/web3/ExpectWeb3Sha3Equals.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/web3/Web3Conditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/web3/Web3Conditions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/web3/Web3Conditions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/web3/Web3Conditions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/contract/ContractVerifier.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/contract/ContractVerifier.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/contract/ContractVerifier.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/contract/ContractVerifier.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/contract/ExpectValidTransactionReceipt.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/contract/ExpectValidTransactionReceipt.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/contract/ExpectValidTransactionReceipt.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/contract/ExpectValidTransactionReceipt.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClient.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClient.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClient.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClient.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNodeRunner.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNodeRunner.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNodeRunner.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNodeRunner.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/Node.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/Node.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/Node.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/Node.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java similarity index 99% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java index cd301be02c..6cb9ef4de5 100644 --- a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java +++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java @@ -234,7 +234,7 @@ public class ProcessBesuNodeRunner implements BesuNodeRunner { LOG.info("Creating besu process with params {}", params); final ProcessBuilder processBuilder = new ProcessBuilder(params) - .directory(new File(System.getProperty("user.dir")).getParentFile()) + .directory(new File(System.getProperty("user.dir")).getParentFile().getParentFile()) .redirectErrorStream(true) .redirectInput(Redirect.INHERIT); if (!node.getPlugins().isEmpty()) { diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/RunnableNode.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/RunnableNode.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/RunnableNode.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/RunnableNode.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/Cluster.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/Cluster.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/Cluster.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/Cluster.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/ClusterConfiguration.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/ClusterConfiguration.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/ClusterConfiguration.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/ClusterConfiguration.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfiguration.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfiguration.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfiguration.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfiguration.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfiguration.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfiguration.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfiguration.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfiguration.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationProvider.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationProvider.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationProvider.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationProvider.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyCluster.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyCluster.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyCluster.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyCluster.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccount.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccount.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccount.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccount.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectInternalErrorPrivateTransactionReceipt.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectInternalErrorPrivateTransactionReceipt.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectInternalErrorPrivateTransactionReceipt.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectInternalErrorPrivateTransactionReceipt.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectNoPrivateTransactionReceipt.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectNoPrivateTransactionReceipt.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectNoPrivateTransactionReceipt.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectNoPrivateTransactionReceipt.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivacyGroupCreated.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivacyGroupCreated.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivacyGroupCreated.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivacyGroupCreated.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateContractDeployedReceipt.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateContractDeployedReceipt.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateContractDeployedReceipt.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateContractDeployedReceipt.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateCondition.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateCondition.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateCondition.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateCondition.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateContractCondition.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateContractCondition.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateContractCondition.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateContractCondition.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateContractVerifier.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateContractVerifier.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateContractVerifier.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateContractVerifier.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/CallPrivateSmartContractFunction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/CallPrivateSmartContractFunction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/CallPrivateSmartContractFunction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/CallPrivateSmartContractFunction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/FindPrivacyGroupTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/FindPrivacyGroupTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/FindPrivacyGroupTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/FindPrivacyGroupTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/Subscription.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/Subscription.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/Subscription.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/Subscription.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/SubscriptionEvent.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/SubscriptionEvent.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/SubscriptionEvent.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/SubscriptionEvent.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocket.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocket.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocket.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocket.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketConnection.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketConnection.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketConnection.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketConnection.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketEvent.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketEvent.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketEvent.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketEvent.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/CallSmartContractFunction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/CallSmartContractFunction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/CallSmartContractFunction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/CallSmartContractFunction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/DeploySmartContractTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/DeploySmartContractTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/DeploySmartContractTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/DeploySmartContractTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/NodeRequests.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/NodeRequests.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/NodeRequests.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/NodeRequests.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/Transaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/Transaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/Transaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/Transaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/AccountTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/AccountTransactions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/AccountTransactions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/AccountTransactions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AddPeerTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AddPeerTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AddPeerTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AddPeerTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminRequestFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminRequestFactory.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminRequestFactory.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminRequestFactory.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminTransactions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminTransactions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminTransactions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueDiscard.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueDiscard.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueDiscard.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueDiscard.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueProposals.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueProposals.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueProposals.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueProposals.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliquePropose.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliquePropose.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliquePropose.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliquePropose.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/contract/ContractTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/contract/ContractTransactions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/contract/ContractTransactions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/contract/ContractTransactions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthAccountsTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthAccountsTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthAccountsTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthAccountsTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthBlockNumberTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthBlockNumberTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthBlockNumberTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthBlockNumberTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetBalanceTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetBalanceTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetBalanceTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetBalanceTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetBlockTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetBlockTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetBlockTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetBlockTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionCountTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionCountTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionCountTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionCountTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithRevertReason.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithRevertReason.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithRevertReason.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithRevertReason.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetWorkTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetWorkTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetWorkTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetWorkTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthMiningTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthMiningTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthMiningTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthMiningTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthSendRawTransactionTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthSendRawTransactionTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthSendRawTransactionTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthSendRawTransactionTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthTransactions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthTransactions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthTransactions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginSuccessfulTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginSuccessfulTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginSuccessfulTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginSuccessfulTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginUnauthorizedTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginUnauthorizedTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginUnauthorizedTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginUnauthorizedTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerRequestFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerRequestFactory.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerRequestFactory.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerRequestFactory.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerStartTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerStartTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerStartTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerStartTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerStopTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerStopTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerStopTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerStopTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerTransactions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerTransactions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerTransactions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/CustomRequestFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/CustomRequestFactory.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/CustomRequestFactory.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/CustomRequestFactory.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetPeerCountTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetPeerCountTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetPeerCountTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetPeerCountTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetServicesTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetServicesTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetServicesTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetServicesTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetTransactions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetTransactions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetTransactions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetVersionTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetVersionTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetVersionTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetVersionTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermAddAccountsToWhitelistTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermAddAccountsToWhitelistTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermAddAccountsToWhitelistTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermAddAccountsToWhitelistTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermAddNodeTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermAddNodeTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermAddNodeTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermAddNodeTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermGetAccountsWhitelistTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermGetAccountsWhitelistTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermGetAccountsWhitelistTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermGetAccountsWhitelistTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermGetNodesWhitelistTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermGetNodesWhitelistTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermGetNodesWhitelistTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermGetNodesWhitelistTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermRemoveAccountsFromWhitelistTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermRemoveAccountsFromWhitelistTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermRemoveAccountsFromWhitelistTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermRemoveAccountsFromWhitelistTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermRemoveNodeTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermRemoveNodeTransaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermRemoveNodeTransaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermRemoveNodeTransaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningTransactions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningTransactions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningTransactions.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/web3/Web3Sha3Transaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/web3/Web3Sha3Transaction.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/web3/Web3Sha3Transaction.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/web3/Web3Sha3Transaction.java diff --git a/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/web3/Web3Transactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/web3/Web3Transactions.java similarity index 100% rename from acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/web3/Web3Transactions.java rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/web3/Web3Transactions.java diff --git a/acceptance-tests/tests/build.gradle b/acceptance-tests/tests/build.gradle new file mode 100644 index 0000000000..7f3c075e0d --- /dev/null +++ b/acceptance-tests/tests/build.gradle @@ -0,0 +1,51 @@ +/* + * Copyright 2019 ConsenSys AG. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +dependencies { + + testImplementation 'junit:junit' + testImplementation 'net.consensys:orion' + testImplementation 'org.assertj:assertj-core' + testImplementation 'org.web3j:abi' + testImplementation 'org.web3j:pantheon' + testImplementation project(':ethereum:api') + testImplementation project(':acceptance-tests:dsl') + testImplementation project(':enclave') + testImplementation 'org.awaitility:awaitility' + testImplementation project(':consensus:clique') + testImplementation project(':ethereum:permissioning') + testImplementation project(':util') + testImplementation project(':plugin-api') + testImplementation project(':besu') + testImplementation project(':ethereum:core') + testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') + testImplementation project(':testutil') + testImplementation 'tech.pegasys.ethsigner.internal:core' + testImplementation 'tech.pegasys.ethsigner.internal:file-based' +} + +test.enabled = false + +sourceSets { + test { resources { srcDirs "${rootDir}/besu/build/libs" } } +} + +processTestResources.dependsOn(':besu:testJar') + +task acceptanceTest(type: Test) { + dependsOn(rootProject.installDist) + systemProperty 'acctests.runBesuAsProcess', 'true' + mustRunAfter rootProject.subprojects*.test + description = 'Runs Besu acceptance tests.' + group = 'verification' +} diff --git a/acceptance-tests/simple-permissioning-smart-contract/.gitignore b/acceptance-tests/tests/simple-permissioning-smart-contract/.gitignore similarity index 100% rename from acceptance-tests/simple-permissioning-smart-contract/.gitignore rename to acceptance-tests/tests/simple-permissioning-smart-contract/.gitignore diff --git a/acceptance-tests/simple-permissioning-smart-contract/README.md b/acceptance-tests/tests/simple-permissioning-smart-contract/README.md similarity index 100% rename from acceptance-tests/simple-permissioning-smart-contract/README.md rename to acceptance-tests/tests/simple-permissioning-smart-contract/README.md diff --git a/acceptance-tests/simple-permissioning-smart-contract/contracts/Migrations.sol b/acceptance-tests/tests/simple-permissioning-smart-contract/contracts/Migrations.sol similarity index 100% rename from acceptance-tests/simple-permissioning-smart-contract/contracts/Migrations.sol rename to acceptance-tests/tests/simple-permissioning-smart-contract/contracts/Migrations.sol diff --git a/acceptance-tests/simple-permissioning-smart-contract/contracts/SimpleAccountPermissioning.sol b/acceptance-tests/tests/simple-permissioning-smart-contract/contracts/SimpleAccountPermissioning.sol similarity index 100% rename from acceptance-tests/simple-permissioning-smart-contract/contracts/SimpleAccountPermissioning.sol rename to acceptance-tests/tests/simple-permissioning-smart-contract/contracts/SimpleAccountPermissioning.sol diff --git a/acceptance-tests/simple-permissioning-smart-contract/contracts/SimpleNodePermissioning.sol b/acceptance-tests/tests/simple-permissioning-smart-contract/contracts/SimpleNodePermissioning.sol similarity index 100% rename from acceptance-tests/simple-permissioning-smart-contract/contracts/SimpleNodePermissioning.sol rename to acceptance-tests/tests/simple-permissioning-smart-contract/contracts/SimpleNodePermissioning.sol diff --git a/acceptance-tests/simple-permissioning-smart-contract/migrations/1_initial_migration.js b/acceptance-tests/tests/simple-permissioning-smart-contract/migrations/1_initial_migration.js similarity index 100% rename from acceptance-tests/simple-permissioning-smart-contract/migrations/1_initial_migration.js rename to acceptance-tests/tests/simple-permissioning-smart-contract/migrations/1_initial_migration.js diff --git a/acceptance-tests/simple-permissioning-smart-contract/migrations/2_deploy_contracts.js b/acceptance-tests/tests/simple-permissioning-smart-contract/migrations/2_deploy_contracts.js similarity index 100% rename from acceptance-tests/simple-permissioning-smart-contract/migrations/2_deploy_contracts.js rename to acceptance-tests/tests/simple-permissioning-smart-contract/migrations/2_deploy_contracts.js diff --git a/acceptance-tests/simple-permissioning-smart-contract/test/test-account-permissioning.js b/acceptance-tests/tests/simple-permissioning-smart-contract/test/test-account-permissioning.js similarity index 100% rename from acceptance-tests/simple-permissioning-smart-contract/test/test-account-permissioning.js rename to acceptance-tests/tests/simple-permissioning-smart-contract/test/test-account-permissioning.js diff --git a/acceptance-tests/simple-permissioning-smart-contract/test/test-node-permissioning.js b/acceptance-tests/tests/simple-permissioning-smart-contract/test/test-node-permissioning.js similarity index 100% rename from acceptance-tests/simple-permissioning-smart-contract/test/test-node-permissioning.js rename to acceptance-tests/tests/simple-permissioning-smart-contract/test/test-node-permissioning.js diff --git a/acceptance-tests/simple-permissioning-smart-contract/truffle.js b/acceptance-tests/tests/simple-permissioning-smart-contract/truffle.js similarity index 100% rename from acceptance-tests/simple-permissioning-smart-contract/truffle.js rename to acceptance-tests/tests/simple-permissioning-smart-contract/truffle.js diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/CreateAccountAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/CreateAccountAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/CreateAccountAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/CreateAccountAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/MetricsAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/MetricsAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/MetricsAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/MetricsAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/P2pDisabledAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/P2pDisabledAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/P2pDisabledAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/P2pDisabledAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/RpcApisTogglesAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/RpcApisTogglesAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/RpcApisTogglesAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/RpcApisTogglesAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/StaticNodesAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/StaticNodesAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/StaticNodesAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/StaticNodesAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueDiscardRpcAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueDiscardRpcAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueDiscardRpcAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueDiscardRpcAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueGetSignersRpcTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueGetSignersRpcTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueGetSignersRpcTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueGetSignersRpcTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueMiningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueMiningAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueMiningAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueMiningAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposalRpcAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposalRpcAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposalRpcAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposalRpcAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposeRpcAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposeRpcAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposeRpcAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposeRpcAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueZeroValidators.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueZeroValidators.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueZeroValidators.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueZeroValidators.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2DiscardRpcAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2DiscardRpcAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2DiscardRpcAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2DiscardRpcAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2MiningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2MiningAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2MiningAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2MiningAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposalRpcAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposalRpcAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposalRpcAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposalRpcAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposeRpcAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposeRpcAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposeRpcAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposeRpcAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ZeroValidators.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ZeroValidators.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ZeroValidators.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ZeroValidators.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthGetWorkAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthGetWorkAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthGetWorkAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthGetWorkAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/WebsocketServiceLoginAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/WebsocketServiceLoginAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/WebsocketServiceLoginAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/WebsocketServiceLoginAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/mining/MiningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/mining/MiningAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/mining/MiningAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/mining/MiningAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalAndOnChainPermissioningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalAndOnChainPermissioningAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalAndOnChainPermissioningAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalAndOnChainPermissioningAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalConfigPermissioningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalConfigPermissioningAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalConfigPermissioningAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalConfigPermissioningAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTestBase.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTestBase.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTestBase.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTestBase.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalAndOnChainPermissioningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalAndOnChainPermissioningAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalAndOnChainPermissioningAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalAndOnChainPermissioningAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalConfigPermissioningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalConfigPermissioningAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalConfigPermissioningAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalConfigPermissioningAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTestBase.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTestBase.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTestBase.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTestBase.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningOutOfSyncAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningOutOfSyncAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningOutOfSyncAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningOutOfSyncAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodesSmartContractPermissioningStaticNodesAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodesSmartContractPermissioningStaticNodesAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodesSmartContractPermissioningStaticNodesAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodesSmartContractPermissioningStaticNodesAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/WhitelistPersistorAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/WhitelistPersistorAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/WhitelistPersistorAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/WhitelistPersistorAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BesuEventsPluginTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BesuEventsPluginTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BesuEventsPluginTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BesuEventsPluginTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PicoCLIOptionsPluginTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PicoCLIOptionsPluginTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PicoCLIOptionsPluginTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PicoCLIOptionsPluginTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/DeploySmartContractAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/DeploySmartContractAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/DeploySmartContractAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/DeploySmartContractAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/DeployTransactionAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/DeployTransactionAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/DeployTransactionAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/DeployTransactionAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitter.sol b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitter.sol similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitter.sol rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitter.sol diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitterAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitterAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitterAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReason.sol b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReason.sol similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReason.sol rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReason.sol diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReasonAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReasonAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReasonAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReasonAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/SimpleStorage.sol b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/SimpleStorage.sol similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/SimpleStorage.sol rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/SimpleStorage.sol diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.abi b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.abi similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.abi rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.abi diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.bin b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.bin similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.bin rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.bin diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.abi b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.abi similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.abi rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.abi diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.bin b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.bin similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.bin rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.bin diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.abi b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.abi similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.abi rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.abi diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.bin b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.bin similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.bin rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.bin diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java diff --git a/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyGroupAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyGroupAcceptanceTest.java similarity index 100% rename from acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyGroupAcceptanceTest.java rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyGroupAcceptanceTest.java diff --git a/acceptance-tests/src/test/resources/authentication/auth.toml b/acceptance-tests/tests/src/test/resources/authentication/auth.toml similarity index 100% rename from acceptance-tests/src/test/resources/authentication/auth.toml rename to acceptance-tests/tests/src/test/resources/authentication/auth.toml diff --git a/acceptance-tests/src/test/resources/clique/clique.json b/acceptance-tests/tests/src/test/resources/clique/clique.json similarity index 100% rename from acceptance-tests/src/test/resources/clique/clique.json rename to acceptance-tests/tests/src/test/resources/clique/clique.json diff --git a/acceptance-tests/src/test/resources/ibft/ibft.json b/acceptance-tests/tests/src/test/resources/ibft/ibft.json similarity index 100% rename from acceptance-tests/src/test/resources/ibft/ibft.json rename to acceptance-tests/tests/src/test/resources/ibft/ibft.json diff --git a/acceptance-tests/src/test/resources/ibft/privacy-ibft.json b/acceptance-tests/tests/src/test/resources/ibft/privacy-ibft.json similarity index 100% rename from acceptance-tests/src/test/resources/ibft/privacy-ibft.json rename to acceptance-tests/tests/src/test/resources/ibft/privacy-ibft.json diff --git a/acceptance-tests/src/test/resources/key b/acceptance-tests/tests/src/test/resources/key similarity index 100% rename from acceptance-tests/src/test/resources/key rename to acceptance-tests/tests/src/test/resources/key diff --git a/acceptance-tests/src/test/resources/key1 b/acceptance-tests/tests/src/test/resources/key1 similarity index 100% rename from acceptance-tests/src/test/resources/key1 rename to acceptance-tests/tests/src/test/resources/key1 diff --git a/acceptance-tests/src/test/resources/key2 b/acceptance-tests/tests/src/test/resources/key2 similarity index 100% rename from acceptance-tests/src/test/resources/key2 rename to acceptance-tests/tests/src/test/resources/key2 diff --git a/acceptance-tests/src/test/resources/log4j2.xml b/acceptance-tests/tests/src/test/resources/log4j2.xml similarity index 100% rename from acceptance-tests/src/test/resources/log4j2.xml rename to acceptance-tests/tests/src/test/resources/log4j2.xml diff --git a/acceptance-tests/src/test/resources/permissioning/simple_permissioning_genesis.json b/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_genesis.json similarity index 100% rename from acceptance-tests/src/test/resources/permissioning/simple_permissioning_genesis.json rename to acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_genesis.json diff --git a/settings.gradle b/settings.gradle index 7d402b72c9..dc69632206 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,7 +12,8 @@ */ rootProject.name='besu' -include 'acceptance-tests' +include 'acceptance-tests:dsl' +include 'acceptance-tests:tests' include 'config' include 'consensus:clique' include 'consensus:common'