From d6a2394e2d4313f46b47e3ad60566e69ca8e20a4 Mon Sep 17 00:00:00 2001 From: Joshua Fernandes Date: Mon, 16 Sep 2019 11:14:10 +1000 Subject: [PATCH] Migrating Pantheon to Besu (#1945) Signed-off-by: Adrian Sutton --- .github/issue_template.md | 8 +- .github/pull_request_template.md | 2 +- CHANGELOG.md | 188 +++++----- CLA.md | 4 +- CLI-STYLE-GUIDE.md | 26 +- CODING-CONVENTIONS.md | 24 +- CONTRIBUTING.md | 34 +- GOVERNANCE.md | 2 +- Jenkinsfile | 68 ++-- Jenkinsfile.benchmark | 8 +- README.md | 33 +- ROADMAP.md | 20 +- acceptance-tests/build.gradle | 12 +- .../README.md | 6 +- .../acceptance/dsl/AcceptanceTestBase.java | 54 +-- .../tests/acceptance/dsl/BlockUtils.java | 18 +- .../acceptance/dsl/StaticNodesUtils.java | 2 +- .../besu}/tests/acceptance/dsl/WaitUtils.java | 2 +- .../tests/acceptance/dsl/account/Account.java | 24 +- .../acceptance/dsl/account/Accounts.java | 4 +- .../acceptance/dsl/blockchain/Amount.java | 2 +- .../acceptance/dsl/blockchain/Blockchain.java | 22 +- .../acceptance/dsl/condition/Condition.java | 4 +- .../account/ExpectAccountBalance.java | 14 +- .../ExpectAccountBalanceNotChanging.java | 10 +- .../dsl/condition/admin/AdminConditions.java | 10 +- .../dsl/condition/admin/ExpectPeerAdded.java | 8 +- .../blockchain/ExpectBeneficiary.java | 17 +- .../blockchain/ExpectBlockNotCreated.java | 8 +- .../blockchain/ExpectBlockNumberAbove.java | 12 +- .../blockchain/ExpectMinimumBlockNumber.java | 8 +- .../clique/AwaitSignerSetChange.java | 16 +- .../condition/clique/CliqueConditions.java | 51 ++- .../dsl/condition/clique/ExpectNonceVote.java | 15 +- .../dsl/condition/clique/ExpectProposals.java | 15 +- .../condition/clique/ExpectValidators.java | 16 +- .../clique/ExpectValidatorsAtBlock.java | 14 +- .../clique/ExpectValidatorsAtBlockHash.java | 16 +- .../clique/ExpectedBlockHasProposer.java | 25 +- .../dsl/condition/eth/EthConditions.java | 8 +- .../eth/ExpectEthAccountsException.java | 8 +- ...xpectEthGetTransactionReceiptIsAbsent.java | 8 +- .../eth/ExpectEthGetWorkException.java | 8 +- .../ExpectEthSendRawTransactionException.java | 8 +- ...ectSuccessfulEthGetTransactionReceipt.java | 10 +- ...fulEthGetTransactionReceiptWithReason.java | 10 +- ...EthGetTransactionReceiptWithoutReason.java | 12 +- .../eth/SanityCheckEthGetWorkValues.java | 8 +- .../ibft2/AwaitValidatorSetChange.java | 16 +- .../dsl/condition/ibft2/ExpectProposals.java | 15 +- .../dsl/condition/ibft2/ExpectValidators.java | 16 +- .../dsl/condition/ibft2/Ibft2Conditions.java | 40 +-- .../condition/login/AwaitLoginResponse.java | 14 +- .../condition/login/ExpectLoginSuccess.java | 8 +- .../login/ExpectLoginUnauthorized.java | 8 +- .../dsl/condition/login/LoginConditions.java | 6 +- .../miner/MiningStatusCondition.java | 13 +- .../dsl/condition/net/AwaitNetPeerCount.java | 10 +- .../net/AwaitNetPeerCountException.java | 8 +- ...NetServicesReturnsAllServicesAsActive.java | 10 +- ...ctNetServicesReturnsOnlyJsonRpcActive.java | 10 +- .../ExpectNetVersionConnectionException.java | 8 +- ...etVersionConnectionExceptionWithCause.java | 8 +- .../net/ExpectNetVersionIsNotBlank.java | 8 +- .../ExpectNetVersionPermissionException.java | 8 +- ...PermissionJsonRpcUnauthorizedResponse.java | 8 +- .../dsl/condition/net/NetConditions.java | 6 +- ...tSmartContractPermissioningConditions.java | 8 +- .../AddAccountsToWhitelistSuccessfully.java | 8 +- .../dsl/condition/perm/AddNodeSuccess.java | 8 +- .../perm/GetExpectedAccountsWhitelist.java | 8 +- .../perm/GetNodesWhitelistPopulated.java | 8 +- ...eSmartContractPermissioningConditions.java | 8 +- .../perm/PermissioningConditions.java | 12 +- ...moveAccountsFromWhitelistSuccessfully.java | 8 +- .../dsl/condition/perm/RemoveNodeSuccess.java | 8 +- .../condition/perm/WaitForFalseResponse.java | 14 +- .../condition/perm/WaitForTrueResponse.java | 14 +- .../perm/WhiteListContainsKeyAndValue.java | 8 +- .../condition/web3/ExpectWeb3Sha3Equals.java | 8 +- .../dsl/condition/web3/Web3Conditions.java | 6 +- .../dsl/contract/ContractVerifier.java | 4 +- .../ExpectValidTransactionReceipt.java | 4 +- .../dsl/ethsigner/EthSignerClient.java | 2 +- .../dsl/ethsigner/EthSignerClientTest.java | 6 +- .../ethsigner/PrivateTransactionRequest.java | 2 +- .../ethsigner/testutil/EthSignerConfig.java | 7 +- .../testutil/EthSignerTestHarness.java | 2 +- .../testutil/EthSignerTestHarnessFactory.java | 13 +- .../tests/acceptance/dsl/node/BesuNode.java} | 64 ++-- .../acceptance/dsl/node/BesuNodeRunner.java} | 18 +- .../besu}/tests/acceptance/dsl/node/Node.java | 6 +- .../dsl/node/ProcessBesuNodeRunner.java} | 64 ++-- .../acceptance/dsl/node/RunnableNode.java | 10 +- .../dsl/node/ThreadBesuNodeRunner.java} | 146 ++++---- .../acceptance/dsl/node/cluster/Cluster.java | 41 ++- .../node/cluster/ClusterConfiguration.java | 2 +- .../cluster/ClusterConfigurationBuilder.java | 2 +- .../configuration/BesuNodeConfiguration.java} | 20 +- .../BesuNodeConfigurationBuilder.java} | 73 ++-- .../node/configuration/BesuNodeFactory.java} | 111 +++--- .../node/configuration/NodeConfiguration.java | 4 +- .../NodeConfigurationFactory.java | 22 +- .../genesis/GenesisConfigurationFactory.java | 10 +- .../genesis/GenesisConfigurationProvider.java | 4 +- .../PermissionedNodeBuilder.java | 38 +- .../privacy/PrivacyNodeConfiguration.java | 16 +- .../privacy/PrivacyNodeFactory.java | 20 +- .../privacy/PrivacyAcceptanceTestBase.java | 22 +- .../dsl/privacy/PrivacyCluster.java | 22 +- .../acceptance/dsl/privacy/PrivacyNode.java | 132 +++---- .../dsl/privacy/account/PrivacyAccount.java | 2 +- .../account/PrivacyAccountResolver.java | 2 +- .../EeaGetTransactionReceiptTransaction.java | 10 +- ...nternalErrorPrivateTransactionReceipt.java | 6 +- .../ExpectNoPrivateTransactionReceipt.java | 6 +- .../ExpectValidPrivacyGroupCreated.java | 6 +- ...ctValidPrivateContractDeployedReceipt.java | 2 +- .../ExpectValidPrivateTransactionReceipt.java | 6 +- .../privacy/condition/PrivateCondition.java | 4 +- .../condition/PrivateContractCondition.java | 2 +- .../condition/PrivateContractVerifier.java | 2 +- .../condition/PrivateTransactionVerifier.java | 4 +- .../CallPrivateSmartContractFunction.java | 10 +- ...DeployPrivateSmartContractTransaction.java | 10 +- ...ContractWithPrivacyGroupIdTransaction.java | 10 +- .../LoadPrivateSmartContractTransaction.java | 10 +- .../contract/PrivateContractTransactions.java | 2 +- .../CreatePrivacyGroupTransaction.java | 13 +- .../FindPrivacyGroupTransaction.java | 10 +- .../GetAllPrivacyMarkerTransactionHashes.java | 16 +- .../transaction/PrivacyTransactions.java | 6 +- .../dsl/pubsub/JsonRpcSuccessEvent.java | 2 +- .../acceptance/dsl/pubsub/Subscription.java | 8 +- .../dsl/pubsub/SubscriptionEvent.java | 2 +- .../acceptance/dsl/pubsub/WebSocket.java | 9 +- .../dsl/pubsub/WebSocketConnection.java | 6 +- .../acceptance/dsl/pubsub/WebSocketEvent.java | 2 +- .../CallSmartContractFunction.java | 4 +- .../DeploySmartContractTransaction.java | 4 +- .../dsl/transaction/NodeRequests.java | 20 +- .../dsl/transaction/Transaction.java | 2 +- .../account/AccountTransactions.java | 8 +- .../account/TransferTransaction.java | 12 +- .../account/TransferTransactionBuilder.java | 6 +- .../account/TransferTransactionSet.java | 8 +- .../transaction/admin/AddPeerTransaction.java | 6 +- .../admin/AdminRequestFactory.java | 2 +- .../transaction/admin/AdminTransactions.java | 2 +- .../dsl/transaction/clique/CliqueDiscard.java | 6 +- .../transaction/clique/CliqueGetSigners.java | 12 +- .../clique/CliqueGetSignersAtHash.java | 14 +- .../transaction/clique/CliqueProposals.java | 11 +- .../dsl/transaction/clique/CliquePropose.java | 10 +- .../clique/CliqueRequestFactory.java | 6 +- .../clique/CliqueTransactions.java | 12 +- .../contract/ContractTransactions.java | 6 +- .../eth/EthAccountsTransaction.java | 6 +- .../eth/EthBlockNumberTransaction.java | 6 +- .../eth/EthGetBalanceTransaction.java | 8 +- .../eth/EthGetBlockTransaction.java | 6 +- .../EthGetTransactionCountTransaction.java | 6 +- .../EthGetTransactionReceiptTransaction.java | 6 +- ...GetTransactionReceiptWithRevertReason.java | 10 +- .../eth/EthGetWorkTransaction.java | 6 +- .../transaction/eth/EthMiningTransaction.java | 6 +- .../eth/EthSendRawTransactionTransaction.java | 6 +- .../dsl/transaction/eth/EthTransactions.java | 4 +- .../dsl/transaction/ibft2/Ibft2Discard.java | 9 +- .../transaction/ibft2/Ibft2GetValidators.java | 12 +- .../ibft2/Ibft2GetValidatorsAtHash.java | 14 +- .../dsl/transaction/ibft2/Ibft2Proposals.java | 11 +- .../dsl/transaction/ibft2/Ibft2Propose.java | 9 +- .../ibft2/Ibft2RequestFactory.java | 6 +- .../transaction/ibft2/Ibft2Transactions.java | 12 +- .../login/LoginRequestFactory.java | 2 +- .../login/LoginSuccessfulTransaction.java | 6 +- .../transaction/login/LoginTransaction.java | 6 +- .../login/LoginUnauthorizedTransaction.java | 11 +- .../miner/MinerRequestFactory.java | 2 +- .../miner/MinerStartTransaction.java | 6 +- .../miner/MinerStopTransaction.java | 6 +- .../transaction/miner/MinerTransactions.java | 2 +- .../transaction/net/CustomRequestFactory.java | 2 +- .../net/NetPeerCountTransaction.java | 6 +- .../net/NetServicesTransaction.java | 6 +- .../dsl/transaction/net/NetTransactions.java | 2 +- .../net/NetVersionTransaction.java | 6 +- ...tPermissioningAllowAccountTransaction.java | 18 +- ...PermissioningForbidAccountTransaction.java | 18 +- ...ractPermissioningIsAllowedTransaction.java | 17 +- ...martContractPermissioningTransactions.java | 12 +- ...ractPermissioningAllowNodeTransaction.java | 24 +- ...sioningConnectionIsAllowedTransaction.java | 23 +- ...actPermissioningForbidNodeTransaction.java | 24 +- ...ractPermissioningIsAllowedTransaction.java | 22 +- ...martContractPermissioningTransactions.java | 12 +- ...PermAddAccountsToWhitelistTransaction.java | 8 +- .../perm/PermAddNodeTransaction.java | 10 +- .../PermGetAccountsWhitelistTransaction.java | 8 +- .../PermGetNodesWhitelistTransaction.java | 8 +- ...emoveAccountsFromWhitelistTransaction.java | 8 +- .../perm/PermRemoveNodeTransaction.java | 8 +- .../PermissioningJsonRpcRequestFactory.java | 2 +- .../perm/PermissioningTransactions.java | 4 +- .../privacy/PrivacyRequestFactory.java | 10 +- .../transaction/web3/Web3Sha3Transaction.java | 6 +- .../transaction/web3/Web3Transactions.java | 2 +- .../acceptance/ClusterAcceptanceTest.java | 10 +- .../ClusterNoDiscoveryAcceptanceTest.java | 16 +- ...ClusterThreadNodeRunnerAcceptanceTest.java | 26 +- .../CreateAccountAcceptanceTest.java | 14 +- .../acceptance/MetricsAcceptanceTest.java | 16 +- .../acceptance/P2pDisabledAcceptanceTest.java | 14 +- .../RpcApisTogglesAcceptanceTest.java | 20 +- .../acceptance/StaticNodesAcceptanceTest.java | 12 +- .../CliqueDiscardRpcAcceptanceTest.java | 15 +- .../clique/CliqueGetSignersRpcTest.java | 16 +- .../clique/CliqueMiningAcceptanceTest.java | 28 +- .../CliqueProposalRpcAcceptanceTest.java | 15 +- .../CliqueProposeRpcAcceptanceTest.java | 52 ++- .../clique/CliqueZeroValidators.java | 10 +- .../ibft2/Ibft2DiscardRpcAcceptanceTest.java | 15 +- .../ibft2/Ibft2MiningAcceptanceTest.java | 45 ++- .../ibft2/Ibft2ProposalRpcAcceptanceTest.java | 15 +- .../ibft2/Ibft2ProposeRpcAcceptanceTest.java | 21 +- .../acceptance/ibft2/Ibft2ZeroValidators.java | 10 +- .../jsonrpc/EthGetWorkAcceptanceTest.java | 10 +- .../HttpServiceLoginAcceptanceTest.java | 16 +- .../jsonrpc/NetServicesAcceptanceTest.java | 20 +- .../jsonrpc/Web3Sha3AcceptanceTest.java | 8 +- .../WebsocketServiceLoginAcceptanceTest.java | 10 +- .../admin/AdminAddPeerAcceptanceTest.java | 16 +- .../mining/MiningAcceptanceTest.java | 10 +- ...AndOnChainPermissioningAcceptanceTest.java | 8 +- ...ocalConfigPermissioningAcceptanceTest.java | 10 +- ...rtContractPermissioningAcceptanceTest.java | 6 +- ...ntractPermissioningAcceptanceTestBase.java | 30 +- ...AndOnChainPermissioningAcceptanceTest.java | 4 +- ...ocalConfigPermissioningAcceptanceTest.java | 18 +- ...rtContractPermissioningAcceptanceTest.java | 4 +- ...ntractPermissioningAcceptanceTestBase.java | 32 +- ...tPermissioningOutOfSyncAcceptanceTest.java | 4 +- ...ermissioningStaticNodesAcceptanceTest.java | 6 +- .../WhitelistPersistorAcceptanceTest.java | 10 +- .../plugins/BesuEventsPluginTest.java} | 16 +- .../plugins/PicoCLIOptionsPluginTest.java | 12 +- .../NewPendingTransactionAcceptanceTest.java | 22 +- .../DeploySmartContractAcceptanceTest.java | 12 +- .../DeployTransactionAcceptanceTest.java | 14 +- .../besu}/tests/web3j/EventEmitter.sol | 2 +- .../web3j/EventEmitterAcceptanceTest.java | 14 +- .../besu}/tests/web3j/RevertReason.sol | 2 +- .../web3j/RevertReasonAcceptanceTest.java | 16 +- .../besu}/tests/web3j/SimpleStorage.sol | 2 +- .../tests/web3j/generated/EventEmitter.abi | 0 .../tests/web3j/generated/EventEmitter.bin | 0 .../tests/web3j/generated/EventEmitter.java | 2 +- .../tests/web3j/generated/RevertReason.abi | 0 .../tests/web3j/generated/RevertReason.bin | 0 .../tests/web3j/generated/RevertReason.java | 2 +- .../tests/web3j/generated/SimpleStorage.abi | 0 .../tests/web3j/generated/SimpleStorage.bin | 0 .../tests/web3j/generated/SimpleStorage.java | 2 +- ...loyPrivateSmartContractAcceptanceTest.java | 10 +- .../privacy/EnclaveErrorAcceptanceTest.java | 15 +- .../privacy/EthSignerAcceptanceTest.java | 18 +- .../Ibft2PrivacyClusterAcceptanceTest.java | 16 +- .../privacy/PrivacyClusterAcceptanceTest.java | 16 +- .../privacy/PrivacyGroupAcceptanceTest.java | 14 +- .../src/test/resources/log4j2.xml | 2 +- {pantheon => besu}/build.gradle | 2 +- .../main/java/org/hyperledger/besu/Besu.java | 28 +- .../java/org/hyperledger/besu/BesuInfo.java | 12 +- .../java/org/hyperledger/besu}/Runner.java | 43 ++- .../org/hyperledger/besu}/RunnerBuilder.java | 190 +++++----- .../besu}/chainexport/BlockExporter.java | 12 +- .../besu}/chainexport/RlpBlockExporter.java | 10 +- .../besu}/chainimport/JsonBlockImporter.java | 36 +- .../besu}/chainimport/RlpBlockImporter.java | 46 +-- .../besu}/chainimport/internal/BlockData.java | 20 +- .../besu}/chainimport/internal/ChainData.java | 2 +- .../chainimport/internal/TransactionData.java | 18 +- .../org/hyperledger/besu/cli/BesuCommand.java | 330 +++++++++--------- .../besu}/cli/DefaultCommandValues.java | 53 ++- .../besu}/cli/StandaloneCommand.java | 14 +- .../besu}/cli/UnstableOptionsSubCommand.java | 8 +- .../besu}/cli/config/EthNetworkConfig.java | 12 +- .../besu}/cli/config/NetworkName.java | 2 +- .../cli/converter/FractionConverter.java | 6 +- .../converter/MetricCategoryConverter.java | 4 +- .../cli/converter/PercentageConverter.java | 6 +- .../besu}/cli/converter/RpcApisConverter.java | 12 +- .../FractionConversionException.java | 2 +- .../PercentageConversionException.java | 2 +- .../exception/RpcApisConversionException.java | 2 +- .../custom/CorsAllowedOriginsProperty.java | 2 +- .../custom/EnodeToURIPropertyConverter.java | 4 +- .../custom/JsonRPCWhitelistHostsProperty.java | 2 +- .../cli/custom/RpcAuthFileValidator.java | 4 +- .../besu/cli/error/BesuExceptionHandler.java | 10 +- .../besu}/cli/options/CLIOptions.java | 2 +- .../besu}/cli/options/EthProtocolOptions.java | 6 +- .../besu}/cli/options/MetricsCLIOptions.java | 4 +- .../besu}/cli/options/NetworkingOptions.java | 4 +- .../besu}/cli/options/OptionParser.java | 4 +- .../cli/options/SynchronizerOptions.java | 6 +- .../cli/options/TransactionPoolOptions.java | 4 +- .../cli/subcommands/PasswordSubCommand.java | 10 +- .../cli/subcommands/PublicKeySubCommand.java | 26 +- .../cli/subcommands/RetestethSubCommand.java | 35 +- .../subcommands/blocks/BlockExportFormat.java | 2 +- .../subcommands/blocks/BlockImportFormat.java | 2 +- .../subcommands/blocks/BlocksSubCommand.java | 67 ++-- .../operator/OperatorSubCommand.java | 38 +- .../rlp/IbftExtraDataCLIAdapter.java | 8 +- .../besu}/cli/subcommands/rlp/JSONToRLP.java | 4 +- .../cli/subcommands/rlp/RLPSubCommand.java | 16 +- .../besu}/cli/subcommands/rlp/RLPType.java | 2 +- .../cli/util/CascadingDefaultProvider.java | 2 +- .../besu}/cli/util/CommandLineUtils.java | 4 +- .../util/ConfigOptionSearchAndRunHandler.java | 4 +- .../EnvironmentVariableDefaultProvider.java | 4 +- .../util/TomlConfigFileDefaultProvider.java | 4 +- .../besu}/cli/util/VersionProvider.java | 6 +- .../besu/controller/BesuController.java | 59 ++-- .../controller/BesuControllerBuilder.java | 110 +++--- .../CliqueBesuControllerBuilder.java | 58 +-- .../controller/IbftBesuControllerBuilder.java | 108 +++--- .../IbftLegacyBesuControllerBuilder.java | 48 +-- .../besu}/controller/KeyPairUtil.java | 8 +- .../MainnetBesuControllerBuilder.java | 32 +- .../besu/services/BesuConfigurationImpl.java | 8 +- .../besu/services/BesuEventsImpl.java | 14 +- .../besu/services/BesuPluginContextImpl.java | 32 +- .../besu}/services/PicoCLIOptionsImpl.java | 4 +- .../besu}/services/StorageServiceImpl.java | 10 +- .../PermissioningConfigurationValidator.java | 4 +- .../besu}/util/PlatformDetector.java | 2 +- .../hyperledger/besu}/util/StringUtils.java | 2 +- .../src/main/resources/log4j2.xml | 0 .../org/hyperledger/besu/BesuInfoTest.java | 8 +- .../org/hyperledger/besu}/PrivacyTest.java | 50 +-- .../org/hyperledger/besu}/RunnerTest.java | 96 ++--- .../chainexport/RlpBlockExporterTest.java | 52 +-- .../chainimport/JsonBlockImporterTest.java | 62 ++-- .../chainimport/RlpBlockImporterTest.java | 36 +- .../hyperledger/besu/cli/BesuCommandTest.java | 207 ++++++----- .../besu}/cli/CommandLineUtilsTest.java | 6 +- .../besu}/cli/CommandTestAbstract.java | 139 ++++---- ...nvironmentVariableDefaultProviderTest.java | 10 +- .../besu}/cli/PasswordSubCommandTest.java | 4 +- .../besu}/cli/PublicKeySubCommandTest.java | 12 +- .../TomlConfigFileDefaultProviderTest.java | 6 +- .../cli/converter/FractionConverterTest.java | 4 +- .../converter/PercentageConverterTest.java | 4 +- .../cli/custom/RpcAuthFileValidatorTest.java | 2 +- .../cli/operator/OperatorSubCommandTest.java | 25 +- .../cli/options/AbstractCLIOptionsTest.java | 14 +- .../cli/options/EthProtocolOptionsTest.java | 26 +- .../cli/options/MetricsCLIOptionsTest.java | 8 +- .../cli/options/NetworkingOptionsTest.java | 17 +- .../besu}/cli/options/OptionParserTest.java | 4 +- .../cli/options/SynchronizerOptionsTest.java | 8 +- .../options/TransactionPoolOptionsTest.java | 12 +- .../besu}/cli/rlp/RLPSubCommandTest.java | 8 +- .../blocks/BlocksSubCommandTest.java | 22 +- .../ConfigOptionSearchAndRunHandlerTest.java | 4 +- .../besu/plugins/TestBesuEventsPlugin.java | 26 +- .../besu}/plugins/TestPicoCLIPlugin.java | 16 +- .../besu/services/BesuEventsImplTest.java | 76 ++-- .../services/BesuPluginContextImplTest.java | 26 +- .../services/PicoCLIOptionsImplTest.java | 2 +- .../besu}/util/KeyPairUtilTest.java | 4 +- ...rmissioningConfigurationValidatorTest.java | 12 +- .../besu}/util/StringUtilsTest.java | 2 +- .../src/test/resources/auth_correct.toml | 0 .../test/resources/auth_duplicate_user.toml | 0 .../src/test/resources/auth_invalid.toml | 0 .../test/resources/auth_invalid_value.toml | 0 .../src/test/resources/auth_no_password.toml | 0 .../src/test/resources/complete_config.toml | 4 +- .../src/test/resources/everything_config.toml | 0 .../src/test/resources/ibft.blocks | Bin .../test/resources/ibftlegacy_genesis.json | 0 .../src/test/resources/invalidPrivateKey.txt | 0 .../src/test/resources/log4j2.xml | 0 .../src/test/resources/no_bootnodes.toml | 0 .../operator/config_generate_keys.json | 0 .../operator/config_import_keys.json | 0 .../config_import_keys_invalid_keys.json | 0 .../blocks-import-invalid-bad-parent.json | 0 .../clique/blocks-import-invalid-bad-tx.json | 0 .../clique/blocks-import-special-fields.json | 0 .../clique/blocks-import-valid-addendum.json | 0 ...cks-import-valid-no-block-identifiers.json | 0 .../clique/blocks-import-valid.json | 0 .../besu}/chainimport/clique/genesis.json | 0 .../blocks-import-invalid-bad-parent.json | 0 .../ethash/blocks-import-invalid-bad-tx.json | 0 .../ethash/blocks-import-special-fields.json | 0 .../ethash/blocks-import-valid-addendum.json | 0 ...cks-import-valid-no-block-identifiers.json | 0 .../ethash/blocks-import-valid.json | 0 .../besu}/chainimport/ethash/genesis.json | 0 .../chainimport/unsupported/genesis.json | 0 .../util/blockchain-import-genesis-file.json | 0 .../besu}/util/blockchain-import.bin | Bin .../src/test/resources/orion_publickey.pub | 0 .../src/test/resources/partial_config.toml | 0 .../test/resources/permissioning_config.toml | 0 ...ermissioning_config_ropsten_bootnodes.toml | 0 .../src/test/resources}/validPrivateKey.txt | 0 build.gradle | 59 ++-- config/build.gradle | 2 +- .../besu}/config/CliqueConfigOptions.java | 2 +- .../besu}/config/EthashConfigOptions.java | 2 +- .../besu}/config/GenesisAllocation.java | 2 +- .../besu}/config/GenesisConfigFile.java | 6 +- .../besu}/config/GenesisConfigOptions.java | 2 +- .../besu}/config/IbftConfigOptions.java | 2 +- .../config/JsonGenesisConfigOptions.java | 2 +- .../hyperledger/besu}/config/JsonUtil.java | 2 +- .../config/StubGenesisConfigOptions.java | 2 +- .../besu}/config/CliqueConfigOptionsTest.java | 2 +- .../besu}/config/GenesisConfigFileTest.java | 2 +- .../config/GenesisConfigOptionsTest.java | 2 +- .../besu}/config/IbftConfigOptionsTest.java | 2 +- .../besu}/config/JsonUtilTest.java | 2 +- consensus/clique/build.gradle | 2 +- .../BlockHeaderValidationRulesetFactory.java | 32 +- .../consensus/clique/CliqueBlockHashing.java | 16 +- .../clique/CliqueBlockHeaderFunctions.java | 10 +- .../clique/CliqueBlockInterface.java | 16 +- .../besu}/consensus/clique/CliqueContext.java | 8 +- .../clique/CliqueDifficultyCalculator.java | 10 +- .../consensus/clique/CliqueExtraData.java | 14 +- .../besu}/consensus/clique/CliqueHelpers.java | 18 +- .../consensus/clique/CliqueMiningTracker.java | 8 +- .../clique/CliqueProtocolSchedule.java | 40 ++- .../blockcreation/CliqueBlockCreator.java | 46 +-- .../blockcreation/CliqueBlockMiner.java | 22 +- .../blockcreation/CliqueBlockScheduler.java | 12 +- .../blockcreation/CliqueMinerExecutor.java | 38 +- .../CliqueMiningCoordinator.java | 16 +- .../blockcreation/CliqueProposerSelector.java | 10 +- .../CliqueDifficultyValidationRule.java | 18 +- .../CliqueExtraDataValidationRule.java | 22 +- .../CoinbaseHeaderValidationRule.java | 10 +- .../SignerRateLimitValidationRule.java | 14 +- .../VoteValidationRule.java | 8 +- .../jsonrpc/CliqueJsonRpcMethodsFactory.java | 42 +-- .../clique/jsonrpc/CliqueRpcApis.java | 4 +- .../methods/CliqueGetSignerMetrics.java | 14 +- .../jsonrpc/methods/CliqueGetSigners.java | 28 +- .../methods/CliqueGetSignersAtHash.java | 28 +- .../jsonrpc/methods/CliqueProposals.java | 10 +- .../clique/jsonrpc/methods/Discard.java | 18 +- .../clique/jsonrpc/methods/Propose.java | 27 +- .../clique/CliqueBlockHashingTest.java | 16 +- .../clique/CliqueBlockInterfaceTest.java | 24 +- .../CliqueDifficultyCalculatorTest.java | 22 +- .../consensus/clique/CliqueExtraDataTest.java | 18 +- .../clique/CliqueProtocolScheduleTest.java | 14 +- .../clique/NodeCanProduceNextBlockTest.java | 36 +- .../besu}/consensus/clique/TestHelpers.java | 20 +- .../blockcreation/CliqueBlockCreatorTest.java | 71 ++-- .../CliqueBlockSchedulerTest.java | 20 +- .../CliqueMinerExecutorTest.java | 52 +-- .../CliqueMiningCoordinatorTest.java | 38 +- .../CliqueProposerSelectorTest.java | 12 +- .../CliqueDifficultyValidationRuleTest.java | 54 +-- .../CliqueExtraDataValidationRuleTest.java | 30 +- .../VoteValidationRuleTest.java | 8 +- .../methods/CliqueGetSignerMetricsTest.java | 22 +- .../methods/CliqueGetSignersAtHashTest.java | 40 +-- .../jsonrpc/methods/CliqueGetSignersTest.java | 36 +- .../jsonrpc/methods/CliqueProposalsTest.java | 6 +- .../clique/jsonrpc/methods/DiscardTest.java | 20 +- .../clique/jsonrpc/methods/ProposeTest.java | 22 +- consensus/common/build.gradle | 2 +- .../consensus/common/BlockInterface.java | 6 +- .../consensus/common/ConsensusHelpers.java | 6 +- .../besu}/consensus/common/EpochManager.java | 2 +- .../consensus/common/ValidatorProvider.java | 4 +- .../besu}/consensus/common/ValidatorVote.java | 6 +- .../besu}/consensus/common/VoteProposer.java | 4 +- .../besu}/consensus/common/VoteTally.java | 4 +- .../consensus/common/VoteTallyCache.java | 8 +- .../consensus/common/VoteTallyUpdater.java | 8 +- .../besu}/consensus/common/VoteType.java | 2 +- .../AbstractGetSignerMetricsMethod.java | 28 +- .../jsonrpc/AbstractVoteProposerMethod.java | 12 +- .../consensus/common/VoteProposerTest.java | 50 ++- .../consensus/common/VoteTallyCacheTest.java | 31 +- .../besu}/consensus/common/VoteTallyTest.java | 156 ++++----- .../common/VoteTallyUpdaterTest.java | 21 +- .../AbstractVoteProposerMethodTest.java | 14 +- consensus/ibft/build.gradle | 2 +- .../ibft/support/IntegrationTestHelpers.java | 28 +- .../consensus/ibft/support/NetworkLayout.java | 8 +- .../consensus/ibft/support/NodeParams.java | 6 +- .../ibft/support/RoundSpecificPeers.java | 34 +- .../support/StubValidatorMulticaster.java | 8 +- .../ibft/support/StubbedPeerConnection.java | 8 +- .../support/StubbedSynchronizerUpdater.java | 6 +- .../consensus/ibft/support/TestContext.java | 22 +- .../ibft/support/TestContextBuilder.java | 122 +++---- .../consensus/ibft/support/ValidatorPeer.java | 50 +-- .../ibft/tests/FutureHeightTest.java | 26 +- .../consensus/ibft/tests/FutureRoundTest.java | 24 +- .../consensus/ibft/tests/GossipTest.java | 34 +- .../ibft/tests/LocalNodeIsProposerTest.java | 24 +- .../ibft/tests/LocalNodeNotProposerTest.java | 22 +- .../tests/ReceivedFutureProposalTest.java | 36 +- .../consensus/ibft/tests/RoundChangeTest.java | 38 +- .../ibft/tests/SpuriousBehaviourTest.java | 44 +-- .../besu}/consensus/ibft/BlockTimer.java | 6 +- .../ibft/ConsensusRoundIdentifier.java | 6 +- .../ibft/EthSynchronizerUpdater.java | 8 +- .../consensus/ibft/EventMultiplexer.java | 14 +- .../besu}/consensus/ibft/Gossiper.java | 4 +- .../consensus/ibft/IbftBlockHashing.java | 16 +- .../ibft/IbftBlockHeaderFunctions.java | 8 +- ...ftBlockHeaderValidationRulesetFactory.java | 28 +- .../consensus/ibft/IbftBlockInterface.java | 18 +- .../consensus/ibft/IbftChainObserver.java | 10 +- .../besu}/consensus/ibft/IbftContext.java | 6 +- .../besu}/consensus/ibft/IbftEventQueue.java | 4 +- .../besu}/consensus/ibft/IbftExtraData.java | 18 +- .../besu}/consensus/ibft/IbftGossip.java | 22 +- .../besu}/consensus/ibft/IbftHelpers.java | 20 +- .../besu}/consensus/ibft/IbftProcessor.java | 4 +- .../consensus/ibft/IbftProtocolSchedule.java | 24 +- .../besu}/consensus/ibft/MessageTracker.java | 6 +- .../besu}/consensus/ibft/RoundTimer.java | 4 +- .../besu}/consensus/ibft/SizeLimitedMap.java | 2 +- .../consensus/ibft/SynchronizerUpdater.java | 4 +- .../ibft/UniqueMessageMulticaster.java | 8 +- .../besu}/consensus/ibft/Vote.java | 12 +- .../ibft/blockcreation/IbftBlockCreator.java | 26 +- .../IbftBlockCreatorFactory.java | 32 +- .../blockcreation/IbftMiningCoordinator.java | 28 +- .../ibft/blockcreation/ProposerSelector.java | 14 +- .../IbftCoinbaseValidationRule.java | 16 +- .../IbftCommitSealsValidationRule.java | 20 +- .../IbftValidatorsValidationRule.java | 18 +- .../IbftVanityDataValidationRule.java | 12 +- .../ibft/ibftevent/BlockTimerExpiry.java | 6 +- .../consensus/ibft/ibftevent/IbftEvent.java | 6 +- .../consensus/ibft/ibftevent/IbftEvents.java | 4 +- .../ibftevent/IbftReceivedMessageEvent.java | 9 +- .../ibft/ibftevent/NewChainHead.java | 6 +- .../consensus/ibft/ibftevent/RoundExpiry.java | 9 +- .../jsonrpc/IbftJsonRpcMethodsFactory.java | 34 +- .../consensus/ibft/jsonrpc/IbftRpcApis.java | 4 +- .../methods/IbftDiscardValidatorVote.java | 18 +- .../jsonrpc/methods/IbftGetPendingVotes.java | 10 +- .../jsonrpc/methods/IbftGetSignerMetrics.java | 14 +- .../methods/IbftGetValidatorsByBlockHash.java | 22 +- .../IbftGetValidatorsByBlockNumber.java | 20 +- .../methods/IbftProposeValidatorVote.java | 22 +- .../messagedata/AbstractIbftMessageData.java | 8 +- .../ibft/messagedata/CommitMessageData.java | 8 +- .../consensus/ibft/messagedata/IbftV2.java | 2 +- .../ibft/messagedata/PrepareMessageData.java | 8 +- .../ibft/messagedata/ProposalMessageData.java | 8 +- .../messagedata/RoundChangeMessageData.java | 8 +- .../ibft/messagewrappers/Commit.java | 14 +- .../ibft/messagewrappers/IbftMessage.java | 18 +- .../ibft/messagewrappers/Prepare.java | 12 +- .../ibft/messagewrappers/Proposal.java | 22 +- .../ibft/messagewrappers/RoundChange.java | 22 +- .../ibft/network/IbftMessageTransmitter.java | 34 +- .../ibft/network/PeerConnectionTracker.java | 4 +- .../ibft/network/ValidatorMulticaster.java | 6 +- .../ibft/network/ValidatorPeers.java | 12 +- .../consensus/ibft/payload/Authored.java | 4 +- .../consensus/ibft/payload/CommitPayload.java | 14 +- .../ibft/payload/MessageFactory.java | 30 +- .../besu}/consensus/ibft/payload/Payload.java | 12 +- .../ibft/payload/PreparePayload.java | 12 +- .../ibft/payload/PreparedCertificate.java | 6 +- .../ibft/payload/ProposalPayload.java | 12 +- .../ibft/payload/RoundChangeCertificate.java | 8 +- .../ibft/payload/RoundChangePayload.java | 10 +- .../consensus/ibft/payload/RoundSpecific.java | 4 +- .../consensus/ibft/payload/SignedData.java | 18 +- .../ibft/protocol/IbftProtocolManager.java | 20 +- .../ibft/protocol/IbftSubProtocol.java | 8 +- .../ibft/statemachine/BlockHeightManager.java | 18 +- .../statemachine/FutureMessageBuffer.java | 4 +- .../statemachine/IbftBlockHeightManager.java | 40 +-- .../IbftBlockHeightManagerFactory.java | 8 +- .../ibft/statemachine/IbftController.java | 42 +-- .../ibft/statemachine/IbftFinalState.java | 31 +- .../ibft/statemachine/IbftRound.java | 56 +-- .../ibft/statemachine/IbftRoundFactory.java | 22 +- .../statemachine/NoOpBlockHeightManager.java | 18 +- .../statemachine/PreparedRoundArtifacts.java | 10 +- .../statemachine/RoundChangeArtifacts.java | 12 +- .../ibft/statemachine/RoundChangeManager.java | 10 +- .../ibft/statemachine/RoundState.java | 21 +- .../FutureRoundProposalMessageValidator.java | 6 +- .../ibft/validation/MessageValidator.java | 26 +- .../validation/MessageValidatorFactory.java | 24 +- .../ProposalBlockConsistencyValidator.java | 12 +- .../RoundChangeCertificateValidator.java | 36 +- .../RoundChangeMessageValidator.java | 4 +- .../RoundChangePayloadValidator.java | 18 +- .../ibft/validation/SignedDataValidator.java | 22 +- .../consensus/ibft/IbftContextBuilder.java | 10 +- .../besu}/consensus/ibft/BlockTimerTest.java | 10 +- .../ibft/EthSynchronizerUpdaterTest.java | 10 +- .../consensus/ibft/IbftBlockHashingTest.java | 28 +- ...ockHeaderValidationRulesetFactoryTest.java | 28 +- .../consensus/ibft/IbftChainObserverTest.java | 22 +- .../consensus/ibft/IbftEventQueueTest.java | 6 +- .../consensus/ibft/IbftExtraDataFixture.java | 16 +- .../consensus/ibft/IbftExtraDataTest.java | 18 +- .../besu}/consensus/ibft/IbftGossipTest.java | 26 +- .../besu}/consensus/ibft/IbftHelpersTest.java | 36 +- .../consensus/ibft/IbftProcessorTest.java | 4 +- .../consensus/ibft/MessageTrackerTest.java | 6 +- .../besu}/consensus/ibft/RoundTimerTest.java | 4 +- .../consensus/ibft/SizeLimitedMapTest.java | 2 +- .../besu}/consensus/ibft/TestHelpers.java | 30 +- .../ibft/UniqueMessageMulticasterTest.java | 12 +- .../besu}/consensus/ibft/VoteTest.java | 4 +- .../blockcreation/IbftBlockCreatorTest.java | 54 +-- .../IbftMiningCoordinatorTest.java | 22 +- .../blockcreation/ProposerSelectorTest.java | 18 +- .../HeaderValidationTestHelpers.java | 18 +- .../IbftCoinbaseValidationRuleTest.java | 30 +- .../IbftCommitSealsValidationRuleTest.java | 24 +- .../IbftValidatorsValidationRuleTest.java | 25 +- .../IbftVanityDataValidationRuleTest.java | 10 +- .../methods/IbftDiscardValidatorVoteTest.java | 16 +- .../methods/IbftGetPendingVotesTest.java | 6 +- .../methods/IbftGetSignerMetricsTest.java | 22 +- .../IbftGetValidatorsByBlockHashTest.java | 18 +- .../IbftGetValidatorsByBlockNumberTest.java | 16 +- .../methods/IbftProposeValidatorVoteTest.java | 16 +- .../ibft/messagedata/CommitMessageTest.java | 8 +- .../ibft/messagedata/PrepareMessageTest.java | 8 +- .../ibft/messagedata/ProposalMessageTest.java | 8 +- .../messagedata/RoundChangeMessageTest.java | 8 +- .../ibft/network/MockPeerFactory.java | 8 +- .../ibft/network/ValidatorPeersTest.java | 24 +- .../ibft/payload/CommitPayloadTest.java | 16 +- .../ibft/payload/PreparePayloadTest.java | 16 +- .../ibft/payload/PreparedCertificateTest.java | 20 +- .../ibft/payload/ProposalPayloadTest.java | 18 +- .../payload/RoundChangeCertificateTest.java | 22 +- .../ibft/payload/RoundChangePayloadTest.java | 22 +- .../ibft/protocol/IbftSubProtocolTest.java | 2 +- .../statemachine/FutureMessageBufferTest.java | 18 +- .../IbftBlockHeightManagerTest.java | 71 ++-- .../ibft/statemachine/IbftControllerTest.java | 48 +-- .../ibft/statemachine/IbftRoundTest.java | 56 +-- .../RoundChangeArtifactsTest.java | 14 +- .../statemachine/RoundChangeManagerTest.java | 38 +- .../ibft/statemachine/RoundStateTest.java | 26 +- ...tureRoundProposalMessageValidatorTest.java | 16 +- .../ibft/validation/MessageValidatorTest.java | 38 +- ...ProposalBlockConsistencyValidatorTest.java | 18 +- .../RoundChangeCertificateValidatorTest.java | 24 +- .../RoundChangeMessageValidatorTest.java | 10 +- .../RoundChangeSignedDataValidatorTest.java | 26 +- .../validation/SignedDataValidatorTest.java | 26 +- consensus/ibftlegacy/build.gradle | 2 +- .../ibftlegacy/IbftBlockHashing.java | 18 +- ...ftBlockHeaderValidationRulesetFactory.java | 28 +- .../consensus/ibftlegacy/IbftExtraData.java | 18 +- .../consensus/ibftlegacy/IbftHelpers.java | 4 +- .../ibftlegacy/IbftLegacyBlockInterface.java | 16 +- .../ibftlegacy/IbftProtocolSchedule.java | 26 +- .../LegacyIbftBlockHeaderFunctions.java | 8 +- .../blockcreation/IbftBlockCreator.java | 40 +-- .../IbftExtraDataValidationRule.java | 24 +- .../VoteValidationRule.java | 8 +- .../protocol/Istanbul64Protocol.java | 10 +- .../protocol/Istanbul64ProtocolManager.java | 14 +- .../ibftlegacy/IbftBlockHashingTest.java | 16 +- ...ockHeaderValidationRulesetFactoryTest.java | 32 +- .../ibftlegacy/IbftExtraDataTest.java | 25 +- .../IbftLegacyBlockInterfaceTest.java | 24 +- .../consensus/ibftlegacy/TestHelpers.java | 20 +- .../blockcreation/IbftBlockCreatorTest.java | 52 +-- .../IbftExtraDataValidationRuleTest.java | 32 +- crypto/build.gradle | 2 +- .../besu/crypto/BesuProvider.java} | 12 +- .../besu}/crypto/Blake2bfMessageDigest.java | 2 +- .../hyperledger/besu}/crypto/Hash.java | 6 +- ...validSEC256K1PrivateKeyStoreException.java | 2 +- .../besu}/crypto/MessageDigestFactory.java | 4 +- .../besu}/crypto/PRNGSecureRandom.java | 6 +- .../besu}/crypto/PersonalisationString.java | 2 +- .../besu}/crypto/QuickEntropy.java | 2 +- .../hyperledger/besu}/crypto/SECP256K1.java | 18 +- .../besu}/crypto/SecureRandomProvider.java | 2 +- .../crypto/altbn128/AbstractFieldPoint.java | 2 +- .../besu}/crypto/altbn128/AbstractFqp.java | 2 +- .../crypto/altbn128/AltBn128Fq12Pairer.java | 4 +- .../crypto/altbn128/AltBn128Fq12Point.java | 2 +- .../crypto/altbn128/AltBn128Fq2Point.java | 2 +- .../besu}/crypto/altbn128/AltBn128Point.java | 2 +- .../besu}/crypto/altbn128/FieldElement.java | 2 +- .../besu}/crypto/altbn128/FieldPoint.java | 2 +- .../hyperledger/besu}/crypto/altbn128/Fq.java | 6 +- .../besu}/crypto/altbn128/Fq12.java | 2 +- .../besu}/crypto/altbn128/Fq2.java | 2 +- .../crypto/Blake2bfMessageDigestTest.java | 2 +- .../hyperledger/besu}/crypto/HashTest.java | 4 +- .../besu}/crypto/PRNGSecureRandomTest.java | 2 +- .../besu}/crypto/SECP256K1Test.java | 12 +- .../altbn128/AltBn128Fq12PairerTest.java | 2 +- .../altbn128/AltBn128Fq12PointTest.java | 2 +- .../crypto/altbn128/AltBn128Fq2PointTest.java | 2 +- .../crypto/altbn128/AltBn128PointTest.java | 2 +- .../besu}/crypto/altbn128/Fq12Test.java | 2 +- .../besu}/crypto/altbn128/Fq2Test.java | 2 +- .../besu}/crypto/altbn128/FqTest.java | 2 +- .../besu/crypto}/validPrivateKey.txt | 0 docker/Dockerfile | 20 +- docker/tests/00/goss.yaml | 6 +- docker/tests/01/goss.yaml | 6 +- docs/README.md | 6 +- docs/community/code-reviews.md | 6 +- docs/community/community-membership.md | 32 +- docs/development/building.md | 16 +- docs/development/logging.md | 2 +- docs/development/running-developer-builds.md | 10 +- .../besu}/enclave/EnclaveTest.java | 28 +- .../hyperledger/besu}/enclave/Enclave.java | 22 +- .../besu}/enclave/EnclaveException.java | 2 +- .../types/CreatePrivacyGroupRequest.java | 2 +- .../types/DeletePrivacyGroupRequest.java | 2 +- .../besu}/enclave/types/ErrorResponse.java | 2 +- .../types/FindPrivacyGroupRequest.java | 2 +- .../besu}/enclave/types/PrivacyGroup.java | 2 +- .../besu}/enclave/types/ReceiveRequest.java | 2 +- .../besu}/enclave/types/ReceiveResponse.java | 2 +- .../besu}/enclave/types/SendRequest.java | 2 +- .../besu/enclave/types/SendRequestBesu.java} | 6 +- .../enclave/types/SendRequestLegacy.java | 2 +- .../besu}/enclave/types/SendResponse.java | 2 +- .../errorpronechecks/BannedMethod.java | 2 +- .../DoNotCreateSecureRandomDirectly.java | 2 +- .../DoNotInvokeMessageDigestDirectly.java | 2 +- .../DoNotReturnNullOptionals.java | 2 +- .../MethodInputParametersMustBeFinal.java | 2 +- .../errorpronechecks/BannedMethodTest.java | 2 +- .../DoNotCreateSecureRandomDirectlyTest.java | 2 +- .../DoNotInvokeMessageDigestDirectlyTest.java | 2 +- .../DoNotReturnNullOptionalsTest.java | 2 +- .../MethodInputParametersMustBeFinalTest.java | 2 +- .../BannedMethodNegativeCases.java | 2 +- .../BannedMethodPositiveCases.java | 2 +- ...eateSecureRandomDirectlyNegativeCases.java | 2 +- ...eateSecureRandomDirectlyPositiveCases.java | 2 +- ...okeMessageDigestDirectlyNegativeCases.java | 2 +- ...okeMessageDigestDirectlyPositiveCases.java | 2 +- ...DoNotReturnNullOptionalsNegativeCases.java | 2 +- ...DoNotReturnNullOptionalsPositiveCases.java | 2 +- ...tersMustBeFinalInterfaceNegativeCases.java | 2 +- ...tersMustBeFinalInterfacePositiveCases.java | 2 +- ...putParametersMustBeFinalNegativeCases.java | 2 +- ...putParametersMustBeFinalPositiveCases.java | 2 +- ethereum/api/build.gradle | 2 +- .../api/jsonrpc/BlockchainImporter.java | 18 +- .../api/jsonrpc/JsonRpcResponseKey.java | 2 +- .../api/jsonrpc/JsonRpcResponseUtils.java | 74 ++-- .../jsonrpc/JsonRpcTestMethodsFactory.java | 58 +-- .../methods/EthCallIntegrationTest.java | 26 +- .../EthEstimateGasIntegrationTest.java | 20 +- .../EthGetBlockByHashIntegrationTest.java | 123 ++++--- .../EthGetBlockByNumberIntegrationTest.java | 317 ++++++++++------- .../EthGetFilterChangesIntegrationTest.java | 74 ++-- ...cleByBlockHashAndIndexIntegrationTest.java | 107 ++++++ ...eByBlockNumberAndIndexIntegrationTest.java | 104 ++++++ ...vGetPrivateTransactionIntegrationTest.java | 52 +-- ...cleByBlockHashAndIndexIntegrationTest.java | 112 ------ ...eByBlockNumberAndIndexIntegrationTest.java | 109 ------ .../besu}/ethereum/api/BlockWithMetadata.java | 6 +- .../besu}/ethereum/api/LogWithMetadata.java | 10 +- .../besu}/ethereum/api/LogsQuery.java | 8 +- .../besu}/ethereum/api/TopicsParameter.java | 6 +- .../ethereum/api/TransactionWithMetadata.java | 6 +- .../api/graphql/GraphQLConfiguration.java | 2 +- .../graphql/GraphQLDataFetcherContext.java | 16 +- .../api/graphql/GraphQLDataFetchers.java | 56 +-- .../api/graphql/GraphQLException.java | 4 +- .../api/graphql/GraphQLHttpService.java | 14 +- .../ethereum/api/graphql/GraphQLProvider.java | 4 +- .../api/graphql/GraphQLServiceException.java | 2 +- .../api/graphql/internal/BlockchainQuery.java | 30 +- .../api/graphql/internal/Scalars.java | 10 +- .../TransactionReceiptWithMetadata.java | 8 +- .../internal/pojoadapter/AccountAdapter.java | 12 +- .../internal/pojoadapter/AdapterBase.java | 6 +- .../pojoadapter/BlockAdapterBase.java | 42 +-- .../internal/pojoadapter/CallResult.java | 4 +- .../internal/pojoadapter/LogAdapter.java | 16 +- .../pojoadapter/NormalBlockAdapter.java | 16 +- .../pojoadapter/PendingStateAdapter.java | 28 +- .../pojoadapter/SyncStateAdapter.java | 4 +- .../pojoadapter/TransactionAdapter.java | 26 +- .../pojoadapter/UncleBlockAdapter.java | 6 +- .../internal/response/GraphQLError.java | 4 +- .../response/GraphQLErrorResponse.java | 2 +- .../internal/response/GraphQLJsonRequest.java | 2 +- .../internal/response/GraphQLNoResponse.java | 2 +- .../internal/response/GraphQLResponse.java | 2 +- .../response/GraphQLResponseType.java | 2 +- .../response/GraphQLSuccessResponse.java | 2 +- .../api/jsonrpc/JsonRpcConfiguration.java | 2 +- .../jsonrpc/JsonRpcEnclaveErrorConverter.java | 4 +- .../api/jsonrpc/JsonRpcErrorConverter.java | 6 +- .../api/jsonrpc/JsonRpcHttpService.java | 42 +-- .../api/jsonrpc/JsonRpcMethodsFactory.java | 234 ++++++------- .../api/jsonrpc/JsonRpcServiceException.java | 2 +- .../api/jsonrpc/LatestNonceProvider.java | 10 +- .../besu}/ethereum/api/jsonrpc/RpcApi.java | 2 +- .../besu}/ethereum/api/jsonrpc/RpcApis.java | 2 +- .../besu}/ethereum/api/jsonrpc/RpcMethod.java | 6 +- .../ethereum/api/jsonrpc/RpcMethods.java | 4 +- .../authentication/AuthenticationService.java | 6 +- .../authentication/AuthenticationUtils.java | 4 +- .../api/jsonrpc/authentication/TomlAuth.java | 2 +- .../authentication/TomlAuthOptions.java | 2 +- .../api/jsonrpc/authentication/TomlUser.java | 2 +- .../api/jsonrpc/health/HealthService.java | 2 +- .../api/jsonrpc/health/LivenessCheck.java | 9 +- .../api/jsonrpc/health/ReadinessCheck.java | 18 +- .../api/jsonrpc/internal/JsonRpcRequest.java | 4 +- .../jsonrpc/internal/JsonRpcRequestId.java | 4 +- .../exception/InvalidJsonRpcParameters.java | 2 +- .../InvalidJsonRpcRequestException.java | 2 +- .../jsonrpc/internal/filter/BlockFilter.java | 4 +- .../api/jsonrpc/internal/filter/Filter.java | 2 +- .../internal/filter/FilterIdGenerator.java | 6 +- .../internal/filter/FilterManager.java | 20 +- .../internal/filter/FilterRepository.java | 2 +- .../internal/filter/FilterTimeoutMonitor.java | 2 +- .../jsonrpc/internal/filter/LogFilter.java | 8 +- .../filter/PendingTransactionFilter.java | 4 +- .../methods/AbstractBlockParameterMethod.java | 16 +- .../internal/methods/AdminAddPeer.java | 18 +- .../internal/methods/AdminChangeLogLevel.java | 18 +- .../internal/methods/AdminModifyPeer.java | 18 +- .../internal/methods/AdminNodeInfo.java | 26 +- .../jsonrpc/internal/methods/AdminPeers.java | 20 +- .../internal/methods/AdminRemovePeer.java | 16 +- .../internal/methods/DebugAccountRange.java | 32 +- .../internal/methods/DebugMetrics.java | 14 +- .../internal/methods/DebugStorageRangeAt.java | 40 +-- .../internal/methods/DebugTraceBlock.java | 40 +-- .../methods/DebugTraceBlockByHash.java | 28 +- .../methods/DebugTraceBlockByNumber.java | 26 +- .../methods/DebugTraceTransaction.java | 28 +- .../jsonrpc/internal/methods/EthAccounts.java | 10 +- .../internal/methods/EthBlockNumber.java | 16 +- .../api/jsonrpc/internal/methods/EthCall.java | 32 +- .../jsonrpc/internal/methods/EthChainId.java | 12 +- .../jsonrpc/internal/methods/EthCoinbase.java | 18 +- .../internal/methods/EthEstimateGas.java | 30 +- .../jsonrpc/internal/methods/EthGasPrice.java | 16 +- .../internal/methods/EthGetBalance.java | 18 +- .../internal/methods/EthGetBlockByHash.java | 20 +- .../internal/methods/EthGetBlockByNumber.java | 16 +- .../EthGetBlockTransactionCountByHash.java | 18 +- .../EthGetBlockTransactionCountByNumber.java | 14 +- .../jsonrpc/internal/methods/EthGetCode.java | 18 +- .../internal/methods/EthGetFilterChanges.java | 24 +- .../internal/methods/EthGetFilterLogs.java | 24 +- .../jsonrpc/internal/methods/EthGetLogs.java | 24 +- .../jsonrpc/internal/methods/EthGetProof.java | 30 +- .../internal/methods/EthGetStorageAt.java | 18 +- .../EthGetTransactionByBlockHashAndIndex.java | 24 +- ...thGetTransactionByBlockNumberAndIndex.java | 18 +- .../methods/EthGetTransactionByHash.java | 26 +- .../methods/EthGetTransactionCount.java | 18 +- .../methods/EthGetTransactionReceipt.java | 26 +- .../EthGetUncleByBlockHashAndIndex.java | 24 +- .../EthGetUncleByBlockNumberAndIndex.java | 18 +- .../methods/EthGetUncleCountByBlockHash.java | 18 +- .../EthGetUncleCountByBlockNumber.java | 14 +- .../jsonrpc/internal/methods/EthGetWork.java | 20 +- .../jsonrpc/internal/methods/EthHashrate.java | 14 +- .../jsonrpc/internal/methods/EthMining.java | 12 +- .../internal/methods/EthNewBlockFilter.java | 12 +- .../internal/methods/EthNewFilter.java | 20 +- .../EthNewPendingTransactionFilter.java | 12 +- .../internal/methods/EthProtocolVersion.java | 16 +- .../methods/EthSendRawTransaction.java | 40 +-- .../internal/methods/EthSendTransaction.java | 12 +- .../jsonrpc/internal/methods/EthSyncing.java | 14 +- .../internal/methods/EthUninstallFilter.java | 14 +- .../internal/methods/JsonRpcMethod.java | 6 +- .../methods/JsonRpcMethodFactory.java | 4 +- .../jsonrpc/internal/methods/NetEnode.java | 20 +- .../internal/methods/NetListening.java | 12 +- .../internal/methods/NetPeerCount.java | 20 +- .../jsonrpc/internal/methods/NetServices.java | 20 +- .../jsonrpc/internal/methods/NetVersion.java | 10 +- .../jsonrpc/internal/methods/RpcModules.java | 12 +- .../methods/TraceReplayBlockTransactions.java | 40 +-- .../methods/TxPoolBesuStatistics.java} | 22 +- .../methods/TxPoolBesuTransactions.java} | 20 +- .../internal/methods/Web3ClientVersion.java | 10 +- .../jsonrpc/internal/methods/Web3Sha3.java | 20 +- .../methods/miner/MinerSetCoinbase.java | 22 +- .../methods/miner/MinerSetEtherbase.java | 10 +- .../internal/methods/miner/MinerStart.java | 20 +- .../internal/methods/miner/MinerStop.java | 14 +- .../PermAddAccountsToWhitelist.java | 22 +- .../PermAddNodesToWhitelist.java | 24 +- .../PermGetAccountsWhitelist.java | 18 +- .../permissioning/PermGetNodesWhitelist.java | 22 +- .../PermReloadPermissionsFromFile.java | 22 +- .../PermRemoveAccountsFromWhitelist.java | 22 +- .../PermRemoveNodesFromWhitelist.java | 24 +- .../internal/parameters/BlockParameter.java | 4 +- .../parameters/BlockParameterOrBlockHash.java | 6 +- .../internal/parameters/FilterParameter.java | 8 +- .../parameters/JsonCallParameter.java | 10 +- .../internal/parameters/JsonRpcParameter.java | 4 +- .../parameters/StringListParameter.java | 2 +- .../parameters/TopicsDeserializer.java | 4 +- .../parameters/TraceTypeParameter.java | 4 +- .../parameters/TransactionTraceParams.java | 4 +- .../internal/parameters/UInt256Parameter.java | 4 +- .../parameters/UnsignedIntParameter.java | 2 +- .../parameters/UnsignedLongParameter.java | 2 +- .../methods/eea/EeaGetTransactionCount.java | 22 +- .../methods/eea/EeaGetTransactionReceipt.java | 58 +-- .../methods/eea/EeaPrivateNonceProvider.java | 14 +- .../methods/eea/EeaSendRawTransaction.java | 57 +-- .../methods/priv/PrivCreatePrivacyGroup.java | 28 +- .../methods/priv/PrivDeletePrivacyGroup.java | 22 +- .../methods/priv/PrivFindPrivacyGroup.java | 22 +- .../priv/PrivGetPrivacyPrecompileAddress.java | 20 +- .../priv/PrivGetPrivateTransaction.java | 38 +- .../methods/priv/PrivGetTransactionCount.java | 26 +- .../CreatePrivacyGroupParameter.java | 2 +- .../internal/processor/BlockReplay.java | 28 +- .../internal/processor/BlockTrace.java | 2 +- .../internal/processor/BlockTracer.java | 16 +- .../internal/processor/TransactionTrace.java | 8 +- .../internal/processor/TransactionTracer.java | 10 +- .../internal/queries/BlockchainQueries.java | 42 +-- .../TransactionReceiptWithMetadata.java | 8 +- .../internal/response/JsonRpcError.java | 4 +- .../response/JsonRpcErrorResponse.java | 2 +- .../internal/response/JsonRpcNoResponse.java | 2 +- .../internal/response/JsonRpcResponse.java | 2 +- .../response/JsonRpcResponseType.java | 2 +- .../response/JsonRpcSuccessResponse.java | 2 +- .../response/JsonRpcUnauthorizedResponse.java | 2 +- .../jsonrpc/internal/results/BlockResult.java | 6 +- .../internal/results/BlockResultFactory.java | 8 +- .../results/DebugAccountRangeAtResult.java | 2 +- .../results/DebugStorageRangeAtResult.java | 8 +- .../results/DebugTraceTransactionResult.java | 6 +- .../internal/results/JsonRpcResult.java | 2 +- .../jsonrpc/internal/results/LogResult.java | 6 +- .../jsonrpc/internal/results/LogsResult.java | 4 +- .../internal/results/NetworkResult.java | 2 +- .../jsonrpc/internal/results/PeerResult.java | 6 +- .../results/PendingTransactionsResult.java | 4 +- .../PendingTransactionsStatisticsResult.java | 2 +- .../jsonrpc/internal/results/Quantity.java | 10 +- .../internal/results/SignerMetricResult.java | 4 +- .../jsonrpc/internal/results/StructLog.java | 12 +- .../internal/results/StructLogWithError.java | 6 +- .../internal/results/SyncingResult.java | 4 +- .../results/TransactionCompleteResult.java | 8 +- .../results/TransactionHashResult.java | 2 +- .../results/TransactionInfoResult.java | 4 +- .../results/TransactionPendingResult.java | 6 +- .../results/TransactionReceiptLogResult.java | 8 +- .../results/TransactionReceiptResult.java | 16 +- .../results/TransactionReceiptRootResult.java | 4 +- .../TransactionReceiptStatusResult.java | 4 +- .../internal/results/TransactionResult.java | 2 +- .../internal/results/UncleBlockResult.java | 10 +- .../PrivateTransactionGroupResult.java | 6 +- .../PrivateTransactionLegacyResult.java | 6 +- .../PrivateTransactionReceiptResult.java | 10 +- .../privacy/PrivateTransactionResult.java | 10 +- .../results/proof/GetProofResult.java | 18 +- .../results/proof/StorageEntryProof.java | 8 +- .../internal/results/tracing/Action.java | 18 +- .../internal/results/tracing/FlatTrace.java | 4 +- .../results/tracing/FlatTraceGenerator.java | 18 +- .../internal/results/tracing/Result.java | 2 +- .../internal/results/tracing/Trace.java | 2 +- .../results/tracing/TraceFormatter.java | 6 +- .../internal/results/tracing/TraceWriter.java | 2 +- .../websocket/WebSocketConfiguration.java | 6 +- .../websocket/WebSocketRequestHandler.java | 16 +- .../jsonrpc/websocket/WebSocketService.java | 8 +- .../methods/AbstractSubscriptionMethod.java | 8 +- .../websocket/methods/EthSubscribe.java | 24 +- .../websocket/methods/EthUnsubscribe.java | 24 +- .../methods/WebSocketMethodsFactory.java | 10 +- .../methods/WebSocketRpcRequest.java | 4 +- .../websocket/subscription/Subscription.java | 4 +- .../subscription/SubscriptionBuilder.java | 12 +- .../subscription/SubscriptionManager.java | 26 +- .../SubscriptionNotFoundException.java | 2 +- .../NewBlockHeadersSubscription.java | 6 +- .../NewBlockHeadersSubscriptionService.java | 20 +- .../subscription/logs/LogsSubscription.java | 10 +- .../logs/LogsSubscriptionService.java | 22 +- .../PendingTransactionDetailResult.java | 10 +- ...TransactionDroppedSubscriptionService.java | 16 +- .../pending/PendingTransactionResult.java | 6 +- ...PendingTransactionSubscriptionService.java | 12 +- .../request/InvalidRequestException.java | 2 +- .../InvalidSubscriptionRequestException.java | 2 +- .../request/LogsSubscriptionParam.java | 2 +- .../request/SubscribeRequest.java | 4 +- .../request/SubscriptionParam.java | 2 +- .../request/SubscriptionRequestMapper.java | 16 +- .../request/SubscriptionType.java | 2 +- .../request/UnsubscribeRequest.java | 2 +- .../response/SubscriptionResponse.java | 6 +- .../response/SubscriptionResponseResult.java | 4 +- .../syncing/NotSynchronisingResult.java | 4 +- .../syncing/SyncingSubscription.java | 6 +- .../syncing/SyncingSubscriptionService.java | 14 +- .../api/graphql/AbstractDataFetcherTest.java | 8 +- .../AbstractEthGraphQLHttpServiceTest.java | 56 +-- .../api/graphql/BlockDataFetcherTest.java | 8 +- .../EthGraphQLHttpBySpecErrorCaseTest.java | 2 +- .../api/graphql/EthGraphQLHttpBySpecTest.java | 2 +- .../api/graphql/GraphQLConfigurationTest.java | 2 +- .../graphql/GraphQLHttpServiceCorsTest.java | 16 +- .../GraphQLHttpServiceHostWhitelistTest.java | 16 +- .../api/graphql/GraphQLHttpServiceTest.java | 26 +- .../api/graphql/GraphQLTestHelper.java | 2 +- .../api/graphql/scalar/AddressScalarTest.java | 6 +- .../api/graphql/scalar/BigIntScalarTest.java | 6 +- .../api/graphql/scalar/Bytes32ScalarTest.java | 6 +- .../api/graphql/scalar/BytesScalarTest.java | 6 +- .../api/graphql/scalar/LongScalarTest.java | 4 +- .../AbstractJsonRpcHttpBySpecTest.java | 2 +- .../AbstractJsonRpcHttpServiceTest.java | 50 +-- .../jsonrpc/AdminJsonRpcHttpServiceTest.java | 10 +- .../jsonrpc/DebugJsonRpcHttpBySpecTest.java | 4 +- .../api/jsonrpc/EthJsonRpcHttpBySpecTest.java | 4 +- .../api/jsonrpc/JsonRpcConfigurationTest.java | 2 +- .../jsonrpc/JsonRpcHttpServiceCorsTest.java | 6 +- .../JsonRpcHttpServiceHostWhitelistTest.java | 38 +- .../jsonrpc/JsonRpcHttpServiceLoginTest.java | 49 +-- .../JsonRpcHttpServiceRpcApisTest.java | 50 +-- .../api/jsonrpc/JsonRpcHttpServiceTest.java | 68 ++-- .../api/jsonrpc/JsonRpcTestHelper.java | 2 +- .../api/jsonrpc/LatestNonceProviderTest.java | 8 +- .../api/jsonrpc/MockPeerConnection.java | 6 +- .../jsonrpc/SimpleTestTransactionBuilder.java | 12 +- .../jsonrpc/TraceJsonRpcHttpBySpecTest.java | 16 +- .../AuthenticationUtilsTest.java | 2 +- .../jsonrpc/authentication/TomlAuthTest.java | 2 +- .../jsonrpc/health/ReadinessCheckTest.java | 13 +- .../filter/EthJsonRpcHttpServiceTest.java | 12 +- .../filter/FilterIdGeneratorTest.java | 4 +- .../filter/FilterManagerLogFilterTest.java | 26 +- .../internal/filter/FilterManagerTest.java | 18 +- .../internal/filter/FilterRepositoryTest.java | 2 +- .../jsonrpc/internal/filter/FilterTest.java | 2 +- .../filter/FilterTimeoutMonitorTest.java | 2 +- .../internal/filter/LogsQueryTest.java | 12 +- .../internal/methods/AdminAddPeerTest.java | 18 +- .../methods/AdminChangeLogLevelTest.java | 14 +- .../internal/methods/AdminNodeInfoTest.java | 34 +- .../internal/methods/AdminPeersTest.java | 30 +- .../internal/methods/DebugMetricsTest.java | 14 +- .../methods/DebugStorageRangeAtTest.java | 56 +-- .../methods/DebugTraceBlockByHashTest.java | 26 +- .../methods/DebugTraceBlockByNumberTest.java | 30 +- .../internal/methods/DebugTraceBlockTest.java | 38 +- .../methods/DebugTraceTransactionTest.java | 36 +- .../internal/methods/EthBlockNumberTest.java | 12 +- .../jsonrpc/internal/methods/EthCallTest.java | 28 +- .../internal/methods/EthChainIdTest.java | 10 +- .../internal/methods/EthCoinbaseTest.java | 16 +- .../internal/methods/EthEstimateGasTest.java | 37 +- .../internal/methods/EthGasPriceTest.java | 12 +- .../methods/EthGetBlockByHashTest.java | 14 +- .../methods/EthGetFilterChangesTest.java | 28 +- .../methods/EthGetFilterLogsTest.java | 28 +- .../internal/methods/EthGetProofTest.java | 36 +- ...GetTransactionByBlockHashAndIndexTest.java | 18 +- .../methods/EthGetTransactionCountTest.java | 14 +- .../methods/EthGetTransactionReceiptTest.java | 36 +- .../EthGetUncleByBlockHashAndIndexTest.java | 38 +- .../EthGetUncleByBlockNumberAndIndexTest.java | 38 +- .../internal/methods/EthGetWorkTest.java | 20 +- .../internal/methods/EthHashrateTest.java | 10 +- .../internal/methods/EthMiningTest.java | 10 +- .../methods/EthNewBlockFilterTest.java | 10 +- .../internal/methods/EthNewFilterTest.java | 22 +- .../methods/EthProtocolVersionTest.java | 12 +- .../methods/EthSendRawTransactionTest.java | 22 +- .../methods/EthSendTransactionTest.java | 10 +- .../internal/methods/EthSyncingTest.java | 16 +- .../internal/methods/NetEnodeTest.java | 30 +- .../internal/methods/NetListeningTest.java | 17 +- .../internal/methods/NetVersionTest.java | 8 +- .../internal/methods/RpcModulesTest.java | 10 +- .../methods/TxPoolBesuStatisticsTest.java} | 20 +- .../methods/TxPoolBesuTransactionsTest.java} | 24 +- .../methods/Web3ClientVersionTest.java | 10 +- .../internal/methods/Web3Sha3Test.java | 12 +- .../methods/miner/MinerSetCoinbaseTest.java | 20 +- .../methods/miner/MinerSetEtherbaseTest.java | 6 +- .../methods/miner/MinerStartTest.java | 16 +- .../internal/methods/miner/MinerStopTest.java | 10 +- .../PermAddAccountsToWhitelistTest.java | 20 +- .../PermAddNodesToWhitelistTest.java | 24 +- .../PermGetAccountsWhitelistTest.java | 10 +- .../PermGetNodesWhitelistTest.java | 18 +- .../PermReloadPermissionsFromFileTest.java | 16 +- .../PermRemoveAccountsFromWhitelistTest.java | 20 +- .../PermRemoveNodesFromWhitelistTest.java | 24 +- .../eea/EeaGetTransactionCountTest.java | 20 +- .../eea/EeaPrivateNonceProviderTest.java | 18 +- .../parameters/FilterParameterTest.java | 6 +- .../eea/EeaGetTransactionReceiptTest.java | 52 +-- .../eea/EeaSendRawTransactionTest.java | 34 +- .../priv/PrivCreatePrivacyGroupTest.java | 26 +- .../PrivGetPrivacyPrecompileAddressTest.java | 21 +- .../priv/PrivGetPrivateTransactionTest.java | 46 +-- .../priv/PrivGetTransactionCountTest.java | 16 +- .../processor/TransactionTracerTest.java | 32 +- .../queries/BlockchainQueriesTest.java | 44 +-- .../internal/results/NetworkResultTest.java | 2 +- .../websocket/WebSocketConfigurationTest.java | 4 +- .../websocket/WebSocketHostWhitelistTest.java | 10 +- .../WebSocketRequestHandlerTest.java | 14 +- .../websocket/WebSocketServiceLoginTest.java | 13 +- .../websocket/WebSocketServiceTest.java | 10 +- .../methods/EthSubscribeIntegrationTest.java | 23 +- .../websocket/methods/EthSubscribeTest.java | 20 +- .../EthUnsubscribeIntegrationTest.java | 14 +- .../websocket/methods/EthUnsubscribeTest.java | 20 +- .../methods/WebSocketMethodsFactoryTest.java | 6 +- .../subscription/SubscriptionBuilderTest.java | 14 +- .../SubscriptionManagerSendMessageTest.java | 12 +- .../subscription/SubscriptionManagerTest.java | 14 +- ...ewBlockHeadersSubscriptionServiceTest.java | 34 +- .../logs/LogsSubscriptionServiceTest.java | 49 +-- ...sactionDroppedSubscriptionServiceTest.java | 16 +- ...ingTransactionSubscriptionServiceTest.java | 18 +- .../SubscriptionRequestMapperTest.java | 14 +- .../SyncingSubscriptionServiceTest.java | 22 +- .../ethereum/api/graphql/eth_blockNumber.json | 0 .../ethereum/api/graphql/eth_call_Block8.json | 0 .../api/graphql/eth_call_BlockLatest.json | 0 .../eth_estimateGas_contractDeploy.json | 0 .../api/graphql/eth_estimateGas_noParams.json | 0 .../api/graphql/eth_estimateGas_transfer.json | 0 .../ethereum/api/graphql/eth_gasPrice.json | 0 .../api/graphql/eth_getBalance_0x19.json | 0 ..._getBalance_invalidAccountBlockNumber.json | 0 .../eth_getBalance_invalidAccountLatest.json | 0 .../api/graphql/eth_getBalance_latest.json | 0 .../api/graphql/eth_getBalance_toobig_bn.json | 0 .../graphql/eth_getBalance_without_addr.json | 0 .../eth_getBlockTransactionCount_byHash.json | 0 ...eth_getBlockTransactionCount_byNumber.json | 0 .../api/graphql/eth_getBlock_byHash.json | 0 .../graphql/eth_getBlock_byHashInvalid.json | 0 .../api/graphql/eth_getBlock_byNumber.json | 0 .../graphql/eth_getBlock_byNumberInvalid.json | 0 .../api/graphql/eth_getBlock_wrongParams.json | 0 .../ethereum/api/graphql/eth_getCode.json | 0 .../api/graphql/eth_getCode_noCode.json | 0 .../api/graphql/eth_getLogs_matchTopic.json | 0 .../api/graphql/eth_getStorageAt.json | 0 ..._getStorageAt_illegalRangeGreaterThan.json | 0 .../api/graphql/eth_getTransactionCount.json | 0 .../graphql/eth_getTransactionReceipt.json | 0 ...th_getTransaction_byBlockHashAndIndex.json | 0 ..._getTransaction_byBlockNumberAndIndex.json | 0 ...nsaction_byBlockNumberAndInvalidIndex.json | 0 .../graphql/eth_getTransaction_byHash.json | 0 .../eth_getTransaction_byHashNull.json | 0 ...h_sendRawTransaction_contractCreation.json | 0 .../eth_sendRawTransaction_messageCall.json | 0 .../eth_sendRawTransaction_nonceTooLow.json | 0 .../eth_sendRawTransaction_transferEther.json | 0 ...endRawTransaction_unsignedTransaction.json | 0 .../ethereum/api/graphql/eth_syncing.json | 0 .../api/graphql/graphql_blocks_byFrom.json | 0 .../api/graphql/graphql_blocks_byRange.json | 0 .../graphql/graphql_blocks_byWrongRange.json | 0 .../ethereum/api/graphql/graphql_pending.json | 0 .../debug/debug_accountRange_blockHash.json | 0 .../debug/debug_accountRange_complete.json | 0 .../debug/debug_accountRange_partial.json | 0 .../debug/debug_storageRangeAt_blockHash.json | 0 .../debug_storageRangeAt_blockNumber.json | 0 .../debug/debug_storageRangeAt_midBlock.json | 0 .../api/jsonrpc/eth/eth_blockNumber.json | 0 .../api/jsonrpc/eth/eth_call_block_8.json | 0 .../eth_call_callParamsMissing_block_8.json | 0 .../jsonrpc/eth/eth_call_earliestBlock.json | 0 .../eth/eth_call_gasLimitTooLow_block_8.json | 0 .../eth/eth_call_gasPriceTooHigh_block_8.json | 0 .../api/jsonrpc/eth/eth_call_latestBlock.json | 0 .../api/jsonrpc/eth/eth_call_pending.json | 0 .../eth/eth_call_toMissing_block_8.json | 0 .../eth/eth_call_valueTooHigh_block_8.json | 0 .../eth/eth_estimateGas_contractDeploy.json | 0 .../eth/eth_estimateGas_insufficientGas.json | 0 .../jsonrpc/eth/eth_estimateGas_noParams.json | 0 .../jsonrpc/eth/eth_estimateGas_transfer.json | 0 ...th_getBalance_illegalRangeGreaterThan.json | 0 .../eth_getBalance_illegalRangeLessThan.json | 0 .../eth/eth_getBalance_invalidParams.json | 0 .../jsonrpc/eth/eth_getBalance_latest.json | 0 .../jsonrpc/eth/eth_getBalance_pending.json | 0 .../eth/eth_getBlockByNumber_complete.json | 0 .../eth/eth_getBlockByNumber_hashes.json | 0 ...eth_getBlockTransactionCountByHash_00.json | 0 ...eth_getBlockTransactionCountByHash_01.json | 0 ...eth_getBlockTransactionCountByHash_02.json | 0 ...eth_getBlockTransactionCountByHash_03.json | 0 ...eth_getBlockTransactionCountByHash_04.json | 0 ...eth_getBlockTransactionCountByHash_05.json | 0 ...eth_getBlockTransactionCountByHash_06.json | 0 ...eth_getBlockTransactionCountByHash_07.json | 0 ...eth_getBlockTransactionCountByHash_08.json | 0 ...eth_getBlockTransactionCountByHash_09.json | 0 ...eth_getBlockTransactionCountByHash_10.json | 0 ...eth_getBlockTransactionCountByHash_11.json | 0 ...kTransactionCountByHash_invalidParams.json | 0 ...tBlockTransactionCountByHash_noResult.json | 0 ...h_getBlockTransactionCountByNumber_00.json | 0 ...lockTransactionCountByNumber_earliest.json | 0 ...CountByNumber_illegalRangeGreaterThan.json | 0 ...ionCountByNumber_illegalRangeLessThan.json | 0 ...ransactionCountByNumber_invalidParams.json | 0 ...tBlockTransactionCountByNumber_latest.json | 0 ...getBlockTransactionCountByNumber_null.json | 0 .../eth_getCode_illegalRangeGreaterThan.json | 0 .../eth/eth_getCode_illegalRangeLessThan.json | 0 .../eth/eth_getCode_invalidParams.json | 0 .../jsonrpc/eth/eth_getCode_noCodeLatest.json | 0 .../jsonrpc/eth/eth_getCode_noCodeNumber.json | 0 .../api/jsonrpc/eth/eth_getCode_pending.json | 0 .../api/jsonrpc/eth/eth_getCode_success.json | 0 ...eth_getFilterChanges_FilterIdNegative.json | 0 .../eth_getFilterChanges_FilterIdTooLong.json | 0 ...th_getFilterChanges_NonexistentFilter.json | 0 .../jsonrpc/eth/eth_getLogs_blockhash.json | 0 ...th_getLogs_blockhash_missingBlockHash.json | 0 .../eth/eth_getLogs_failTopicPosition.json | 0 .../eth_getLogs_fromBlockExceedToBlock.json | 0 .../jsonrpc/eth/eth_getLogs_invalidInput.json | 0 .../jsonrpc/eth/eth_getLogs_matchTopic.json | 0 .../jsonrpc/eth/eth_getLogs_nullParam.json | 0 .../eth/eth_getLogs_toBlockOutOfRange.json | 0 .../eth/eth_getNewFilter_addressOnly.json | 0 .../eth/eth_getNewFilter_emptyFilter.json | 0 .../eth/eth_getNewFilter_invalidFilter.json | 0 .../eth/eth_getNewFilter_topicOnly.json | 0 ...h_getNewFilter_validFilterLatestBlock.json | 0 ...tNewFilter_validFilterWithBlockNumber.json | 0 ..._getStorageAt_illegalRangeGreaterThan.json | 0 ...eth_getStorageAt_illegalRangeLessThan.json | 0 .../eth/eth_getStorageAt_invalidParams.json | 0 .../jsonrpc/eth/eth_getStorageAt_latest.json | 0 .../jsonrpc/eth/eth_getStorageAt_pending.json | 0 ..._getTransactionByBlockHashAndIndex_00.json | 0 ..._getTransactionByBlockHashAndIndex_01.json | 0 ..._getTransactionByBlockHashAndIndex_02.json | 0 ...actionByBlockHashAndIndex_intOverflow.json | 0 ...onByBlockHashAndIndex_missingParam_00.json | 0 ...onByBlockHashAndIndex_missingParam_01.json | 0 ...tionByBlockHashAndIndex_missingParams.json | 0 ...etTransactionByBlockHashAndIndex_null.json | 0 ...ionByBlockHashAndIndex_wrongParamType.json | 0 ...etTransactionByBlockNumberAndIndex_00.json | 0 ...etTransactionByBlockNumberAndIndex_01.json | 0 ...ionByBlockNumberAndIndex_earliestNull.json | 0 ...onByBlockNumberAndIndex_invalidParams.json | 0 ...ansactionByBlockNumberAndIndex_latest.json | 0 ...TransactionByBlockNumberAndIndex_null.json | 0 ...nsactionByBlockNumberAndIndex_pending.json | 0 ..._getTransactionByHash_addressReceiver.json | 0 ...getTransactionByHash_contractCreation.json | 0 ...TransactionByHash_invalidHashAndIndex.json | 0 ...th_getTransactionByHash_invalidParams.json | 0 .../eth/eth_getTransactionByHash_null.json | 0 ...eth_getTransactionByHash_typeMismatch.json | 0 .../eth_getTransactionCount_blockNumber.json | 0 .../eth/eth_getTransactionCount_earliest.json | 0 .../eth_getTransactionCount_illegalRange.json | 0 .../eth/eth_getTransactionCount_latest.json | 0 ...h_getTransactionCount_missingArgument.json | 0 .../eth/eth_getTransactionCount_pending.json | 0 ...getTransactionReceipt_contractAddress.json | 0 .../eth/eth_getTransactionReceipt_logs.json | 0 ...ransactionReceipt_nullContractAddress.json | 0 .../api/jsonrpc/eth/eth_newBlockFilter.json | 0 .../eth/eth_newPendingTransactionFilter.json | 0 .../api/jsonrpc/eth/eth_protocolVersion.json | 0 ...h_sendRawTransaction_contractCreation.json | 0 ...endRawTransaction_invalidByteValueHex.json | 0 ...sendRawTransaction_invalidNonceTooLow.json | 0 ...dRawTransaction_invalidRawTransaction.json | 0 .../eth_sendRawTransaction_messageCall.json | 0 .../eth_sendRawTransaction_transferEther.json | 0 ...endRawTransaction_unsignedTransaction.json | 0 .../eth_uninstallFilter_FilterIdNegative.json | 0 .../eth_uninstallFilter_FilterIdTooLong.json | 0 ...eth_uninstallFilter_NonexistentFilter.json | 0 .../api/jsonrpc/trace/chain-data/blocks.bin | Bin .../api/jsonrpc/trace/chain-data/genesis.json | 0 .../jsonrpc/trace/chain-data/src/blocks.json | 0 .../trace_replayBlockTransactions_0x2.json | 0 .../trace_replayBlockTransactions_0x3.json | 0 .../trace_replayBlockTransactions_0x4.json | 0 .../trace_replayBlockTransactions_0x5.json | 0 .../trace_replayBlockTransactions_0x6.json | 0 .../trace_replayBlockTransactions_0x7.json | 0 .../trace_replayBlockTransactions_0x8.json | 0 .../trace_replayBlockTransactions_0x9.json | 0 .../trace_replayBlockTransactions_latest.json | 0 .../trace_replayBlockTransactions_0x0.json | 0 .../trace_replayBlockTransactions_0x1.json | 0 .../trace_replayBlockTransactions_0x2.json | 0 .../trace_replayBlockTransactions_0x3.json | 0 .../trace_replayBlockTransactions_0x4.json | 0 .../trace_replayBlockTransactions_0x5.json | 0 .../trace_replayBlockTransactions_0x6.json | 0 .../trace_replayBlockTransactions_0x7.json | 0 .../trace_replayBlockTransactions_0x8.json | 0 .../trace_replayBlockTransactions_0x9.json | 0 ...race_replayBlockTransactions_earliest.json | 0 ...ayBlockTransactions_invalidBlockParam.json | 0 ...BlockTransactions_invalidTraceOptions.json | 0 ...trace_replayBlockTransactions_pending.json | 0 ethereum/blockcreation/build.gradle | 2 +- .../blockcreation/AbstractBlockCreator.java | 56 +-- .../blockcreation/AbstractBlockScheduler.java | 4 +- .../blockcreation/AbstractMinerExecutor.java | 22 +- .../AbstractMiningCoordinator.java | 26 +- .../blockcreation/AsyncBlockCreator.java | 2 +- .../ethereum/blockcreation/BlockCreator.java | 8 +- .../ethereum/blockcreation/BlockMiner.java | 22 +- .../BlockTransactionSelector.java | 40 +-- .../CoinbaseNotSetException.java | 2 +- .../blockcreation/DefaultBlockScheduler.java | 4 +- .../blockcreation/EthHashBlockCreator.java | 34 +- .../blockcreation/EthHashBlockMiner.java | 16 +- .../blockcreation/EthHashMinerExecutor.java | 22 +- .../EthHashMiningCoordinator.java | 16 +- .../IncrementingNonceGenerator.java | 2 +- .../blockcreation/MiningCoordinator.java | 18 +- .../blockcreation/RandomNonceGenerator.java | 4 +- .../AbstractMiningCoordinatorTest.java | 16 +- .../blockcreation/BlockMinerTest.java | 26 +- .../BlockTransactionSelectorTest.java | 111 +++--- .../DefaultBlockSchedulerTest.java | 19 +- .../EthHashBlockCreatorTest.java | 56 +-- .../EthHashMinerExecutorTest.java | 18 +- .../EthHashMiningCoordinatorTest.java | 12 +- .../IncrementingNonceGeneratorTest.java | 2 +- ethereum/core/build.gradle | 34 +- ...acyPrecompiledContractIntegrationTest.java | 50 +-- .../vm/EntriesFromIntegrationTest.java | 23 +- .../vm/TraceTransactionIntegrationTest.java | 44 +-- .../BlockHashOperationBenchmark.java | 12 +- .../operations/OperationBenchmarkHelper.java | 26 +- .../besu}/ethereum/BlockValidator.java | 10 +- .../besu}/ethereum/MainnetBlockValidator.java | 20 +- .../besu}/ethereum/ProtocolContext.java | 24 +- .../besu}/ethereum/chain/BlockAddedEvent.java | 6 +- .../ethereum/chain/BlockAddedObserver.java | 2 +- .../besu}/ethereum/chain/Blockchain.java | 18 +- .../ethereum/chain/BlockchainStorage.java | 12 +- .../besu}/ethereum/chain/ChainHead.java | 6 +- .../ethereum/chain/DefaultBlockchain.java | 40 +-- .../besu}/ethereum/chain/GenesisState.java | 48 +-- .../ethereum/chain/MinedBlockObserver.java | 4 +- .../ethereum/chain/MutableBlockchain.java | 6 +- .../ethereum/chain/TransactionLocation.java | 8 +- .../ethereum/core/AbstractWorldUpdater.java | 8 +- .../besu}/ethereum/core/Account.java | 2 +- .../besu}/ethereum/core/AccountState.java | 8 +- .../ethereum/core/AccountStorageEntry.java | 6 +- .../core/AccountTransactionOrder.java | 2 +- .../besu}/ethereum/core/Address.java | 16 +- .../besu}/ethereum/core/Block.java | 10 +- .../besu}/ethereum/core/BlockBody.java | 6 +- .../besu}/ethereum/core/BlockHeader.java | 14 +- .../ethereum/core/BlockHeaderBuilder.java | 6 +- .../ethereum/core/BlockHeaderFunctions.java | 2 +- .../besu}/ethereum/core/BlockImporter.java | 6 +- .../hyperledger/besu}/ethereum/core/Gas.java | 6 +- .../hyperledger/besu}/ethereum/core/Hash.java | 14 +- .../hyperledger/besu}/ethereum/core/Log.java | 10 +- .../besu}/ethereum/core/LogSeries.java | 6 +- .../besu}/ethereum/core/LogTopic.java | 10 +- .../besu}/ethereum/core/LogsBloomFilter.java | 14 +- .../besu}/ethereum/core/MiningParameters.java | 4 +- .../besu}/ethereum/core/MutableAccount.java | 6 +- .../ethereum/core/MutableWorldState.java | 2 +- .../besu}/ethereum/core/MutableWorldView.java | 2 +- .../besu}/ethereum/core/ParsedExtraData.java | 2 +- .../ethereum/core/PrivacyParameters.java | 18 +- .../ethereum/core/ProcessableBlockHeader.java | 4 +- .../ethereum/core/SealableBlockHeader.java | 6 +- .../besu}/ethereum/core/SyncStatus.java | 4 +- .../besu}/ethereum/core/Synchronizer.java | 8 +- .../besu}/ethereum/core/Transaction.java | 26 +- .../ethereum/core/TransactionFilter.java | 2 +- .../ethereum/core/TransactionReceipt.java | 12 +- .../hyperledger/besu}/ethereum/core/Util.java | 6 +- .../hyperledger/besu}/ethereum/core/Wei.java | 10 +- .../besu}/ethereum/core/WorldState.java | 8 +- .../besu}/ethereum/core/WorldUpdater.java | 2 +- .../besu}/ethereum/core/WorldView.java | 2 +- .../besu}/ethereum/debug/TraceFrame.java | 18 +- .../besu}/ethereum/debug/TraceOptions.java | 2 +- .../fixed/FixedDifficultyCalculators.java | 6 +- .../FixedDifficultyProtocolSchedule.java | 10 +- .../mainnet/AbstractMessageProcessor.java | 16 +- .../mainnet/AbstractPrecompiledContract.java | 10 +- .../AttachedBlockHeaderValidationRule.java | 6 +- .../ethereum/mainnet/BlockBodyValidator.java | 10 +- .../mainnet/BlockHeaderValidator.java | 6 +- .../ethereum/mainnet/BlockProcessor.java | 14 +- .../ethereum/mainnet/BodyValidation.java | 30 +- .../ConstantinopleFixGasCalculator.java | 8 +- .../mainnet/ConstantinopleGasCalculator.java | 12 +- .../mainnet/ContractValidationRule.java | 4 +- .../DetachedBlockHeaderValidationRule.java | 4 +- .../mainnet/DifficultyCalculator.java | 6 +- .../mainnet/DirectAcyclicGraphSeed.java | 8 +- .../besu}/ethereum/mainnet/EthHash.java | 6 +- .../ethereum/mainnet/EthHashCacheFactory.java | 2 +- .../ethereum/mainnet/EthHashSolution.java | 4 +- .../besu}/ethereum/mainnet/EthHashSolver.java | 10 +- .../ethereum/mainnet/EthHashSolverInputs.java | 4 +- .../besu}/ethereum/mainnet/EthHasher.java | 2 +- .../mainnet/FrontierGasCalculator.java | 26 +- .../mainnet/HeaderValidationMode.java | 2 +- .../mainnet/HomesteadGasCalculator.java | 4 +- .../mainnet/IstanbulGasCalculator.java | 12 +- .../mainnet/MainnetBlockBodyValidator.java | 20 +- .../mainnet/MainnetBlockHeaderFunctions.java | 14 +- .../mainnet/MainnetBlockHeaderValidator.java | 24 +- .../mainnet/MainnetBlockImporter.java | 19 +- .../mainnet/MainnetBlockProcessor.java | 28 +- .../MainnetContractCreationProcessor.java | 20 +- .../mainnet/MainnetDifficultyCalculators.java | 8 +- .../mainnet/MainnetEvmRegistries.java | 168 ++++----- .../mainnet/MainnetMessageCallProcessor.java | 16 +- .../MainnetPrecompiledContractRegistries.java | 28 +- .../mainnet/MainnetProtocolSchedule.java | 12 +- .../mainnet/MainnetProtocolSpecs.java | 43 ++- .../mainnet/MainnetTransactionProcessor.java | 51 ++- .../mainnet/MainnetTransactionValidator.java | 46 +-- .../mainnet/MiningBeneficiaryCalculator.java | 6 +- .../mainnet/MutableProtocolSchedule.java | 4 +- .../mainnet/PrecompileContractRegistry.java | 4 +- .../ethereum/mainnet/PrecompiledContract.java | 8 +- .../PrecompiledContractConfiguration.java | 6 +- .../ethereum/mainnet/ProtocolSchedule.java | 4 +- .../mainnet/ProtocolScheduleBuilder.java | 8 +- .../besu}/ethereum/mainnet/ProtocolSpec.java | 23 +- .../ethereum/mainnet/ProtocolSpecBuilder.java | 33 +- .../ScheduleBasedBlockHeaderFunctions.java | 12 +- .../mainnet/ScheduledProtocolSpec.java | 2 +- .../mainnet/SpuriousDragonGasCalculator.java | 12 +- .../TangerineWhistleGasCalculator.java | 12 +- .../mainnet/TransactionProcessor.java | 29 +- .../mainnet/TransactionReceiptType.java | 2 +- .../mainnet/TransactionValidationParams.java | 2 +- .../mainnet/TransactionValidator.java | 8 +- .../ethereum/mainnet/ValidationResult.java | 2 +- .../contractvalidation/MaxCodeSizeRule.java | 6 +- .../AncestryValidationRule.java | 6 +- .../CalculatedDifficultyValidationRule.java | 10 +- .../ConstantFieldValidationRule.java | 6 +- .../ExtraDataMaxLengthValidationRule.java | 8 +- .../GasLimitRangeAndDeltaValidationRule.java | 6 +- .../GasUsageValidationRule.java | 6 +- .../ProofOfWorkValidationRule.java | 20 +- .../TimestampBoundedByFutureParameter.java | 6 +- .../TimestampMoreRecentThanParent.java | 6 +- .../AltBN128AddPrecompiledContract.java | 18 +- .../AltBN128MulPrecompiledContract.java | 18 +- .../AltBN128PairingPrecompiledContract.java | 26 +- .../BLAKE2BFPrecompileContract.java | 16 +- ...ularExponentiationPrecompiledContract.java | 18 +- .../precompiles/ECRECPrecompiledContract.java | 26 +- .../precompiles/IDPrecompiledContract.java | 12 +- .../RIPEMD160PrecompiledContract.java | 16 +- .../SHA256PrecompiledContract.java | 14 +- .../privacy/PrivacyPrecompiledContract.java | 58 +-- .../privacy/PrivateStateKeyValueStorage.java | 12 +- .../ethereum/privacy/PrivateStateStorage.java | 8 +- .../ethereum/privacy/PrivateTransaction.java | 30 +- .../privacy/PrivateTransactionHandler.java | 42 +-- .../PrivateTransactionKeyValueStorage.java | 18 +- .../privacy/PrivateTransactionProcessor.java | 62 ++-- .../privacy/PrivateTransactionStorage.java | 10 +- .../privacy/PrivateTransactionValidator.java | 31 +- .../besu}/ethereum/privacy/Restriction.java | 4 +- ...igningPrivateMarkerTransactionFactory.java | 14 +- .../PrivateMarkerTransactionFactory.java | 12 +- ...igningPrivateMarkerTransactionFactory.java | 10 +- .../besu}/ethereum/proof/WorldStateProof.java | 12 +- .../proof/WorldStateProofProvider.java | 24 +- .../ethereum/storage/StorageProvider.java | 18 +- .../keyvalue/KeyValueSegmentIdentifier.java | 4 +- ...ueStoragePrefixedKeyBlockchainStorage.java | 34 +- .../keyvalue/KeyValueStorageProvider.java | 24 +- .../KeyValueStorageProviderBuilder.java | 26 +- .../keyvalue/WorldStateKeyValueStorage.java | 20 +- .../WorldStatePreimageKeyValueStorage.java | 16 +- .../ethereum/transaction/CallParameter.java | 8 +- .../transaction/TransactionSimulator.java | 36 +- .../TransactionSimulatorResult.java | 21 +- .../besu}/ethereum/util/BlockchainUtil.java | 6 +- .../besu}/ethereum/util/ByteArrayUtil.java | 2 +- .../besu}/ethereum/util/NonceProvider.java | 4 +- .../besu}/ethereum/util/RawBlockIterator.java | 18 +- .../ethereum/vm/AbstractCallOperation.java | 18 +- .../besu}/ethereum/vm/AbstractOperation.java | 2 +- .../besu}/ethereum/vm/BlockHashLookup.java | 10 +- .../hyperledger/besu}/ethereum/vm/Code.java | 8 +- .../ethereum/vm/DebugOperationTracer.java | 20 +- .../hyperledger/besu}/ethereum/vm/EVM.java | 17 +- .../ethereum/vm/ExceptionalHaltReason.java | 2 +- .../besu}/ethereum/vm/GasCalculator.java | 54 +-- .../hyperledger/besu}/ethereum/vm/Memory.java | 20 +- .../besu}/ethereum/vm/MessageFrame.java | 30 +- .../besu}/ethereum/vm/OperandStack.java | 4 +- .../besu}/ethereum/vm/Operation.java | 6 +- .../besu}/ethereum/vm/OperationRegistry.java | 2 +- .../besu}/ethereum/vm/OperationTracer.java | 6 +- .../ethereum/vm/PreAllocatedOperandStack.java | 4 +- .../hyperledger/besu}/ethereum/vm/Words.java | 10 +- .../vm/ehalt/ExceptionalHaltException.java | 4 +- .../vm/ehalt/ExceptionalHaltManager.java | 8 +- .../vm/ehalt/ExceptionalHaltPredicate.java | 8 +- ...sufficientGasExceptionalHaltPredicate.java | 8 +- ...alidOperationExceptionalHaltPredicate.java | 8 +- ...StackOverflowExceptionalHaltPredicate.java | 10 +- ...tackUnderflowExceptionalHaltPredicate.java | 10 +- .../operations/AbstractCreateOperation.java | 32 +- .../vm/operations/AddModOperation.java | 12 +- .../ethereum/vm/operations/AddOperation.java | 12 +- .../vm/operations/AddressOperation.java | 14 +- .../ethereum/vm/operations/AndOperation.java | 12 +- .../vm/operations/BalanceOperation.java | 18 +- .../vm/operations/BlockHashOperation.java | 22 +- .../ethereum/vm/operations/ByteOperation.java | 18 +- .../vm/operations/CallCodeOperation.java | 22 +- .../vm/operations/CallDataCopyOperation.java | 16 +- .../vm/operations/CallDataLoadOperation.java | 18 +- .../vm/operations/CallDataSizeOperation.java | 14 +- .../ethereum/vm/operations/CallOperation.java | 26 +- .../vm/operations/CallValueOperation.java | 12 +- .../vm/operations/CallerOperation.java | 14 +- .../vm/operations/ChainIdOperation.java | 12 +- .../vm/operations/CodeCopyOperation.java | 16 +- .../vm/operations/CodeSizeOperation.java | 14 +- .../vm/operations/CoinbaseOperation.java | 14 +- .../vm/operations/Create2Operation.java | 18 +- .../vm/operations/CreateOperation.java | 12 +- .../vm/operations/DelegateCallOperation.java | 22 +- .../vm/operations/DifficultyOperation.java | 12 +- .../ethereum/vm/operations/DivOperation.java | 12 +- .../ethereum/vm/operations/DupOperation.java | 10 +- .../ethereum/vm/operations/EqOperation.java | 14 +- .../ethereum/vm/operations/ExpOperation.java | 12 +- .../vm/operations/ExtCodeCopyOperation.java | 22 +- .../vm/operations/ExtCodeHashOperation.java | 18 +- .../vm/operations/ExtCodeSizeOperation.java | 20 +- .../vm/operations/GasLimitOperation.java | 14 +- .../ethereum/vm/operations/GasOperation.java | 14 +- .../vm/operations/GasPriceOperation.java | 12 +- .../ethereum/vm/operations/GtOperation.java | 14 +- .../vm/operations/InvalidOperation.java | 12 +- .../vm/operations/IsZeroOperation.java | 14 +- .../vm/operations/JumpDestOperation.java | 10 +- .../ethereum/vm/operations/JumpOperation.java | 20 +- .../vm/operations/JumpiOperation.java | 20 +- .../ethereum/vm/operations/LogOperation.java | 24 +- .../ethereum/vm/operations/LtOperation.java | 14 +- .../vm/operations/MLoadOperation.java | 16 +- .../vm/operations/MSizeOperation.java | 12 +- .../vm/operations/MStore8Operation.java | 14 +- .../vm/operations/MStoreOperation.java | 14 +- .../ethereum/vm/operations/ModOperation.java | 12 +- .../vm/operations/MulModOperation.java | 12 +- .../ethereum/vm/operations/MulOperation.java | 12 +- .../ethereum/vm/operations/NotOperation.java | 12 +- .../vm/operations/NumberOperation.java | 12 +- .../ethereum/vm/operations/OrOperation.java | 12 +- .../vm/operations/OriginOperation.java | 14 +- .../ethereum/vm/operations/PCOperation.java | 12 +- .../ethereum/vm/operations/PopOperation.java | 10 +- .../ethereum/vm/operations/PushOperation.java | 14 +- .../operations/ReturnDataCopyOperation.java | 18 +- .../operations/ReturnDataSizeOperation.java | 14 +- .../vm/operations/ReturnOperation.java | 12 +- .../vm/operations/RevertOperation.java | 14 +- .../ethereum/vm/operations/SDivOperation.java | 12 +- .../ethereum/vm/operations/SGtOperation.java | 14 +- .../vm/operations/SLoadOperation.java | 14 +- .../ethereum/vm/operations/SLtOperation.java | 14 +- .../ethereum/vm/operations/SModOperation.java | 12 +- .../vm/operations/SStoreOperation.java | 20 +- .../ethereum/vm/operations/SarOperation.java | 18 +- .../vm/operations/SelfBalanceOperation.java | 16 +- .../vm/operations/SelfDestructOperation.java | 24 +- .../ethereum/vm/operations/Sha3Operation.java | 16 +- .../ethereum/vm/operations/ShlOperation.java | 18 +- .../ethereum/vm/operations/ShrOperation.java | 18 +- .../vm/operations/SignExtendOperation.java | 12 +- .../vm/operations/StaticCallOperation.java | 22 +- .../ethereum/vm/operations/StopOperation.java | 12 +- .../ethereum/vm/operations/SubOperation.java | 12 +- .../ethereum/vm/operations/SwapOperation.java | 12 +- .../vm/operations/TimestampOperation.java | 12 +- .../ethereum/vm/operations/XorOperation.java | 12 +- .../worldstate/DefaultMutableWorldState.java | 40 +-- .../ethereum/worldstate/MarkSweepPruner.java | 38 +- .../besu}/ethereum/worldstate/Pruner.java | 10 +- .../worldstate/PruningConfiguration.java | 2 +- .../worldstate/StateTrieAccountValue.java | 12 +- .../worldstate/WorldStateArchive.java | 20 +- .../worldstate/WorldStatePreimageStorage.java | 8 +- .../worldstate/WorldStateStorage.java | 8 +- .../besu}/ethereum/core/AddressHelpers.java | 2 +- .../ethereum/core/BlockDataGenerator.java | 21 +- .../ethereum/core/BlockHeaderTestFixture.java | 8 +- .../ethereum/core/BlockSyncTestUtils.java | 8 +- .../ethereum/core/BlockchainSetupUtil.java | 36 +- .../core/ExecutionContextTestFixture.java | 36 +- .../core/InMemoryStorageProvider.java | 44 +-- .../core/MessageFrameTestFixture.java | 18 +- .../core/MiningParametersTestBuilder.java | 4 +- .../core/PrivateTransactionTestFixture.java | 12 +- .../besu}/ethereum/core/TestCodeExecutor.java | 22 +- .../ethereum/core/TransactionTestFixture.java | 6 +- .../ethereum/chain/DefaultBlockchainTest.java | 82 +++-- .../ethereum/chain/GenesisStateTest.java | 28 +- .../core/AccountTransactionOrderTest.java | 4 +- .../besu}/ethereum/core/BlockHeaderMock.java | 10 +- .../besu}/ethereum/core/HashTest.java | 2 +- .../besu}/ethereum/core/LogTest.java | 4 +- .../ethereum/core/LogsBloomFilterTest.java | 4 +- .../core/LogsBloomFilterTestCaseSpec.java | 6 +- .../core/TransactionIntegrationTest.java | 10 +- .../ethereum/core/TransactionReceiptTest.java | 6 +- .../besu}/ethereum/core/TransactionTest.java | 12 +- .../core/TransactionTestCaseSpec.java | 4 +- .../besu}/ethereum/core/UtilTest.java | 2 +- .../fixed/FixedProtocolScheduleTest.java | 10 +- .../mainnet/BlockHeaderValidatorTest.java | 10 +- .../ethereum/mainnet/BodyValidationTest.java | 8 +- .../ethereum/mainnet/EthHashSolverTest.java | 14 +- .../besu}/ethereum/mainnet/EthHashTest.java | 14 +- .../ethereum/mainnet/IntrinsicGasTest.java | 17 +- .../MainnetBlockHeaderValidatorTest.java | 4 +- .../mainnet/MainnetBlockImporterTest.java | 22 +- .../mainnet/MainnetBlockProcessorTest.java | 23 +- .../mainnet/MainnetProtocolScheduleTest.java | 4 +- .../MainnetTransactionProcessorTest.java | 27 +- .../MainnetTransactionValidatorTest.java | 60 ++-- .../mainnet/ProtocolScheduleTest.java | 2 +- .../ethereum/mainnet/RefundSstoreGasTest.java | 21 +- .../TransactionValidationParamsTest.java | 2 +- .../mainnet/ValidationResultTest.java | 2 +- .../ethereum/mainnet/ValidationTestUtils.java | 16 +- .../AncestryValidationRuleTest.java | 8 +- .../ConstantFieldValidationRuleTest.java | 10 +- .../ExtraDataMaxLengthValidationRuleTest.java | 8 +- ...sLimitRangeAndDeltaValidationRuleTest.java | 6 +- .../GasUsageValidationRuleTest.java | 6 +- .../ProofOfWorkValidationRuleTest.java | 24 +- .../TimestampValidationRuleTest.java | 6 +- ...ltBN128PairingPrecompiledContractTest.java | 12 +- .../BLAKE2BFPrecompileContractTest.java | 10 +- .../ECRECPrecompiledContractTest.java | 10 +- .../PrivacyPrecompiledContractTest.java | 44 +-- .../PrivateTransactionHandlerTest.java | 56 +-- .../privacy/PrivateTransactionTest.java | 18 +- .../PrivateTransactionValidatorTest.java | 25 +- ...ngPrivateMarkerTransactionFactoryTest.java | 16 +- ...ngPrivateMarkerTransactionFactoryTest.java | 12 +- .../proof/WorldStateProofProviderTest.java | 34 +- .../KeyValueStorageWorldStateStorageTest.java | 14 +- .../TransactionSimulatorResultTest.java | 6 +- .../transaction/TransactionSimulatorTest.java | 34 +- .../util/BlockchainUtilParameterizedTest.java | 22 +- .../ethereum/util/RawBlockIteratorTest.java | 14 +- .../hyperledger/besu}/ethereum/vm/.gitignore | 0 .../ethereum/vm/AbstractRetryingTest.java | 2 +- .../besu}/ethereum/vm/AddressMock.java | 4 +- .../besu}/ethereum/vm/AddressTest.java | 6 +- .../ethereum/vm/BlockHashLookupTest.java | 20 +- .../vm/BlockchainReferenceTestCaseSpec.java | 54 +-- .../vm/BlockchainReferenceTestTools.java | 28 +- .../besu}/ethereum/vm/CodeMock.java | 4 +- .../ethereum/vm/DebugOperationTracerTest.java | 38 +- .../ethereum/vm/EnvironmentInformation.java | 16 +- .../vm/GeneralStateReferenceTestTools.java | 28 +- .../vm/GeneralStateTestCaseEipSpec.java | 10 +- .../ethereum/vm/GeneralStateTestCaseSpec.java | 10 +- .../besu}/ethereum/vm/LogMock.java | 10 +- .../besu}/ethereum/vm/MemoryTest.java | 10 +- .../vm/PreAllocatedOperandStackTest.java | 4 +- .../vm/ReferenceTestProtocolSchedules.java | 12 +- .../vm/StateTestVersionedTransaction.java | 18 +- .../besu}/ethereum/vm/TestBlockchain.java | 26 +- .../besu}/ethereum/vm/VMReferenceTest.java | 30 +- .../ethereum/vm/VMReferenceTestCaseSpec.java | 10 +- .../besu}/ethereum/vm/WorldStateMock.java | 24 +- .../besu}/ethereum/vm/blockchain/.keep | 0 .../besu}/ethereum/vm/generalstate/.keep | 0 .../vm/operations/BlockHashOperationTest.java | 22 +- .../vm/operations/ChainIdOperationTest.java | 10 +- ...stantinopleSStoreOperationGasCostTest.java | 20 +- .../vm/operations/Create2OperationTest.java | 16 +- .../operations/ExtCodeHashOperationTest.java | 46 +-- .../vm/operations/RevertOperationTest.java | 12 +- .../vm/operations/SStoreOperationTest.java | 32 +- .../vm/operations/SarOperationTest.java | 10 +- .../vm/operations/ShlOperationTest.java | 10 +- .../vm/operations/ShrOperationTest.java | 10 +- .../DefaultMutableWorldStateTest.java | 42 +-- .../worldstate/MarkSweepPrunerTest.java | 42 +-- .../besu}/ethereum/worldstate/PrunerTest.java | 30 +- .../blockvalidation/block_1200000.blocks | Bin .../blockvalidation/block_1200001.blocks | Bin .../blockvalidation/block_300005.blocks | Bin .../blockvalidation/block_300006.blocks | Bin .../blockvalidation/block_4400000.blocks | Bin .../blockvalidation/block_4400001.blocks | Bin .../blockvalidation/block_4400002.blocks | Bin .../besu}/ethereum/chain/genesis-olympic.json | 0 .../besu}/ethereum/chain/genesis1.json | 0 .../besu}/ethereum/chain/genesis2.json | 0 .../besu}/ethereum/chain/genesis3.json | 0 .../besu}/ethereum/chain/genesis4.json | 0 .../besu}/ethereum/chain/genesisNonce.json | 0 .../besu}/ethereum/mainnet/block_1.blocks | Bin .../ethereum/mainnet/block_1200000.blocks | Bin .../ethereum/mainnet/block_1200001.blocks | Bin .../ethereum/mainnet/block_300005.blocks | Bin .../ethereum/mainnet/block_300006.blocks | Bin .../ethereum/mainnet/block_4400000.blocks | Bin .../ethereum/mainnet/block_4400001.blocks | Bin .../ethereum/mainnet/block_4400002.blocks | Bin .../vm/BlockchainReferenceTest.java.template | 8 +- .../GeneralStateReferenceTest.java.template | 8 +- ethereum/eth/build.gradle | 4 +- .../WorldStateDownloaderBenchmark.java | 68 ++-- .../besu}/ethereum/eth/EthProtocol.java | 10 +- .../eth/EthProtocolConfiguration.java | 4 +- .../ethereum/eth/manager/ChainState.java | 12 +- .../ethereum/eth/manager/EthContext.java | 2 +- .../ethereum/eth/manager/EthMessage.java | 4 +- .../ethereum/eth/manager/EthMessages.java | 4 +- .../besu}/ethereum/eth/manager/EthPeer.java | 49 +-- .../besu}/ethereum/eth/manager/EthPeers.java | 14 +- .../eth/manager/EthProtocolManager.java | 42 +-- .../ethereum/eth/manager/EthScheduler.java | 28 +- .../besu}/ethereum/eth/manager/EthServer.java | 48 +-- .../eth/manager/MonitoredExecutors.java | 22 +- .../ethereum/eth/manager/PeerReputation.java | 4 +- .../ethereum/eth/manager/PeerRequest.java | 6 +- .../eth/manager/PendingPeerRequest.java | 10 +- .../ethereum/eth/manager/RequestManager.java | 6 +- .../eth/manager/bounded/BoundedQueue.java | 10 +- .../manager/exceptions/EthTaskException.java | 2 +- .../IncompleteResultsException.java | 2 +- .../MaxRetriesReachedException.java | 2 +- .../exceptions/NoAvailablePeersException.java | 2 +- .../PeerBreachedProtocolException.java | 2 +- .../exceptions/PeerDisconnectedException.java | 4 +- .../eth/manager/task/AbstractEthTask.java | 18 +- .../task/AbstractGetHeadersFromPeerTask.java | 20 +- .../manager/task/AbstractPeerRequestTask.java | 29 +- .../eth/manager/task/AbstractPeerTask.java | 10 +- .../task/AbstractRetryingPeerTask.java | 18 +- .../ethereum/eth/manager/task/EthTask.java | 2 +- .../manager/task/GetBlockFromPeerTask.java | 20 +- .../manager/task/GetBodiesFromPeerTask.java | 32 +- .../task/GetHeadersFromPeerByHashTask.java | 14 +- .../task/GetHeadersFromPeerByNumberTask.java | 12 +- .../manager/task/GetNodeDataFromPeerTask.java | 20 +- .../manager/task/GetReceiptsFromPeerTask.java | 24 +- .../task/RetryingGetNodeDataFromPeerTask.java | 12 +- .../eth/manager/task/WaitForPeerTask.java | 8 +- .../eth/manager/task/WaitForPeersTask.java | 8 +- .../eth/messages/BlockBodiesMessage.java | 20 +- .../eth/messages/BlockHeadersMessage.java | 20 +- .../besu}/ethereum/eth/messages/EthPV62.java | 2 +- .../besu}/ethereum/eth/messages/EthPV63.java | 2 +- .../eth/messages/GetBlockBodiesMessage.java | 16 +- .../eth/messages/GetBlockHeadersMessage.java | 18 +- .../eth/messages/GetNodeDataMessage.java | 16 +- .../eth/messages/GetReceiptsMessage.java | 16 +- .../messages/LimitedTransactionsMessages.java | 8 +- .../eth/messages/NewBlockHashesMessage.java | 16 +- .../eth/messages/NewBlockMessage.java | 28 +- .../eth/messages/NodeDataMessage.java | 14 +- .../eth/messages/ReceiptsMessage.java | 16 +- .../ethereum/eth/messages/StatusMessage.java | 24 +- .../eth/messages/TransactionsMessage.java | 18 +- .../peervalidation/DaoForkPeerValidator.java | 18 +- .../eth/peervalidation/PeerValidator.java | 6 +- .../peervalidation/PeerValidatorRunner.java | 6 +- .../ethereum/eth/sync/BlockBroadcaster.java | 16 +- .../eth/sync/BlockPropagationManager.java | 58 +-- .../ethereum/eth/sync/ChainDownloader.java | 2 +- .../ethereum/eth/sync/ChainHeadTracker.java | 22 +- .../eth/sync/CheckpointHeaderFetcher.java | 16 +- .../sync/CheckpointHeaderValidationStep.java | 12 +- .../ethereum/eth/sync/CheckpointRange.java | 6 +- .../eth/sync/CheckpointRangeHeaders.java | 4 +- .../eth/sync/CheckpointRangeSource.java | 8 +- .../eth/sync/DefaultSynchronizer.java | 44 +-- .../ethereum/eth/sync/DownloadBodiesStep.java | 14 +- .../eth/sync/DownloadHeadersStep.java | 20 +- .../eth/sync/DownloadPipelineFactory.java | 6 +- .../eth/sync/PipelineChainDownloader.java | 34 +- .../besu}/ethereum/eth/sync/SyncMode.java | 2 +- .../ethereum/eth/sync/SyncTargetManager.java | 18 +- .../eth/sync/SynchronizerConfiguration.java | 6 +- .../eth/sync/TrailingPeerLimiter.java | 14 +- .../eth/sync/TrailingPeerRequirements.java | 4 +- .../ethereum/eth/sync/ValidationPolicy.java | 4 +- .../eth/sync/fastsync/BlockWithReceipts.java | 10 +- .../sync/fastsync/DownloadReceiptsStep.java | 16 +- .../sync/fastsync/FastDownloaderFactory.java | 36 +- .../sync/fastsync/FastImportBlocksStep.java | 12 +- .../eth/sync/fastsync/FastSyncActions.java | 36 +- .../fastsync/FastSyncChainDownloader.java | 20 +- .../FastSyncDownloadPipelineFactory.java | 56 +-- .../eth/sync/fastsync/FastSyncDownloader.java | 24 +- .../eth/sync/fastsync/FastSyncError.java | 2 +- .../eth/sync/fastsync/FastSyncException.java | 2 +- .../eth/sync/fastsync/FastSyncState.java | 4 +- .../sync/fastsync/FastSyncStateStorage.java | 12 +- .../sync/fastsync/FastSyncTargetManager.java | 24 +- .../fastsync/FastSyncValidationPolicy.java | 10 +- .../sync/fastsync/PivotBlockRetriever.java | 14 +- .../fullsync/BetterSyncTargetEvaluator.java | 12 +- .../fullsync/ExtractTxSignaturesStep.java | 6 +- .../sync/fullsync/FullImportBlockStep.java | 14 +- .../fullsync/FullSyncChainDownloader.java | 18 +- .../FullSyncDownloadPipelineFactory.java | 42 +-- .../eth/sync/fullsync/FullSyncDownloader.java | 20 +- .../sync/fullsync/FullSyncTargetManager.java | 24 +- .../eth/sync/state/PendingBlocks.java | 6 +- .../ethereum/eth/sync/state/SyncState.java | 22 +- .../ethereum/eth/sync/state/SyncTarget.java | 12 +- .../eth/sync/tasks/CompleteBlocksTask.java | 24 +- .../tasks/DetermineCommonAncestorTask.java | 24 +- .../tasks/DownloadHeaderSequenceTask.java | 34 +- .../sync/tasks/GetReceiptsForHeadersTask.java | 20 +- .../eth/sync/tasks/PersistBlockTask.java | 20 +- ...RetryingGetHeaderFromPeerByNumberTask.java | 18 +- .../exceptions/InvalidBlockException.java | 4 +- .../AccountTrieNodeDataRequest.java | 23 +- .../sync/worldstate/CodeNodeDataRequest.java | 10 +- .../eth/sync/worldstate/CompleteTaskStep.java | 20 +- .../sync/worldstate/LoadLocalDataStep.java | 18 +- .../eth/sync/worldstate/NodeDataRequest.java | 14 +- .../eth/sync/worldstate/PersistDataStep.java | 10 +- .../eth/sync/worldstate/RequestDataStep.java | 22 +- .../eth/sync/worldstate/RequestType.java | 2 +- .../worldstate/StalledDownloadException.java | 2 +- .../StorageTrieNodeDataRequest.java | 10 +- .../sync/worldstate/TaskQueueIterator.java | 4 +- .../sync/worldstate/TrieNodeDataRequest.java | 10 +- .../sync/worldstate/WorldDownloadState.java | 22 +- .../worldstate/WorldStateDownloadProcess.java | 32 +- .../sync/worldstate/WorldStateDownloader.java | 20 +- .../WorldStateDownloaderException.java | 2 +- .../transactions/PeerTransactionTracker.java | 11 +- .../PendingTransactionDroppedListener.java | 4 +- .../PendingTransactionListener.java | 4 +- .../eth/transactions/PendingTransactions.java | 24 +- .../eth/transactions/TransactionPool.java | 50 +-- .../TransactionPoolConfiguration.java | 2 +- .../transactions/TransactionPoolFactory.java | 20 +- .../eth/transactions/TransactionSender.java | 8 +- .../TransactionsMessageHandler.java | 12 +- .../TransactionsMessageProcessor.java | 16 +- .../TransactionsMessageSender.java | 10 +- .../ethereum/eth/manager/ChainStateTest.java | 27 +- .../manager/DeterministicEthScheduler.java | 4 +- .../eth/manager/EthContextTestUtil.java | 8 +- .../ethereum/eth/manager/EthPeerTest.java | 32 +- .../ethereum/eth/manager/EthPeersTest.java | 24 +- .../eth/manager/EthProtocolManagerTest.java | 101 +++--- .../manager/EthProtocolManagerTestUtil.java | 38 +- .../eth/manager/EthSchedulerShutdownTest.java | 2 +- .../eth/manager/EthSchedulerTest.java | 4 +- .../ethereum/eth/manager/EthServerTest.java | 16 +- .../ethereum/eth/manager/MockEthTask.java | 6 +- .../eth/manager/MockPeerConnection.java | 22 +- .../eth/manager/MockScheduledExecutor.java | 4 +- .../eth/manager/PeerReputationTest.java | 47 +-- .../eth/manager/RequestManagerTest.java | 47 ++- .../eth/manager/RespondingEthPeer.java | 48 +-- .../eth/manager/bounded/BoundedQueueTest.java | 4 +- .../ethtaskutils/AbstractMessageTaskTest.java | 29 +- .../ethtaskutils/PeerMessageTaskTest.java | 47 +-- .../ethtaskutils/RetryingMessageTaskTest.java | 23 +- .../eth/manager/task/AbstractEthTaskTest.java | 6 +- .../task/GetBlockFromPeerTaskTest.java | 44 ++- .../task/GetBodiesFromPeerTaskTest.java | 14 +- .../GetHeadersFromPeerByHashTaskTest.java | 33 +- .../GetHeadersFromPeerByNumberTaskTest.java | 22 +- .../task/GetNodeDataFromPeerTaskTest.java | 19 +- .../task/GetReceiptsFromPeerTaskTest.java | 13 +- .../RetryingGetNodeDataFromPeerTaskTest.java | 16 +- .../eth/manager/task/WaitForPeerTaskTest.java | 12 +- .../manager/task/WaitForPeersTaskTest.java | 12 +- .../eth/messages/BlockBodiesMessageTest.java | 26 +- .../eth/messages/BlockHeadersMessageTest.java | 22 +- .../messages/GetBlockBodiesMessageTest.java | 20 +- .../messages/GetBlockHeadersMessageTest.java | 10 +- .../eth/messages/GetNodeDataMessageTest.java | 10 +- .../eth/messages/GetReceiptsMessageTest.java | 10 +- .../LimitedTransactionsMessagesTest.java | 13 +- .../messages/NewBlockHashesMessageTest.java | 18 +- .../eth/messages/NewBlockMessageTest.java | 18 +- .../eth/messages/NodeDataMessageTest.java | 10 +- .../eth/messages/ReceiptsMessageTest.java | 10 +- .../eth/messages/StatusMessageTest.java | 16 +- .../eth/messages/TransactionsMessageTest.java | 10 +- .../DaoForkPeerValidatorTest.java | 41 +-- .../PeerValidatorRunnerTest.java | 10 +- .../eth/sync/BlockBroadcasterTest.java | 20 +- .../eth/sync/BlockPropagationManagerTest.java | 85 +++-- .../eth/sync/ChainHeadTrackerTest.java | 42 +-- .../eth/sync/CheckpointHeaderFetcherTest.java | 26 +- .../CheckpointHeaderValidationStepTest.java | 20 +- .../eth/sync/CheckpointRangeSourceTest.java | 18 +- .../eth/sync/DownloadHeadersStepTest.java | 28 +- .../eth/sync/PipelineChainDownloaderTest.java | 28 +- .../eth/sync/TrailingPeerLimiterTest.java | 24 +- .../fastsync/DownloadReceiptsStepTest.java | 22 +- .../fastsync/FastImportBlocksStepTest.java | 22 +- .../sync/fastsync/FastSyncActionsTest.java | 58 ++- .../fastsync/FastSyncChainDownloaderTest.java | 52 +-- .../sync/fastsync/FastSyncDownloaderTest.java | 126 ++++--- .../fastsync/FastSyncStateStorageTest.java | 17 +- .../FastSyncValidationPolicyTest.java | 10 +- .../fastsync/PivotBlockRetrieverTest.java | 41 ++- .../BetterSyncTargetEvaluatorTest.java | 14 +- .../fullsync/FullImportBlockStepTest.java | 18 +- .../FullSyncChainDownloaderForkTest.java | 40 +-- .../fullsync/FullSyncChainDownloaderTest.java | 90 ++--- .../sync/fullsync/FullSyncDownloaderTest.java | 30 +- .../fullsync/FullSyncTargetManagerTest.java | 35 +- .../eth/sync/state/PendingBlocksTest.java | 6 +- .../eth/sync/state/SyncStateTest.java | 30 +- .../sync/tasks/CompleteBlocksTaskTest.java | 16 +- ...neCommonAncestorTaskParameterizedTest.java | 46 +-- .../DetermineCommonAncestorTaskTest.java | 56 +-- .../tasks/DownloadHeaderSequenceTaskTest.java | 32 +- .../tasks/GetReceiptsForHeadersTaskTest.java | 14 +- .../eth/sync/tasks/PersistBlockTaskTest.java | 22 +- ...yingGetHeaderFromPeerByNumberTaskTest.java | 8 +- .../sync/worldstate/CompleteTaskStepTest.java | 14 +- .../worldstate/LoadLocalDataStepTest.java | 16 +- .../sync/worldstate/NodeDataRequestTest.java | 4 +- .../sync/worldstate/PersistDataStepTest.java | 16 +- .../sync/worldstate/RequestDataStepTest.java | 14 +- .../eth/sync/worldstate/StubTask.java | 6 +- .../worldstate/WorldDownloadStateTest.java | 38 +- .../worldstate/WorldStateDownloaderTest.java | 129 ++++--- .../PeerTransactionTrackerTest.java | 8 +- .../transactions/PendingTransactionsTest.java | 33 +- .../ethereum/eth/transactions/TestNode.java | 70 ++-- .../eth/transactions/TestNodeList.java | 12 +- .../TransactionPoolPropagationTest.java | 18 +- .../eth/transactions/TransactionPoolTest.java | 75 ++-- .../TransactionsMessageProcessorTest.java | 12 +- .../TransactionsMessageSenderTest.java | 14 +- ethereum/mock-p2p/build.gradle | 2 +- .../ethereum/p2p/testing/MockNetwork.java | 34 +- .../ethereum/p2p/testing/MockNetworkTest.java | 24 +- ethereum/p2p/build.gradle | 2 +- .../p2p/config/DiscoveryConfiguration.java | 6 +- .../p2p/config/NetworkingConfiguration.java | 2 +- .../p2p/config/RlpxConfiguration.java | 6 +- .../p2p/config/SubProtocolConfiguration.java | 6 +- .../ethereum/p2p/discovery/DiscoveryPeer.java | 16 +- .../ethereum/p2p/discovery/Endpoint.java | 14 +- .../p2p/discovery/PeerBondedObserver.java | 4 +- .../p2p/discovery/PeerDiscoveryAgent.java | 40 +-- .../p2p/discovery/PeerDiscoveryEvent.java | 8 +- .../PeerDiscoveryPacketDecodingException.java | 2 +- .../PeerDiscoveryServiceException.java | 2 +- .../p2p/discovery/PeerDiscoveryStatus.java | 2 +- .../discovery/VertxPeerDiscoveryAgent.java | 28 +- .../p2p/discovery/internal/Bucket.java | 8 +- .../internal/DiscoveryProtocolLogger.java | 16 +- .../internal/FindNeighborsPacketData.java | 8 +- .../internal/NeighborsPacketData.java | 8 +- .../internal/OutboundMessageHandler.java | 4 +- .../p2p/discovery/internal/Packet.java | 30 +- .../p2p/discovery/internal/PacketData.java | 4 +- .../p2p/discovery/internal/PacketType.java | 4 +- .../internal/PeerDiscoveryController.java | 53 +-- .../internal/PeerDiscoveryPermissions.java | 22 +- .../internal/PeerDistanceCalculator.java | 4 +- .../discovery/internal/PeerRequirement.java | 2 +- .../p2p/discovery/internal/PeerTable.java | 24 +- .../discovery/internal/PingPacketData.java | 8 +- .../discovery/internal/PongPacketData.java | 10 +- .../internal/RecursivePeerRefreshState.java | 16 +- .../internal/RetryDelayFunction.java | 2 +- .../p2p/discovery/internal/TimerUtil.java | 2 +- .../discovery/internal/VertxTimerUtil.java | 2 +- .../p2p/network/DefaultP2PNetwork.java | 60 ++-- .../ethereum/p2p/network/NetworkRunner.java | 18 +- .../ethereum/p2p/network/NoopP2PNetwork.java | 22 +- .../ethereum/p2p/network/P2PNetwork.java | 22 +- .../p2p/network/PeerReputationManager.java | 10 +- .../ethereum/p2p/network/ProtocolManager.java | 10 +- .../exceptions/BreachOfProtocolException.java | 2 +- .../exceptions/IncompatiblePeerException.java | 2 +- .../exceptions/P2PDisabledException.java | 2 +- .../exceptions/PeerDisconnectedException.java | 4 +- .../UnexpectedPeerConnectionException.java | 2 +- .../ethereum/p2p/peers/DefaultLocalNode.java | 6 +- .../besu}/ethereum/p2p/peers/DefaultPeer.java | 2 +- .../ethereum/p2p/peers/DefaultPeerId.java | 8 +- .../p2p/peers/DefaultPeerPrivileges.java | 2 +- .../besu}/ethereum/p2p/peers/EnodeURL.java | 6 +- .../besu}/ethereum/p2p/peers/LocalNode.java | 6 +- .../ethereum/p2p/peers/MaintainedPeers.java | 4 +- .../ethereum/p2p/peers/MutableLocalNode.java | 4 +- .../besu}/ethereum/p2p/peers/Peer.java | 6 +- .../besu}/ethereum/p2p/peers/PeerId.java | 6 +- .../ethereum/p2p/peers/PeerPrivileges.java | 2 +- .../ethereum/p2p/peers/StaticNodesParser.java | 2 +- .../p2p/permissions/PeerPermissions.java | 6 +- .../permissions/PeerPermissionsBlacklist.java | 10 +- .../permissions/PeerPermissionsException.java | 6 +- .../PermissionsUpdateCallback.java | 4 +- .../ethereum/p2p/rlpx/ConnectCallback.java | 4 +- .../ethereum/p2p/rlpx/DisconnectCallback.java | 6 +- .../ethereum/p2p/rlpx/MessageCallback.java | 6 +- .../besu}/ethereum/p2p/rlpx/RlpxAgent.java | 52 +-- .../connections/AbstractPeerConnection.java | 26 +- .../connections/ConnectionInitializer.java | 6 +- .../p2p/rlpx/connections/PeerConnection.java | 16 +- .../PeerConnectionEventDispatcher.java | 8 +- .../connections/PeerConnectionEvents.java | 28 +- .../rlpx/connections/PeerRlpxPermissions.java | 26 +- .../p2p/rlpx/connections/RlpxConnection.java | 8 +- .../netty/AbstractHandshakeHandler.java | 36 +- .../rlpx/connections/netty/ApiHandler.java | 26 +- .../p2p/rlpx/connections/netty/DeFramer.java | 69 ++-- .../netty/HandshakeHandlerInbound.java | 16 +- .../netty/HandshakeHandlerOutbound.java | 18 +- .../rlpx/connections/netty/MessageFramer.java | 6 +- .../netty/NettyConnectionInitializer.java | 32 +- .../netty/NettyPeerConnection.java | 28 +- .../connections/netty/OutboundMessage.java | 6 +- .../connections/netty/TimeoutHandler.java | 2 +- .../rlpx/connections/netty/WireKeepAlive.java | 13 +- .../ethereum/p2p/rlpx/framing/Framer.java | 15 +- .../p2p/rlpx/framing/FramingException.java | 2 +- .../p2p/rlpx/framing/SnappyCompressor.java | 2 +- .../rlpx/handshake/HandshakeException.java | 2 +- .../p2p/rlpx/handshake/HandshakeSecrets.java | 6 +- .../p2p/rlpx/handshake/Handshaker.java | 6 +- .../ecies/ECIESEncryptionEngine.java | 6 +- .../rlpx/handshake/ecies/ECIESHandshaker.java | 26 +- .../handshake/ecies/EncryptedMessage.java | 10 +- .../ecies/InitiatorHandshakeMessage.java | 8 +- .../ecies/InitiatorHandshakeMessageV1.java | 58 +-- .../ecies/InitiatorHandshakeMessageV4.java | 20 +- .../ecies/ResponderHandshakeMessage.java | 8 +- .../ecies/ResponderHandshakeMessageV1.java | 31 +- .../ecies/ResponderHandshakeMessageV4.java | 14 +- .../p2p/rlpx/wire/AbstractMessageData.java | 4 +- .../ethereum/p2p/rlpx/wire/Capability.java | 10 +- .../p2p/rlpx/wire/CapabilityMultiplexer.java | 4 +- .../p2p/rlpx/wire/DefaultMessage.java | 4 +- .../besu}/ethereum/p2p/rlpx/wire/Message.java | 4 +- .../ethereum/p2p/rlpx/wire/MessageData.java | 4 +- .../ethereum/p2p/rlpx/wire/PeerInfo.java | 18 +- .../ethereum/p2p/rlpx/wire/RawMessage.java | 4 +- .../ethereum/p2p/rlpx/wire/SubProtocol.java | 2 +- .../rlpx/wire/messages/DisconnectMessage.java | 18 +- .../p2p/rlpx/wire/messages/EmptyMessage.java | 6 +- .../p2p/rlpx/wire/messages/HelloMessage.java | 16 +- .../p2p/rlpx/wire/messages/PingMessage.java | 2 +- .../p2p/rlpx/wire/messages/PongMessage.java | 2 +- .../rlpx/wire/messages/WireMessageCodes.java | 2 +- .../ethereum/p2p/NetworkingTestHelper.java | 8 +- .../config/DiscoveryConfigurationTest.java | 6 +- .../p2p/config/RlpxConfigurationTest.java | 2 +- .../p2p/discovery/PeerDiscoveryAgentTest.java | 26 +- .../discovery/PeerDiscoveryBondingTest.java | 14 +- .../PeerDiscoveryBootstrappingTest.java | 16 +- .../discovery/PeerDiscoveryObserversTest.java | 11 +- .../PeerDiscoveryPacketPcapSedesTest.java | 14 +- .../PeerDiscoveryPacketSedesTest.java | 22 +- .../discovery/PeerDiscoveryTestHelper.java | 24 +- .../PeerDiscoveryTimestampsTest.java | 24 +- .../internal/BlockingAsyncExecutor.java | 4 +- .../p2p/discovery/internal/BucketTest.java | 6 +- .../internal/FindNeighborsPacketDataTest.java | 10 +- .../internal/MockPacketDataFactory.java | 10 +- .../internal/MockPeerDiscoveryAgent.java | 18 +- .../p2p/discovery/internal/MockTimerUtil.java | 2 +- .../internal/NeighborsPacketDataTest.java | 12 +- .../p2p/discovery/internal/PacketTest.java | 6 +- .../discovery/internal/PacketTypeTest.java | 2 +- ...overyControllerDistanceCalculatorTest.java | 6 +- .../internal/PeerDiscoveryControllerTest.java | 43 +-- .../PeerDiscoveryTableRefreshTest.java | 21 +- .../internal/PeerRequirementCombineTest.java | 2 +- .../p2p/discovery/internal/PeerTableTest.java | 16 +- .../internal/PingPacketDataTest.java | 10 +- .../internal/PongPacketDataTest.java | 12 +- .../RecursivePeerRefreshStateTest.java | 14 +- .../p2p/network/DefaultP2PNetworkTest.java | 88 ++--- .../NetworkingServiceLifecycleTest.java | 20 +- .../ethereum/p2p/network/P2PNetworkTest.java | 62 ++-- .../network/PeerReputationManagerTest.java | 22 +- .../p2p/peers/DefaultLocalNodeTest.java | 20 +- .../ethereum/p2p/peers/EnodeURLTest.java | 4 +- .../p2p/peers/MaintainedPeersTest.java | 4 +- .../besu}/ethereum/p2p/peers/PeerTest.java | 10 +- .../ethereum/p2p/peers/PeerTestHelper.java | 6 +- .../p2p/peers/StaticNodesParserTest.java | 2 +- .../PeerPermissionsBlacklistTest.java | 10 +- .../p2p/permissions/PeerPermissionsTest.java | 10 +- .../ethereum/p2p/rlpx/RlpxAgentTest.java | 86 ++--- .../AbstractPeerConnectionTest.java | 32 +- .../MockConnectionInitializer.java | 8 +- .../rlpx/connections/MockPeerConnection.java | 26 +- .../rlpx/connections/RlpxConnectionTest.java | 10 +- .../rlpx/connections/netty/DeFramerTest.java | 54 +-- .../netty/testhelpers/NettyMocks.java | 2 +- .../ethereum/p2p/rlpx/framing/FramerTest.java | 14 +- .../rlpx/framing/SnappyCompressorTest.java | 4 +- .../handshake/ecies/ECIESHandshakeTest.java | 12 +- .../handshake/ecies/EncryptedMessageTest.java | 6 +- .../InitiatorHandshakeMessageV4Test.java | 6 +- .../rlpx/wire/CapabilityMultiplexerTest.java | 6 +- .../p2p/rlpx/wire/MockSubProtocol.java | 2 +- .../p2p/rlpx/wire/WireMessagesSedesTest.java | 8 +- .../wire/messages/DisconnectMessageTest.java | 10 +- .../p2p/peers/invalid_static_nodes.json | 0 ...nvalid_static_nodes_no_listening_port.json | 0 .../p2p/peers/valid_static_nodes.json | 0 .../handshake/ecies/test.initiatormessage | 0 .../p2p/rlpx/handshake/ecies/test.keypair | 0 ethereum/permissioning/build.gradle | 2 +- ...untLocalConfigPermissioningController.java | 24 +- .../LocalPermissioningConfiguration.java | 2 +- ...odeLocalConfigPermissioningController.java | 24 +- .../NodePermissioningControllerFactory.java | 18 +- ...eSmartContractPermissioningController.java | 32 +- .../PermissioningConfiguration.java | 2 +- .../PermissioningConfigurationBuilder.java | 6 +- ...artContractPermissioningConfiguration.java | 4 +- .../permissioning/TomlConfigFileParser.java | 2 +- ...nSmartContractPermissioningController.java | 34 +- .../WhitelistFileSyncException.java | 2 +- .../WhitelistOperationResult.java | 2 +- .../permissioning/WhitelistPersistor.java | 2 +- .../AccountPermissioningController.java | 12 +- ...AccountPermissioningControllerFactory.java | 28 +- .../TransactionPermissioningProvider.java | 4 +- .../ContextualNodePermissioningProvider.java | 4 +- ...nsufficientPeersPermissioningProvider.java | 12 +- .../node/NodePermissioningController.java | 10 +- .../node/NodePermissioningProvider.java | 4 +- .../node/NodeWhitelistUpdatedEvent.java | 4 +- .../node/PeerPermissionsAdapter.java | 12 +- .../SyncStatusNodePermissioningProvider.java | 24 +- ...ocalConfigPermissioningControllerTest.java | 18 +- ...PermissioningConfigurationBuilderTest.java | 2 +- .../LocalPermissioningConfigurationTest.java | 2 +- ...ocalConfigPermissioningControllerTest.java | 98 +++--- ...rtContractPermissioningControllerTest.java | 40 +-- ...rtContractPermissioningControllerTest.java | 44 +-- .../permissioning/WhitelistPersistorTest.java | 4 +- ...untPermissioningControllerFactoryTest.java | 29 +- .../AccountPermissioningControllerTest.java | 8 +- ...ficientPeersPermissioningProviderTest.java | 12 +- ...odePermissioningControllerFactoryTest.java | 24 +- .../node/NodePermissioningControllerTest.java | 8 +- .../node/PeerPermissionsAdapterTest.java | 20 +- ...ncStatusNodePermissioningProviderTest.java | 24 +- ethereum/retesteth/build.gradle | 2 +- .../NoRewardProtocolScheduleWrapper.java | 22 +- .../ethereum/retesteth/RetestethClock.java | 2 +- .../retesteth/RetestethConfiguration.java | 2 +- .../ethereum/retesteth/RetestethContext.java | 84 ++--- .../ethereum/retesteth/RetestethService.java | 50 +-- .../retesteth/methods/TestGetLogHash.java | 24 +- .../retesteth/methods/TestImportRawBlock.java | 28 +- .../retesteth/methods/TestMineBlocks.java | 34 +- .../methods/TestModifyTimestamp.java | 14 +- .../retesteth/methods/TestRewindToBlock.java | 14 +- .../retesteth/methods/TestSetChainParams.java | 18 +- .../methods/TestSetChainParamsTest.java | 10 +- ...ultimpleBalanceInstructionChainParams.json | 0 ethereum/rlp/build.gradle | 10 +- .../besu}/ethereum/rlp/RLPBench.java | 6 +- .../besu}/ethereum/rlp/AbstractRLPInput.java | 22 +- .../besu}/ethereum/rlp/AbstractRLPOutput.java | 20 +- .../ethereum/rlp/BytesValueRLPInput.java | 8 +- .../ethereum/rlp/BytesValueRLPOutput.java | 6 +- .../rlp/CorruptedRLPInputException.java | 2 +- .../rlp/MalformedRLPInputException.java | 2 +- .../hyperledger/besu}/ethereum/rlp/RLP.java | 25 +- .../ethereum/rlp/RLPDecodingHelpers.java | 2 +- .../ethereum/rlp/RLPEncodingHelpers.java | 6 +- .../besu}/ethereum/rlp/RLPException.java | 2 +- .../besu}/ethereum/rlp/RLPInput.java | 10 +- .../besu}/ethereum/rlp/RLPOutput.java | 10 +- .../besu/ethereum/rlp/package-info.java | 12 + .../pantheon/ethereum/rlp/package-info.java | 12 - .../ethereum/rlp/BytesValueRLPInputTest.java | 6 +- .../ethereum/rlp/BytesValueRLPOutputTest.java | 4 +- .../besu}/ethereum/rlp/InvalidRLPRefTest.java | 8 +- .../rlp/InvalidRLPRefTestCaseSpec.java | 4 +- .../besu}/ethereum/rlp/RLPRefTest.java | 6 +- .../ethereum/rlp/RLPRefTestCaseSpec.java | 6 +- .../besu}/ethereum/rlp/RLPTest.java | 6 +- .../besu}/ethereum/rlp/util/RLPTestUtil.java | 14 +- .../besu}/ethereum/rlp/invalidRLPTest.json | 0 ethereum/trie/build.gradle | 6 +- .../besu}/ethereum/trie/AllNodesVisitor.java | 2 +- .../besu}/ethereum/trie/BranchNode.java | 14 +- .../besu}/ethereum/trie/CommitVisitor.java | 4 +- .../besu}/ethereum/trie/CompactEncoding.java | 6 +- .../ethereum/trie/DefaultNodeFactory.java | 4 +- .../besu}/ethereum/trie/ExtensionNode.java | 14 +- .../besu}/ethereum/trie/GetVisitor.java | 4 +- .../ethereum/trie/KeyValueMerkleStorage.java | 10 +- .../besu}/ethereum/trie/LeafNode.java | 12 +- .../ethereum/trie/MerklePatriciaTrie.java | 10 +- .../besu}/ethereum/trie/MerkleStorage.java | 6 +- .../ethereum/trie/MerkleTrieException.java | 2 +- .../hyperledger/besu}/ethereum/trie/Node.java | 6 +- .../besu}/ethereum/trie/NodeFactory.java | 4 +- .../besu}/ethereum/trie/NodeLoader.java | 6 +- .../besu}/ethereum/trie/NodeUpdater.java | 6 +- .../besu}/ethereum/trie/NodeVisitor.java | 2 +- .../besu}/ethereum/trie/NullNode.java | 6 +- .../besu}/ethereum/trie/PathNodeVisitor.java | 4 +- .../besu}/ethereum/trie/Proof.java | 4 +- .../besu}/ethereum/trie/ProofVisitor.java | 4 +- .../besu}/ethereum/trie/PutVisitor.java | 4 +- .../besu}/ethereum/trie/RemoveVisitor.java | 4 +- .../trie/SimpleMerklePatriciaTrie.java | 8 +- .../trie/StorageEntriesCollector.java | 9 +- .../trie/StoredMerklePatriciaTrie.java | 14 +- .../besu}/ethereum/trie/StoredNode.java | 8 +- .../ethereum/trie/StoredNodeFactory.java | 12 +- .../besu}/ethereum/trie/TrieIterator.java | 6 +- .../besu}/ethereum/trie/TrieNodeDecoder.java | 6 +- .../trie/AbstractMerklePatriciaTrieTest.java | 10 +- .../ethereum/trie/AllNodesVisitorTest.java | 2 +- .../ethereum/trie/CompactEncodingTest.java | 10 +- .../trie/SimpleMerklePatriciaTrieTest.java | 4 +- .../trie/StoredMerklePatriciaTrieTest.java | 10 +- .../besu}/ethereum/trie/TrieIteratorTest.java | 18 +- .../ethereum/trie/TrieNodeDecoderTest.java | 12 +- .../besu}/ethereum/trie/TrieRefTest.java | 6 +- .../ethereum/trie/TrieRefTestCaseSpec.java | 4 +- gradle/check-licenses.gradle | 14 +- metrics/core/build.gradle | 2 +- .../besu/metrics/BesuMetricCategory.java} | 22 +- .../metrics/ObservableMetricsSystem.java | 6 +- .../besu}/metrics/Observation.java | 4 +- .../besu}/metrics/RunnableCounter.java | 4 +- .../besu}/metrics/StandardMetricCategory.java | 4 +- .../besu}/metrics/noop/NoOpCounter.java | 4 +- .../besu}/metrics/noop/NoOpMetricsSystem.java | 16 +- .../prometheus/CurrentValueCollector.java | 2 +- .../prometheus/MetricsConfiguration.java | 8 +- .../prometheus/MetricsHttpService.java | 4 +- .../prometheus/MetricsPushGatewayService.java | 4 +- .../metrics/prometheus/MetricsService.java | 4 +- .../metrics/prometheus/PrometheusCounter.java | 6 +- .../prometheus/PrometheusMetricsSystem.java | 29 +- .../metrics/prometheus/PrometheusTimer.java | 6 +- .../metrics/vertx/PoolMetricsAdapter.java | 14 +- .../metrics/vertx/VertxMetricsAdapter.java | 4 +- .../vertx/VertxMetricsAdapterFactory.java | 4 +- .../besu}/metrics/StubMetricsSystem.java | 12 +- .../metrics/noop/NoOpMetricsSystemTest.java | 12 +- .../prometheus/MetricsHttpServiceTest.java | 4 +- .../PrometheusMetricsSystemTest.java | 32 +- metrics/rocksdb/build.gradle | 2 +- .../besu}/metrics/rocksdb/RocksDBStats.java | 6 +- nat/build.gradle | 2 +- .../hyperledger/besu}/nat/NatMethod.java | 2 +- .../nat/upnp/BesuUpnpRegistryListener.java} | 4 +- .../upnp/BesuUpnpServiceConfiguration.java} | 8 +- .../besu}/nat/upnp/OkHttpStreamClient.java | 2 +- .../besu}/nat/upnp/UpnpNatManager.java | 6 +- .../besu}/nat/upnp/UpnpNatManagerTest.java | 2 +- plugin-api/build.gradle | 8 +- .../hyperledger/besu/plugin/BesuContext.java} | 10 +- .../hyperledger/besu/plugin/BesuPlugin.java} | 28 +- .../hyperledger/besu}/plugin/Unstable.java | 2 +- .../besu}/plugin/data/Address.java | 4 +- .../besu}/plugin/data/BinaryData.java | 4 +- .../besu}/plugin/data/BlockHeader.java | 4 +- .../hyperledger/besu}/plugin/data/Hash.java | 4 +- .../hyperledger/besu}/plugin/data/Log.java | 4 +- .../besu}/plugin/data/Quantity.java | 4 +- .../besu}/plugin/data/SyncStatus.java | 4 +- .../besu}/plugin/data/Transaction.java | 4 +- .../besu}/plugin/data/UnformattedData.java | 4 +- .../plugin/services/BesuConfiguration.java} | 10 +- .../besu/plugin/services/BesuEvents.java} | 22 +- .../besu}/plugin/services/MetricsSystem.java | 10 +- .../besu}/plugin/services/PicoCLIOptions.java | 10 +- .../besu}/plugin/services/StorageService.java | 8 +- .../services/exception/StorageException.java | 2 +- .../plugin/services/metrics/Counter.java | 2 +- .../services/metrics/LabelledMetric.java | 2 +- .../services/metrics/MetricCategory.java | 2 +- .../metrics/MetricCategoryRegistry.java | 2 +- .../services/metrics/OperationTimer.java | 2 +- .../services/storage/KeyValueStorage.java | 6 +- .../storage/KeyValueStorageFactory.java | 12 +- .../storage/KeyValueStorageTransaction.java | 6 +- .../services/storage/SegmentIdentifier.java | 4 +- plugins/rocksdb/build.gradle | 2 +- .../RocksDBKeyValuePrivacyStorageFactory.java | 10 +- .../RocksDBKeyValueStorageFactory.java | 40 +-- .../storage/rocksdb/RocksDBMetrics.java | 30 +- .../storage/rocksdb/RocksDBPlugin.java | 22 +- .../services/storage/rocksdb/RocksDbUtil.java | 4 +- .../configuration/DatabaseMetadata.java | 2 +- .../configuration/RocksDBCLIOptions.java | 2 +- .../configuration/RocksDBConfiguration.java | 2 +- .../RocksDBConfigurationBuilder.java | 10 +- .../RocksDBFactoryConfiguration.java | 2 +- .../RocksDBColumnarKeyValueStorage.java | 22 +- .../unsegmented/RocksDBKeyValueStorage.java | 22 +- .../unsegmented/RocksDBTransaction.java | 10 +- .../rocksdb/RocksDBCLIOptionsTest.java | 14 +- .../RocksDBKeyValueStorageFactoryTest.java | 18 +- .../storage/rocksdb/RocksDBMetricsTest.java | 26 +- .../segmented/RocksDBKeyValueStorageTest.java | 34 +- .../RocksDBColumnarKeyValueStorageTest.java | 20 +- services/kvstore/build.gradle | 2 +- .../kvstore/InMemoryKeyValueStorage.java | 10 +- ...ansactionTransitionValidatorDecorator.java | 6 +- .../LimitedInMemoryKeyValueStorage.java | 10 +- .../kvstore/SegmentedKeyValueStorage.java | 8 +- .../SegmentedKeyValueStorageAdapter.java | 10 +- ...ansactionTransitionValidatorDecorator.java | 6 +- .../kvstore/InMemoryKeyValueStorageTest.java | 6 +- .../LimitedInMemoryKeyValueStorageTest.java | 8 +- services/pipeline/build.gradle | 2 +- .../pipeline/AsyncOperationProcessor.java | 2 +- .../services/pipeline/BatchingReadPipe.java | 4 +- .../services/pipeline/CompleterStage.java | 2 +- .../services/pipeline/FlatMapProcessor.java | 2 +- .../pipeline/IteratorSourceStage.java | 2 +- .../besu}/services/pipeline/MapProcessor.java | 2 +- .../besu}/services/pipeline/Pipe.java | 4 +- .../besu}/services/pipeline/Pipeline.java | 4 +- .../services/pipeline/PipelineBuilder.java | 6 +- .../services/pipeline/ProcessingStage.java | 2 +- .../besu}/services/pipeline/Processor.java | 2 +- .../besu}/services/pipeline/ReadPipe.java | 2 +- .../services/pipeline/SharedWritePipe.java | 2 +- .../besu}/services/pipeline/Stage.java | 2 +- .../besu}/services/pipeline/WritePipe.java | 2 +- .../pipeline/AsyncOperationProcessorTest.java | 2 +- .../pipeline/BatchingReadPipeTest.java | 6 +- .../services/pipeline/CompleterStageTest.java | 4 +- .../pipeline/FlatMapProcessorTest.java | 4 +- .../pipeline/IteratorSourceStageTest.java | 4 +- .../services/pipeline/MapProcessorTest.java | 4 +- .../besu}/services/pipeline/PipeTest.java | 4 +- .../pipeline/PipelineBuilderTest.java | 8 +- .../pipeline/ProcessingStageTest.java | 4 +- .../pipeline/SharedWritePipeTest.java | 2 +- services/tasks/build.gradle | 2 +- .../services/tasks/CachingTaskCollection.java | 2 +- .../tasks/FlatFileTaskCollection.java | 4 +- .../services/tasks/InMemoryTaskQueue.java | 2 +- .../besu}/services/tasks/Task.java | 2 +- .../besu}/services/tasks/TaskCollection.java | 2 +- .../services/tasks/AbstractTaskQueueTest.java | 4 +- .../tasks/CachingTaskCollectionTest.java | 4 +- .../tasks/FlatFileTaskCollectionTest.java | 4 +- .../services/tasks/InMemoryTaskQueueTest.java | 4 +- settings.gradle | 4 +- testutil/build.gradle | 2 +- .../kvstore/AbstractKeyValueStorageTest.java | 12 +- .../besu}/testutil/BlockTestUtil.java | 4 +- .../besu}/testutil/JsonTestParameters.java | 2 +- .../besu}/testutil/MockExecutorService.java | 2 +- .../hyperledger/besu}/testutil/TestClock.java | 2 +- .../orion/testutil/OrionConfiguration.java | 2 +- .../orion/testutil/OrionKeyConfiguration.java | 2 +- .../orion/testutil/OrionKeyUtils.java | 2 +- .../orion/testutil/OrionTestHarness.java | 2 +- .../testutil/OrionTestHarnessFactory.java | 2 +- util/build.gradle | 2 +- .../besu}/util/ExceptionUtils.java | 2 +- .../hyperledger/besu}/util/FutureUtils.java | 2 +- .../util/InvalidConfigurationException.java | 2 +- .../hyperledger/besu}/util/LimitedSet.java | 2 +- .../besu}/util/NetworkUtility.java | 2 +- .../hyperledger/besu}/util/Preconditions.java | 2 +- .../hyperledger/besu}/util/Subscribers.java | 2 +- .../util/bytes/AbstractBytes32Backed.java | 2 +- .../besu}/util/bytes/AbstractBytesValue.java | 2 +- .../util/bytes/ArrayWrappingBytes32.java | 2 +- .../util/bytes/ArrayWrappingBytesValue.java | 4 +- .../util/bytes/BaseDelegatingBytesValue.java | 2 +- .../hyperledger/besu}/util/bytes/Bytes32.java | 8 +- .../besu}/util/bytes/Bytes32Backed.java | 2 +- .../besu}/util/bytes/Bytes32s.java | 2 +- .../besu}/util/bytes/BytesBacked.java | 4 +- .../besu}/util/bytes/BytesValue.java | 4 +- .../besu}/util/bytes/BytesValues.java | 2 +- .../besu}/util/bytes/DelegatingBytes32.java | 2 +- .../util/bytes/DelegatingBytesValue.java | 2 +- .../bytes/MutableArrayWrappingBytes32.java | 2 +- .../bytes/MutableArrayWrappingBytesValue.java | 2 +- .../MutableBufferWrappingBytesValue.java | 2 +- .../MutableByteBufWrappingBytesValue.java | 2 +- .../MutableByteBufferWrappingBytesValue.java | 2 +- .../besu}/util/bytes/MutableBytes32.java | 4 +- .../besu}/util/bytes/MutableBytesValue.java | 2 +- .../besu}/util/bytes/WrappingBytes32.java | 2 +- .../besu}/util/number/Fraction.java | 2 +- .../besu}/util/number/Percentage.java | 2 +- .../besu}/util/number/PositiveNumber.java | 2 +- .../besu}/util/uint/AbstractUInt256Value.java | 8 +- .../besu}/util/uint/BaseUInt256Value.java | 4 +- .../hyperledger/besu}/util/uint/Counter.java | 6 +- .../besu}/util/uint/DefaultInt256.java | 8 +- .../besu}/util/uint/DefaultUInt256.java | 4 +- .../hyperledger/besu}/util/uint/Int256.java | 6 +- .../besu}/util/uint/Int256Bytes.java | 10 +- .../hyperledger/besu}/util/uint/UInt256.java | 4 +- .../besu}/util/uint/UInt256Bytes.java | 12 +- .../besu}/util/uint/UInt256Value.java | 6 +- .../hyperledger/besu}/util/uint/UInt256s.java | 2 +- .../besu}/util/ExceptionUtilsTest.java | 2 +- .../besu}/util/FutureUtilsTest.java | 8 +- .../besu}/util/LimitedSetTest.java | 4 +- .../besu}/util/NetworkUtilityTest.java | 2 +- .../besu}/util/SubscribersTest.java | 2 +- .../besu}/util/bytes/Bytes32Test.java | 2 +- .../bytes/Bytes32sSingleLeftShiftTest.java | 2 +- .../bytes/BytesValueImplementationsTest.java | 4 +- .../besu}/util/bytes/BytesValueTest.java | 10 +- .../besu}/util/bytes/BytesValuesTest.java | 20 +- .../besu}/util/number/FractionTest.java | 2 +- .../besu}/util/number/PercentageTest.java | 2 +- .../besu}/util/uint/UInt256BytesTest.java | 10 +- 2485 files changed, 17333 insertions(+), 17270 deletions(-) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/AcceptanceTestBase.java (57%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/BlockUtils.java (77%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/StaticNodesUtils.java (96%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/WaitUtils.java (95%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/account/Account.java (79%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/account/Accounts.java (91%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/blockchain/Amount.java (96%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/blockchain/Blockchain.java (64%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/Condition.java (84%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/account/ExpectAccountBalance.java (76%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/account/ExpectAccountBalanceNotChanging.java (82%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/admin/AdminConditions.java (76%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/admin/ExpectPeerAdded.java (77%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/blockchain/ExpectBeneficiary.java (60%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/blockchain/ExpectBlockNotCreated.java (89%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/blockchain/ExpectBlockNumberAbove.java (78%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/blockchain/ExpectMinimumBlockNumber.java (79%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java (68%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/clique/CliqueConditions.java (65%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java (67%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/clique/ExpectProposals.java (66%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/clique/ExpectValidators.java (67%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java (74%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java (72%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java (59%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/eth/EthConditions.java (89%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/eth/ExpectEthAccountsException.java (82%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/eth/ExpectEthGetTransactionReceiptIsAbsent.java (80%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/eth/ExpectEthGetWorkException.java (82%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/eth/ExpectEthSendRawTransactionException.java (82%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceipt.java (74%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithReason.java (83%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithoutReason.java (73%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/eth/SanityCheckEthGetWorkValues.java (79%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java (69%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java (67%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java (67%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java (58%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/login/AwaitLoginResponse.java (64%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/login/ExpectLoginSuccess.java (78%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/login/ExpectLoginUnauthorized.java (76%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/login/LoginConditions.java (82%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/miner/MiningStatusCondition.java (69%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/net/AwaitNetPeerCount.java (77%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/net/AwaitNetPeerCountException.java (80%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java (85%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java (81%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionException.java (83%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionExceptionWithCause.java (81%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/net/ExpectNetVersionIsNotBlank.java (77%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionException.java (84%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionJsonRpcUnauthorizedResponse.java (77%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/net/NetConditions.java (90%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/perm/AccountSmartContractPermissioningConditions.java (79%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/perm/AddAccountsToWhitelistSuccessfully.java (78%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/perm/AddNodeSuccess.java (77%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/perm/GetExpectedAccountsWhitelist.java (80%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java (80%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningConditions.java (83%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/perm/PermissioningConditions.java (87%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/perm/RemoveAccountsFromWhitelistSuccessfully.java (78%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/perm/RemoveNodeSuccess.java (77%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/perm/WaitForFalseResponse.java (64%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/perm/WaitForTrueResponse.java (64%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/perm/WhiteListContainsKeyAndValue.java (85%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/web3/ExpectWeb3Sha3Equals.java (78%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/condition/web3/Web3Conditions.java (80%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/contract/ContractVerifier.java (87%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/contract/ExpectValidTransactionReceipt.java (96%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/ethsigner/EthSignerClient.java (98%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java (93%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java (98%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java (97%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java (94%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java (94%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNode.java => org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java} (88%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNodeRunner.java => org/hyperledger/besu/tests/acceptance/dsl/node/BesuNodeRunner.java} (74%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/node/Node.java (77%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java => org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java} (84%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/node/RunnableNode.java (73%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java => org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java} (57%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/node/cluster/Cluster.java (79%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/node/cluster/ClusterConfiguration.java (92%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java (93%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeConfiguration.java => org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfiguration.java} (86%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeConfigurationBuilder.java => org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java} (68%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeFactory.java => org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java} (67%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/node/configuration/NodeConfiguration.java (88%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java (74%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java (89%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationProvider.java (84%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java (87%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java (61%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java (79%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java (66%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/PrivacyCluster.java (85%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/PrivacyNode.java (56%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/account/PrivacyAccount.java (96%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java (96%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java (81%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/condition/ExpectInternalErrorPrivateTransactionReceipt.java (85%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/condition/ExpectNoPrivateTransactionReceipt.java (85%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/condition/ExpectValidPrivacyGroupCreated.java (87%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateContractDeployedReceipt.java (96%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java (85%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/condition/PrivateCondition.java (82%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/condition/PrivateContractCondition.java (90%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/condition/PrivateContractVerifier.java (92%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java (91%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/contract/CallPrivateSmartContractFunction.java (86%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java (90%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java (90%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransaction.java (90%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java (98%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java (77%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/transaction/FindPrivacyGroupTransaction.java (78%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java (75%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java (82%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java (95%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/pubsub/Subscription.java (94%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/pubsub/SubscriptionEvent.java (95%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/pubsub/WebSocket.java (84%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/pubsub/WebSocketConnection.java (95%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/pubsub/WebSocketEvent.java (95%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/CallSmartContractFunction.java (93%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/DeploySmartContractTransaction.java (93%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/NodeRequests.java (76%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/Transaction.java (91%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/account/AccountTransactions.java (90%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/account/TransferTransaction.java (89%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java (90%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java (80%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/admin/AddPeerTransaction.java (84%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/admin/AdminRequestFactory.java (94%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/admin/AdminTransactions.java (91%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/clique/CliqueDiscard.java (84%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java (71%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java (68%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/clique/CliqueProposals.java (69%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/clique/CliquePropose.java (74%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java (93%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java (77%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/contract/ContractTransactions.java (80%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/eth/EthAccountsTransaction.java (84%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/eth/EthBlockNumberTransaction.java (84%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/eth/EthGetBalanceTransaction.java (83%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/eth/EthGetBlockTransaction.java (88%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/eth/EthGetTransactionCountTransaction.java (87%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptTransaction.java (86%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithRevertReason.java (75%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/eth/EthGetWorkTransaction.java (85%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/eth/EthMiningTransaction.java (83%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/eth/EthSendRawTransactionTransaction.java (85%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/eth/EthTransactions.java (94%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java (73%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java (71%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java (69%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java (70%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java (74%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java (93%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java (77%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java (97%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/login/LoginSuccessfulTransaction.java (85%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/login/LoginTransaction.java (84%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/login/LoginUnauthorizedTransaction.java (76%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/miner/MinerRequestFactory.java (95%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/miner/MinerStartTransaction.java (79%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/miner/MinerStopTransaction.java (79%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/miner/MinerTransactions.java (91%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/net/CustomRequestFactory.java (96%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/net/NetPeerCountTransaction.java (84%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/net/NetServicesTransaction.java (86%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/net/NetTransactions.java (92%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/net/NetVersionTransaction.java (83%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java (81%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java (81%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java (84%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java (81%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java (76%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java (75%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java (76%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java (79%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java (82%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/PermAddAccountsToWhitelistTransaction.java (78%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/PermAddNodeTransaction.java (72%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/PermGetAccountsWhitelistTransaction.java (76%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/PermGetNodesWhitelistTransaction.java (75%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/PermRemoveAccountsFromWhitelistTransaction.java (78%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/PermRemoveNodeTransaction.java (78%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java (97%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/perm/PermissioningTransactions.java (91%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java (76%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/web3/Web3Sha3Transaction.java (84%) rename acceptance-tests/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/dsl/transaction/web3/Web3Transactions.java (91%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/ClusterAcceptanceTest.java (82%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java (70%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java (60%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/CreateAccountAcceptanceTest.java (71%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/MetricsAcceptanceTest.java (71%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/P2pDisabledAcceptanceTest.java (76%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/RpcApisTogglesAcceptanceTest.java (78%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/StaticNodesAcceptanceTest.java (73%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/clique/CliqueDiscardRpcAcceptanceTest.java (73%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/clique/CliqueGetSignersRpcTest.java (77%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/clique/CliqueMiningAcceptanceTest.java (74%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/clique/CliqueProposalRpcAcceptanceTest.java (72%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/clique/CliqueProposeRpcAcceptanceTest.java (64%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/clique/CliqueZeroValidators.java (70%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/ibft2/Ibft2DiscardRpcAcceptanceTest.java (73%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/ibft2/Ibft2MiningAcceptanceTest.java (69%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/ibft2/Ibft2ProposalRpcAcceptanceTest.java (73%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/ibft2/Ibft2ProposeRpcAcceptanceTest.java (73%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/ibft2/Ibft2ZeroValidators.java (70%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/jsonrpc/EthGetWorkAcceptanceTest.java (79%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java (78%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java (69%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java (82%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/jsonrpc/WebsocketServiceLoginAcceptanceTest.java (83%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java (70%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/mining/MiningAcceptanceTest.java (85%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/permissioning/AccountLocalAndOnChainPermissioningAcceptanceTest.java (93%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/permissioning/AccountLocalConfigPermissioningAcceptanceTest.java (89%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTest.java (91%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTestBase.java (74%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/permissioning/NodeLocalAndOnChainPermissioningAcceptanceTest.java (97%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/permissioning/NodeLocalConfigPermissioningAcceptanceTest.java (79%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java (96%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTestBase.java (77%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/permissioning/NodeSmartContractPermissioningOutOfSyncAcceptanceTest.java (94%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/permissioning/NodesSmartContractPermissioningStaticNodesAcceptanceTest.java (92%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/permissioning/WhitelistPersistorAcceptanceTest.java (91%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon/tests/acceptance/plugins/PantheonEventsPluginTest.java => org/hyperledger/besu/tests/acceptance/plugins/BesuEventsPluginTest.java} (79%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/plugins/PicoCLIOptionsPluginTest.java (89%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java (91%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/DeploySmartContractAcceptanceTest.java (78%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/DeployTransactionAcceptanceTest.java (78%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/EventEmitter.sol (93%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/EventEmitterAcceptanceTest.java (84%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/RevertReason.sol (91%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/RevertReasonAcceptanceTest.java (76%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/SimpleStorage.sol (91%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/generated/EventEmitter.abi (100%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/generated/EventEmitter.bin (100%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/generated/EventEmitter.java (99%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/generated/RevertReason.abi (100%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/generated/RevertReason.bin (100%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/generated/RevertReason.java (99%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/generated/SimpleStorage.abi (100%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/generated/SimpleStorage.bin (100%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/generated/SimpleStorage.java (99%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java (82%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java (91%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/privacy/EthSignerAcceptanceTest.java (88%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java (92%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java (92%) rename acceptance-tests/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/tests/web3j/privacy/PrivacyGroupAcceptanceTest.java (88%) rename {pantheon => besu}/build.gradle (99%) rename pantheon/src/main/java/tech/pegasys/pantheon/Pantheon.java => besu/src/main/java/org/hyperledger/besu/Besu.java (74%) rename pantheon/src/main/java/tech/pegasys/pantheon/PantheonInfo.java => besu/src/main/java/org/hyperledger/besu/BesuInfo.java (75%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/Runner.java (85%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/RunnerBuilder.java (75%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/chainexport/BlockExporter.java (91%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/chainexport/RlpBlockExporter.java (80%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/chainimport/JsonBlockImporter.java (90%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/chainimport/RlpBlockImporter.java (83%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/chainimport/internal/BlockData.java (84%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/chainimport/internal/ChainData.java (95%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/chainimport/internal/TransactionData.java (83%) rename pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java => besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java (84%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/DefaultCommandValues.java (71%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/StandaloneCommand.java (88%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/UnstableOptionsSubCommand.java (93%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/config/EthNetworkConfig.java (91%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/config/NetworkName.java (94%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/converter/FractionConverter.java (84%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/converter/MetricCategoryConverter.java (92%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/converter/PercentageConverter.java (84%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/converter/RpcApisConverter.java (76%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/converter/exception/FractionConversionException.java (93%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/converter/exception/PercentageConversionException.java (93%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/converter/exception/RpcApisConversionException.java (93%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/custom/CorsAllowedOriginsProperty.java (98%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/custom/EnodeToURIPropertyConverter.java (92%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/custom/JsonRPCWhitelistHostsProperty.java (98%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/custom/RpcAuthFileValidator.java (96%) rename pantheon/src/main/java/tech/pegasys/pantheon/cli/error/PantheonExceptionHandler.java => besu/src/main/java/org/hyperledger/besu/cli/error/BesuExceptionHandler.java (85%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/options/CLIOptions.java (96%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/options/EthProtocolOptions.java (95%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/options/MetricsCLIOptions.java (93%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/options/NetworkingOptions.java (96%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/options/OptionParser.java (95%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/options/SynchronizerOptions.java (98%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/options/TransactionPoolOptions.java (94%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/subcommands/PasswordSubCommand.java (87%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/subcommands/PublicKeySubCommand.java (88%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/subcommands/RetestethSubCommand.java (75%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/subcommands/blocks/BlockExportFormat.java (92%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/subcommands/blocks/BlockImportFormat.java (92%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/subcommands/blocks/BlocksSubCommand.java (84%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/subcommands/operator/OperatorSubCommand.java (90%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/subcommands/rlp/IbftExtraDataCLIAdapter.java (88%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/subcommands/rlp/JSONToRLP.java (90%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/subcommands/rlp/RLPSubCommand.java (93%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/subcommands/rlp/RLPType.java (94%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/util/CascadingDefaultProvider.java (97%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/util/CommandLineUtils.java (96%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/util/ConfigOptionSearchAndRunHandler.java (96%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/util/EnvironmentVariableDefaultProvider.java (94%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/util/TomlConfigFileDefaultProvider.java (98%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/cli/util/VersionProvider.java (84%) rename pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java => besu/src/main/java/org/hyperledger/besu/controller/BesuController.java (73%) rename pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonControllerBuilder.java => besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java (74%) rename pantheon/src/main/java/tech/pegasys/pantheon/controller/CliquePantheonControllerBuilder.java => besu/src/main/java/org/hyperledger/besu/controller/CliqueBesuControllerBuilder.java (69%) rename pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonControllerBuilder.java => besu/src/main/java/org/hyperledger/besu/controller/IbftBesuControllerBuilder.java (68%) rename pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftLegacyPantheonControllerBuilder.java => besu/src/main/java/org/hyperledger/besu/controller/IbftLegacyBesuControllerBuilder.java (67%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/controller/KeyPairUtil.java (93%) rename pantheon/src/main/java/tech/pegasys/pantheon/controller/MainnetPantheonControllerBuilder.java => besu/src/main/java/org/hyperledger/besu/controller/MainnetBesuControllerBuilder.java (72%) rename pantheon/src/main/java/tech/pegasys/pantheon/services/PantheonConfigurationImpl.java => besu/src/main/java/org/hyperledger/besu/services/BesuConfigurationImpl.java (78%) rename pantheon/src/main/java/tech/pegasys/pantheon/services/PantheonEventsImpl.java => besu/src/main/java/org/hyperledger/besu/services/BesuEventsImpl.java (86%) rename pantheon/src/main/java/tech/pegasys/pantheon/services/PantheonPluginContextImpl.java => besu/src/main/java/org/hyperledger/besu/services/BesuPluginContextImpl.java (84%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/services/PicoCLIOptionsImpl.java (90%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/services/StorageServiceImpl.java (81%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/util/PermissioningConfigurationValidator.java (95%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/util/PlatformDetector.java (99%) rename {pantheon/src/main/java/tech/pegasys/pantheon => besu/src/main/java/org/hyperledger/besu}/util/StringUtils.java (97%) rename {pantheon => besu}/src/main/resources/log4j2.xml (100%) rename pantheon/src/test/java/tech/pegasys/pantheon/PantheonInfoTest.java => besu/src/test/java/org/hyperledger/besu/BesuInfoTest.java (78%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/PrivacyTest.java (67%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/RunnerTest.java (83%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/chainexport/RlpBlockExporterTest.java (84%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/chainimport/JsonBlockImporterTest.java (90%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/chainimport/RlpBlockImporterTest.java (79%) rename pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java => besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java (94%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/CommandLineUtilsTest.java (97%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/CommandTestAbstract.java (71%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/EnvironmentVariableDefaultProviderTest.java (87%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/PasswordSubCommandTest.java (95%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/PublicKeySubCommandTest.java (95%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/TomlConfigFileDefaultProviderTest.java (98%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/converter/FractionConverterTest.java (92%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/converter/PercentageConverterTest.java (92%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/custom/RpcAuthFileValidatorTest.java (98%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/operator/OperatorSubCommandTest.java (91%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/options/AbstractCLIOptionsTest.java (86%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/options/EthProtocolOptionsTest.java (82%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/options/MetricsCLIOptionsTest.java (82%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/options/NetworkingOptionsTest.java (84%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/options/OptionParserTest.java (97%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/options/SynchronizerOptionsTest.java (93%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/options/TransactionPoolOptionsTest.java (82%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/rlp/RLPSubCommandTest.java (97%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/subcommands/blocks/BlocksSubCommandTest.java (95%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/cli/util/ConfigOptionSearchAndRunHandlerTest.java (98%) rename pantheon/src/test/java/tech/pegasys/pantheon/plugins/TestPantheonEventsPlugin.java => besu/src/test/java/org/hyperledger/besu/plugins/TestBesuEventsPlugin.java (75%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/plugins/TestPicoCLIPlugin.java (87%) rename pantheon/src/test/java/tech/pegasys/pantheon/services/PantheonEventsImplTest.java => besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java (76%) rename pantheon/src/test/java/tech/pegasys/pantheon/services/PantheonPluginContextImplTest.java => besu/src/test/java/org/hyperledger/besu/services/BesuPluginContextImplTest.java (86%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/services/PicoCLIOptionsImplTest.java (98%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/util/KeyPairUtilTest.java (93%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/util/LocalPermissioningConfigurationValidatorTest.java (93%) rename {pantheon/src/test/java/tech/pegasys/pantheon => besu/src/test/java/org/hyperledger/besu}/util/StringUtilsTest.java (97%) rename {pantheon => besu}/src/test/resources/auth_correct.toml (100%) rename {pantheon => besu}/src/test/resources/auth_duplicate_user.toml (100%) rename {pantheon => besu}/src/test/resources/auth_invalid.toml (100%) rename {pantheon => besu}/src/test/resources/auth_invalid_value.toml (100%) rename {pantheon => besu}/src/test/resources/auth_no_password.toml (100%) rename {pantheon => besu}/src/test/resources/complete_config.toml (87%) rename {pantheon => besu}/src/test/resources/everything_config.toml (100%) rename {pantheon => besu}/src/test/resources/ibft.blocks (100%) rename {pantheon => besu}/src/test/resources/ibftlegacy_genesis.json (100%) rename {pantheon => besu}/src/test/resources/invalidPrivateKey.txt (100%) rename {pantheon => besu}/src/test/resources/log4j2.xml (100%) rename {pantheon => besu}/src/test/resources/no_bootnodes.toml (100%) rename {pantheon => besu}/src/test/resources/operator/config_generate_keys.json (100%) rename {pantheon => besu}/src/test/resources/operator/config_import_keys.json (100%) rename {pantheon => besu}/src/test/resources/operator/config_import_keys_invalid_keys.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/chainimport/clique/blocks-import-invalid-bad-parent.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/chainimport/clique/blocks-import-invalid-bad-tx.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/chainimport/clique/blocks-import-special-fields.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/chainimport/clique/blocks-import-valid-addendum.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/chainimport/clique/blocks-import-valid-no-block-identifiers.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/chainimport/clique/blocks-import-valid.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/chainimport/clique/genesis.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/chainimport/ethash/blocks-import-invalid-bad-parent.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/chainimport/ethash/blocks-import-invalid-bad-tx.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/chainimport/ethash/blocks-import-special-fields.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/chainimport/ethash/blocks-import-valid-addendum.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/chainimport/ethash/blocks-import-valid-no-block-identifiers.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/chainimport/ethash/blocks-import-valid.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/chainimport/ethash/genesis.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/chainimport/unsupported/genesis.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/util/blockchain-import-genesis-file.json (100%) rename {pantheon/src/test/resources/tech/pegasys/pantheon => besu/src/test/resources/org/hyperledger/besu}/util/blockchain-import.bin (100%) rename {pantheon => besu}/src/test/resources/orion_publickey.pub (100%) rename {pantheon => besu}/src/test/resources/partial_config.toml (100%) rename {pantheon => besu}/src/test/resources/permissioning_config.toml (100%) rename {pantheon => besu}/src/test/resources/permissioning_config_ropsten_bootnodes.toml (100%) rename {crypto/src/test/resources/tech/pegasys/pantheon/crypto => besu/src/test/resources}/validPrivateKey.txt (100%) rename config/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/config/CliqueConfigOptions.java (97%) rename config/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/config/EthashConfigOptions.java (97%) rename config/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/config/GenesisAllocation.java (97%) rename config/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/config/GenesisConfigFile.java (96%) rename config/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/config/GenesisConfigOptions.java (97%) rename config/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/config/IbftConfigOptions.java (99%) rename config/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/config/JsonGenesisConfigOptions.java (99%) rename config/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/config/JsonUtil.java (99%) rename config/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/config/StubGenesisConfigOptions.java (99%) rename config/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/config/CliqueConfigOptionsTest.java (98%) rename config/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/config/GenesisConfigFileTest.java (99%) rename config/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/config/GenesisConfigOptionsTest.java (99%) rename config/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/config/IbftConfigOptionsTest.java (99%) rename config/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/config/JsonUtilTest.java (99%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/BlockHeaderValidationRulesetFactory.java (61%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/CliqueBlockHashing.java (90%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/CliqueBlockHeaderFunctions.java (75%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/CliqueBlockInterface.java (85%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/CliqueContext.java (85%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/CliqueDifficultyCalculator.java (83%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/CliqueExtraData.java (93%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/CliqueHelpers.java (83%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/CliqueMiningTracker.java (87%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/CliqueProtocolSchedule.java (68%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/blockcreation/CliqueBlockCreator.java (76%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/blockcreation/CliqueBlockMiner.java (70%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/blockcreation/CliqueBlockScheduler.java (86%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/blockcreation/CliqueMinerExecutor.java (77%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/blockcreation/CliqueMiningCoordinator.java (81%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/blockcreation/CliqueProposerSelector.java (86%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/headervalidationrules/CliqueDifficultyValidationRule.java (73%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/headervalidationrules/CliqueExtraDataValidationRule.java (84%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/headervalidationrules/CoinbaseHeaderValidationRule.java (78%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/headervalidationrules/SignerRateLimitValidationRule.java (72%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/headervalidationrules/VoteValidationRule.java (83%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/jsonrpc/CliqueJsonRpcMethodsFactory.java (68%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/jsonrpc/CliqueRpcApis.java (88%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/jsonrpc/methods/CliqueGetSignerMetrics.java (66%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/jsonrpc/methods/CliqueGetSigners.java (68%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHash.java (66%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/jsonrpc/methods/CliqueProposals.java (71%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/jsonrpc/methods/Discard.java (65%) rename consensus/clique/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/jsonrpc/methods/Propose.java (61%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/CliqueBlockHashingTest.java (94%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/CliqueBlockInterfaceTest.java (87%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/CliqueDifficultyCalculatorTest.java (81%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/CliqueExtraDataTest.java (90%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/CliqueProtocolScheduleTest.java (86%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/NodeCanProduceNextBlockTest.java (91%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/TestHelpers.java (78%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/blockcreation/CliqueBlockCreatorTest.java (77%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/blockcreation/CliqueBlockSchedulerTest.java (88%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/blockcreation/CliqueMinerExecutorTest.java (81%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/blockcreation/CliqueMiningCoordinatorTest.java (90%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/blockcreation/CliqueProposerSelectorTest.java (84%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/headervalidationrules/CliqueDifficultyValidationRuleTest.java (71%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/headervalidationrules/CliqueExtraDataValidationRuleTest.java (86%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/headervalidationrules/VoteValidationRuleTest.java (86%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/jsonrpc/methods/CliqueGetSignerMetricsTest.java (91%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHashTest.java (76%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/jsonrpc/methods/CliqueGetSignersTest.java (79%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/jsonrpc/methods/CliqueProposalsTest.java (83%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/jsonrpc/methods/DiscardTest.java (84%) rename consensus/clique/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/clique/jsonrpc/methods/ProposeTest.java (87%) rename consensus/common/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/BlockInterface.java (84%) rename consensus/common/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/ConsensusHelpers.java (85%) rename consensus/common/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/EpochManager.java (95%) rename consensus/common/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/ValidatorProvider.java (88%) rename consensus/common/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/ValidatorVote.java (91%) rename consensus/common/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/VoteProposer.java (97%) rename consensus/common/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/VoteTally.java (97%) rename consensus/common/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/VoteTallyCache.java (95%) rename consensus/common/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/VoteTallyUpdater.java (92%) rename consensus/common/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/VoteType.java (94%) rename consensus/common/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/jsonrpc/AbstractGetSignerMetricsMethod.java (82%) rename consensus/common/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/jsonrpc/AbstractVoteProposerMethod.java (75%) rename consensus/common/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/VoteProposerTest.java (80%) rename consensus/common/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/VoteTallyCacheTest.java (87%) rename consensus/common/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/VoteTallyTest.java (56%) rename consensus/common/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/VoteTallyUpdaterTest.java (88%) rename consensus/common/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java (81%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/support/IntegrationTestHelpers.java (70%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/support/NetworkLayout.java (91%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/support/NodeParams.java (85%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/support/RoundSpecificPeers.java (86%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/support/StubValidatorMulticaster.java (84%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/support/StubbedPeerConnection.java (81%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/support/StubbedSynchronizerUpdater.java (87%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/support/TestContext.java (83%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/support/TestContextBuilder.java (73%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/support/ValidatorPeer.java (74%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/tests/FutureHeightTest.java (91%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/tests/FutureRoundTest.java (88%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/tests/GossipTest.java (83%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/tests/LocalNodeIsProposerTest.java (83%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/tests/LocalNodeNotProposerTest.java (89%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/tests/ReceivedFutureProposalTest.java (85%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/tests/RoundChangeTest.java (91%) rename consensus/ibft/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/tests/SpuriousBehaviourTest.java (78%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/BlockTimer.java (94%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/ConsensusRoundIdentifier.java (95%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/EthSynchronizerUpdater.java (84%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/EventMultiplexer.java (80%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/Gossiper.java (85%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftBlockHashing.java (90%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftBlockHeaderFunctions.java (88%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftBlockHeaderValidationRulesetFactory.java (65%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftBlockInterface.java (82%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftChainObserver.java (81%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftContext.java (86%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftEventQueue.java (95%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftExtraData.java (91%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftGossip.java (76%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftHelpers.java (83%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftProcessor.java (95%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftProtocolSchedule.java (75%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/MessageTracker.java (88%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/RoundTimer.java (96%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/SizeLimitedMap.java (95%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/SynchronizerUpdater.java (85%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/UniqueMessageMulticaster.java (89%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/Vote.java (89%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/blockcreation/IbftBlockCreator.java (70%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/blockcreation/IbftBlockCreatorFactory.java (80%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/blockcreation/IbftMiningCoordinator.java (75%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/blockcreation/ProposerSelector.java (93%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRule.java (79%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRule.java (81%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/headervalidationrules/IbftValidatorsValidationRule.java (82%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/headervalidationrules/IbftVanityDataValidationRule.java (77%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/ibftevent/BlockTimerExpiry.java (90%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/ibftevent/IbftEvent.java (83%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/ibftevent/IbftEvents.java (88%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/ibftevent/IbftReceivedMessageEvent.java (78%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/ibftevent/NewChainHead.java (90%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/ibftevent/RoundExpiry.java (86%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/jsonrpc/IbftJsonRpcMethodsFactory.java (64%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/jsonrpc/IbftRpcApis.java (88%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVote.java (70%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/jsonrpc/methods/IbftGetPendingVotes.java (71%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/jsonrpc/methods/IbftGetSignerMetrics.java (65%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHash.java (73%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumber.java (73%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVote.java (71%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/messagedata/AbstractIbftMessageData.java (85%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/messagedata/CommitMessageData.java (83%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/messagedata/IbftV2.java (93%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/messagedata/PrepareMessageData.java (83%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/messagedata/ProposalMessageData.java (83%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/messagedata/RoundChangeMessageData.java (84%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/messagewrappers/Commit.java (71%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/messagewrappers/IbftMessage.java (74%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/messagewrappers/Prepare.java (73%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/messagewrappers/Proposal.java (79%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/messagewrappers/RoundChange.java (76%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/network/IbftMessageTransmitter.java (69%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/network/PeerConnectionTracker.java (85%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/network/ValidatorMulticaster.java (81%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/network/ValidatorPeers.java (90%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/Authored.java (85%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/CommitPayload.java (87%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/MessageFactory.java (77%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/Payload.java (75%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/PreparePayload.java (87%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/PreparedCertificate.java (94%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/ProposalPayload.java (87%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/RoundChangeCertificate.java (92%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/RoundChangePayload.java (91%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/RoundSpecific.java (84%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/SignedData.java (90%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/protocol/IbftProtocolManager.java (80%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/protocol/IbftSubProtocol.java (87%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/BlockHeightManager.java (65%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/FutureMessageBuffer.java (96%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/IbftBlockHeightManager.java (87%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/IbftBlockHeightManagerFactory.java (88%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/IbftController.java (86%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/IbftFinalState.java (77%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/IbftRound.java (83%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/IbftRoundFactory.java (80%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/NoOpBlockHeightManager.java (73%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/PreparedRoundArtifacts.java (79%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/RoundChangeArtifacts.java (85%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/RoundChangeManager.java (93%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/RoundState.java (85%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/validation/FutureRoundProposalMessageValidator.java (91%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/validation/MessageValidator.java (86%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/validation/MessageValidatorFactory.java (81%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/validation/ProposalBlockConsistencyValidator.java (84%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/validation/RoundChangeCertificateValidator.java (79%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/validation/RoundChangeMessageValidator.java (94%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/validation/RoundChangePayloadValidator.java (89%) rename consensus/ibft/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/validation/SignedDataValidator.java (90%) rename consensus/ibft/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftContextBuilder.java (84%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/BlockTimerTest.java (96%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/EthSynchronizerUpdaterTest.java (86%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftBlockHashingTest.java (90%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftBlockHeaderValidationRulesetFactoryTest.java (94%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftChainObserverTest.java (84%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftEventQueueTest.java (93%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftExtraDataFixture.java (89%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftExtraDataTest.java (97%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftGossipTest.java (73%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftHelpersTest.java (79%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/IbftProcessorTest.java (98%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/MessageTrackerTest.java (91%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/RoundTimerTest.java (97%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/SizeLimitedMapTest.java (97%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/TestHelpers.java (80%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/UniqueMessageMulticasterTest.java (89%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/VoteTest.java (91%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/blockcreation/IbftBlockCreatorTest.java (70%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/blockcreation/IbftMiningCoordinatorTest.java (83%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/blockcreation/ProposerSelectorTest.java (94%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/headervalidationrules/HeaderValidationTestHelpers.java (75%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRuleTest.java (80%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRuleTest.java (90%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/headervalidationrules/IbftValidatorsValidationRuleTest.java (75%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/headervalidationrules/IbftVanityDataValidationRuleTest.java (83%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVoteTest.java (81%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/jsonrpc/methods/IbftGetPendingVotesTest.java (84%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/jsonrpc/methods/IbftGetSignerMetricsTest.java (91%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHashTest.java (80%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumberTest.java (80%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVoteTest.java (86%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/messagedata/CommitMessageTest.java (91%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/messagedata/PrepareMessageTest.java (91%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/messagedata/ProposalMessageTest.java (91%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/messagedata/RoundChangeMessageTest.java (91%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/network/MockPeerFactory.java (82%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/network/ValidatorPeersTest.java (90%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/CommitPayloadTest.java (78%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/PreparePayloadTest.java (78%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/PreparedCertificateTest.java (85%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/ProposalPayloadTest.java (76%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/RoundChangeCertificateTest.java (83%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/payload/RoundChangePayloadTest.java (87%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/protocol/IbftSubProtocolTest.java (96%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/FutureMessageBufferTest.java (92%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/IbftBlockHeightManagerTest.java (86%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/IbftControllerTest.java (91%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/IbftRoundTest.java (90%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/RoundChangeArtifactsTest.java (89%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/RoundChangeManagerTest.java (89%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/statemachine/RoundStateTest.java (92%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/validation/FutureRoundProposalMessageValidatorTest.java (86%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/validation/MessageValidatorTest.java (86%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/validation/ProposalBlockConsistencyValidatorTest.java (83%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/validation/RoundChangeCertificateValidatorTest.java (91%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/validation/RoundChangeMessageValidatorTest.java (84%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/validation/RoundChangeSignedDataValidatorTest.java (90%) rename consensus/ibft/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibft/validation/SignedDataValidatorTest.java (91%) rename consensus/ibftlegacy/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/IbftBlockHashing.java (93%) rename consensus/ibftlegacy/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactory.java (71%) rename consensus/ibftlegacy/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/IbftExtraData.java (88%) rename consensus/ibftlegacy/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/IbftHelpers.java (90%) rename consensus/ibftlegacy/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/IbftLegacyBlockInterface.java (85%) rename consensus/ibftlegacy/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/IbftProtocolSchedule.java (73%) rename consensus/ibftlegacy/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/LegacyIbftBlockHeaderFunctions.java (80%) rename consensus/ibftlegacy/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/blockcreation/IbftBlockCreator.java (76%) rename consensus/ibftlegacy/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRule.java (85%) rename consensus/ibftlegacy/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/headervalidationrules/VoteValidationRule.java (83%) rename consensus/ibftlegacy/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/protocol/Istanbul64Protocol.java (90%) rename consensus/ibftlegacy/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/protocol/Istanbul64ProtocolManager.java (84%) rename consensus/ibftlegacy/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/IbftBlockHashingTest.java (93%) rename consensus/ibftlegacy/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactoryTest.java (85%) rename consensus/ibftlegacy/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/IbftExtraDataTest.java (87%) rename consensus/ibftlegacy/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/IbftLegacyBlockInterfaceTest.java (87%) rename consensus/ibftlegacy/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/TestHelpers.java (77%) rename consensus/ibftlegacy/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/blockcreation/IbftBlockCreatorTest.java (70%) rename consensus/ibftlegacy/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRuleTest.java (93%) rename crypto/src/main/java/{tech/pegasys/pantheon/crypto/PantheonProvider.java => org/hyperledger/besu/crypto/BesuProvider.java} (71%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/Blake2bfMessageDigest.java (99%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/Hash.java (95%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/InvalidSEC256K1PrivateKeyStoreException.java (94%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/MessageDigestFactory.java (92%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/PRNGSecureRandom.java (94%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/PersonalisationString.java (98%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/QuickEntropy.java (96%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/SECP256K1.java (98%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/SecureRandomProvider.java (96%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/AbstractFieldPoint.java (98%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/AbstractFqp.java (99%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/AltBn128Fq12Pairer.java (96%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/AltBn128Fq12Point.java (97%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/AltBn128Fq2Point.java (98%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/AltBn128Point.java (97%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/FieldElement.java (96%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/FieldPoint.java (95%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/Fq.java (96%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/Fq12.java (97%) rename crypto/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/Fq2.java (97%) rename crypto/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/Blake2bfMessageDigestTest.java (99%) rename crypto/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/HashTest.java (96%) rename crypto/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/PRNGSecureRandomTest.java (98%) rename crypto/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/SECP256K1Test.java (96%) rename crypto/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/AltBn128Fq12PairerTest.java (98%) rename crypto/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/AltBn128Fq12PointTest.java (97%) rename crypto/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/AltBn128Fq2PointTest.java (98%) rename crypto/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/AltBn128PointTest.java (99%) rename crypto/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/Fq12Test.java (97%) rename crypto/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/Fq2Test.java (97%) rename crypto/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/crypto/altbn128/FqTest.java (98%) rename {pantheon/src/test/resources => crypto/src/test/resources/org/hyperledger/besu/crypto}/validPrivateKey.txt (100%) rename enclave/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/enclave/EnclaveTest.java (88%) rename enclave/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/enclave/Enclave.java (88%) rename enclave/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/enclave/EnclaveException.java (95%) rename enclave/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/enclave/types/CreatePrivacyGroupRequest.java (97%) rename enclave/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/enclave/types/DeletePrivacyGroupRequest.java (96%) rename enclave/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/enclave/types/ErrorResponse.java (95%) rename enclave/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/enclave/types/FindPrivacyGroupRequest.java (95%) rename enclave/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/enclave/types/PrivacyGroup.java (97%) rename enclave/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/enclave/types/ReceiveRequest.java (95%) rename enclave/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/enclave/types/ReceiveResponse.java (96%) rename enclave/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/enclave/types/SendRequest.java (95%) rename enclave/src/main/java/{tech/pegasys/pantheon/enclave/types/SendRequestPantheon.java => org/hyperledger/besu/enclave/types/SendRequestBesu.java} (89%) rename enclave/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/enclave/types/SendRequestLegacy.java (96%) rename enclave/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/enclave/types/SendResponse.java (95%) rename errorprone-checks/src/main/java/{tech/pegasys => org/hyperledger}/errorpronechecks/BannedMethod.java (98%) rename errorprone-checks/src/main/java/{tech/pegasys => org/hyperledger}/errorpronechecks/DoNotCreateSecureRandomDirectly.java (98%) rename errorprone-checks/src/main/java/{tech/pegasys => org/hyperledger}/errorpronechecks/DoNotInvokeMessageDigestDirectly.java (97%) rename errorprone-checks/src/main/java/{tech/pegasys => org/hyperledger}/errorpronechecks/DoNotReturnNullOptionals.java (98%) rename errorprone-checks/src/main/java/{tech/pegasys => org/hyperledger}/errorpronechecks/MethodInputParametersMustBeFinal.java (98%) rename errorprone-checks/src/test/java/{tech/pegasys => org/hyperledger}/errorpronechecks/BannedMethodTest.java (96%) rename errorprone-checks/src/test/java/{tech/pegasys => org/hyperledger}/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java (96%) rename errorprone-checks/src/test/java/{tech/pegasys => org/hyperledger}/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java (96%) rename errorprone-checks/src/test/java/{tech/pegasys => org/hyperledger}/errorpronechecks/DoNotReturnNullOptionalsTest.java (96%) rename errorprone-checks/src/test/java/{tech/pegasys => org/hyperledger}/errorpronechecks/MethodInputParametersMustBeFinalTest.java (97%) rename errorprone-checks/src/test/resources/{tech/pegasys => org/hyperledger}/errorpronechecks/BannedMethodNegativeCases.java (95%) rename errorprone-checks/src/test/resources/{tech/pegasys => org/hyperledger}/errorpronechecks/BannedMethodPositiveCases.java (98%) rename errorprone-checks/src/test/resources/{tech/pegasys => org/hyperledger}/errorpronechecks/DoNotCreateSecureRandomDirectlyNegativeCases.java (96%) rename errorprone-checks/src/test/resources/{tech/pegasys => org/hyperledger}/errorpronechecks/DoNotCreateSecureRandomDirectlyPositiveCases.java (97%) rename errorprone-checks/src/test/resources/{tech/pegasys => org/hyperledger}/errorpronechecks/DoNotInvokeMessageDigestDirectlyNegativeCases.java (95%) rename errorprone-checks/src/test/resources/{tech/pegasys => org/hyperledger}/errorpronechecks/DoNotInvokeMessageDigestDirectlyPositiveCases.java (95%) rename errorprone-checks/src/test/resources/{tech/pegasys => org/hyperledger}/errorpronechecks/DoNotReturnNullOptionalsNegativeCases.java (96%) rename errorprone-checks/src/test/resources/{tech/pegasys => org/hyperledger}/errorpronechecks/DoNotReturnNullOptionalsPositiveCases.java (95%) rename errorprone-checks/src/test/resources/{tech/pegasys => org/hyperledger}/errorpronechecks/MethodInputParametersMustBeFinalInterfaceNegativeCases.java (96%) rename errorprone-checks/src/test/resources/{tech/pegasys => org/hyperledger}/errorpronechecks/MethodInputParametersMustBeFinalInterfacePositiveCases.java (95%) rename errorprone-checks/src/test/resources/{tech/pegasys => org/hyperledger}/errorpronechecks/MethodInputParametersMustBeFinalNegativeCases.java (95%) rename errorprone-checks/src/test/resources/{tech/pegasys => org/hyperledger}/errorpronechecks/MethodInputParametersMustBeFinalPositiveCases.java (97%) rename ethereum/api/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/BlockchainImporter.java (78%) rename ethereum/api/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/JsonRpcResponseKey.java (94%) rename ethereum/api/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/JsonRpcResponseUtils.java (69%) rename ethereum/api/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java (65%) rename ethereum/api/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/methods/EthCallIntegrationTest.java (84%) rename ethereum/api/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/methods/EthEstimateGasIntegrationTest.java (88%) rename ethereum/api/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/methods/EthGetBlockByHashIntegrationTest.java (67%) rename ethereum/api/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/methods/EthGetBlockByNumberIntegrationTest.java (58%) rename ethereum/api/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/methods/EthGetFilterChangesIntegrationTest.java (79%) create mode 100644 ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetUncleByBlockHashAndIndexIntegrationTest.java create mode 100644 ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetUncleByBlockNumberAndIndexIntegrationTest.java rename ethereum/api/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/methods/PrivGetPrivateTransactionIntegrationTest.java (76%) delete mode 100644 ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetUncleByBlockHashAndIndexIntegrationTest.java delete mode 100644 ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetUncleByBlockNumberAndIndexIntegrationTest.java rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/BlockWithMetadata.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/LogWithMetadata.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/LogsQuery.java (93%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/TopicsParameter.java (90%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/TransactionWithMetadata.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/GraphQLConfiguration.java (98%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/GraphQLDataFetcherContext.java (78%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/GraphQLDataFetchers.java (80%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/GraphQLException.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/GraphQLHttpService.java (96%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/GraphQLProvider.java (96%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/GraphQLServiceException.java (93%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/BlockchainQuery.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/Scalars.java (97%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/TransactionReceiptWithMetadata.java (89%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/pojoadapter/AccountAdapter.java (82%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/pojoadapter/AdapterBase.java (78%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java (85%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/pojoadapter/CallResult.java (89%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/pojoadapter/LogAdapter.java (82%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/pojoadapter/NormalBlockAdapter.java (88%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java (83%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/pojoadapter/SyncStateAdapter.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/pojoadapter/TransactionAdapter.java (90%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/pojoadapter/UncleBlockAdapter.java (89%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/response/GraphQLError.java (95%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/response/GraphQLErrorResponse.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/response/GraphQLJsonRequest.java (95%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/response/GraphQLNoResponse.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/response/GraphQLResponse.java (94%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/response/GraphQLResponseType.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/internal/response/GraphQLSuccessResponse.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/JsonRpcConfiguration.java (98%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/JsonRpcEnclaveErrorConverter.java (89%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/JsonRpcErrorConverter.java (89%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/JsonRpcHttpService.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java (56%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/JsonRpcServiceException.java (93%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/LatestNonceProvider.java (80%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/RpcApi.java (95%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/RpcApis.java (97%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/RpcMethod.java (97%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/RpcMethods.java (89%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/authentication/AuthenticationService.java (97%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/authentication/AuthenticationUtils.java (95%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/authentication/TomlAuth.java (98%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/authentication/TomlAuthOptions.java (95%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/authentication/TomlUser.java (97%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/health/HealthService.java (97%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/health/LivenessCheck.java (70%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/health/ReadinessCheck.java (78%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/JsonRpcRequest.java (95%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/JsonRpcRequestId.java (93%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/exception/InvalidJsonRpcParameters.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/exception/InvalidJsonRpcRequestException.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/filter/BlockFilter.java (89%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/filter/Filter.java (95%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/filter/FilterIdGenerator.java (81%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/filter/FilterManager.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/filter/FilterRepository.java (97%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/filter/FilterTimeoutMonitor.java (93%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/filter/LogFilter.java (84%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/filter/PendingTransactionFilter.java (90%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/AbstractBlockParameterMethod.java (82%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/AdminAddPeer.java (69%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevel.java (74%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/AdminModifyPeer.java (73%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/AdminNodeInfo.java (78%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/AdminPeers.java (64%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/AdminRemovePeer.java (70%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/DebugAccountRange.java (80%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/DebugMetrics.java (83%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAt.java (80%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/DebugTraceBlock.java (65%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHash.java (64%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumber.java (66%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/DebugTraceTransaction.java (70%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthAccounts.java (70%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthBlockNumber.java (73%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthCall.java (67%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthChainId.java (70%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthCoinbase.java (65%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthEstimateGas.java (72%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGasPrice.java (68%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetBalance.java (73%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHash.java (73%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetBlockByNumber.java (80%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByHash.java (68%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByNumber.java (71%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetCode.java (74%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetFilterChanges.java (69%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogs.java (63%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetLogs.java (69%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetProof.java (71%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetStorageAt.java (70%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndex.java (64%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockNumberAndIndex.java (69%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByHash.java (66%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCount.java (80%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceipt.java (62%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndex.java (64%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndex.java (67%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockHash.java (66%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockNumber.java (71%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetWork.java (71%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthHashrate.java (69%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthMining.java (70%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilter.java (69%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthNewFilter.java (68%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthNewPendingTransactionFilter.java (70%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthProtocolVersion.java (71%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthSendRawTransaction.java (68%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthSendTransaction.java (66%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthSyncing.java (71%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthUninstallFilter.java (70%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/JsonRpcMethod.java (86%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/JsonRpcMethodFactory.java (85%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/NetEnode.java (70%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/NetListening.java (69%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/NetPeerCount.java (60%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/NetServices.java (80%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/NetVersion.java (77%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/RpcModules.java (75%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/TraceReplayBlockTransactions.java (78%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TxPoolPantheonStatistics.java => org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuStatistics.java} (61%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TxPoolPantheonTransactions.java => org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuTransactions.java} (58%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/Web3ClientVersion.java (73%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/Web3Sha3.java (70%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbase.java (63%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbase.java (73%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/miner/MinerStart.java (60%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/miner/MinerStop.java (67%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelist.java (75%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelist.java (76%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelist.java (65%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelist.java (67%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFile.java (70%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelist.java (75%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelist.java (77%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/parameters/BlockParameter.java (94%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/parameters/BlockParameterOrBlockHash.java (94%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/parameters/FilterParameter.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java (83%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/parameters/JsonRpcParameter.java (94%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/parameters/StringListParameter.java (93%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/parameters/TopicsDeserializer.java (93%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/parameters/TraceTypeParameter.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/parameters/TransactionTraceParams.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/parameters/UInt256Parameter.java (87%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/parameters/UnsignedIntParameter.java (93%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/parameters/UnsignedLongParameter.java (93%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionCount.java (70%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceipt.java (73%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaPrivateNonceProvider.java (82%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransaction.java (65%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroup.java (69%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroup.java (73%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroup.java (71%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddress.java (64%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransaction.java (71%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCount.java (64%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/parameters/CreatePrivacyGroupParameter.java (94%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/processor/BlockReplay.java (88%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/processor/BlockTrace.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/processor/BlockTracer.java (79%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/processor/TransactionTrace.java (83%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/processor/TransactionTracer.java (83%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/queries/BlockchainQueries.java (95%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/queries/TransactionReceiptWithMetadata.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/response/JsonRpcError.java (98%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/response/JsonRpcErrorResponse.java (96%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/response/JsonRpcNoResponse.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/response/JsonRpcResponse.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/response/JsonRpcResponseType.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/response/JsonRpcSuccessResponse.java (96%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/response/JsonRpcUnauthorizedResponse.java (96%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/BlockResult.java (96%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/BlockResultFactory.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/DebugAccountRangeAtResult.java (94%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/DebugStorageRangeAtResult.java (94%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/DebugTraceTransactionResult.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/JsonRpcResult.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/LogResult.java (94%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/LogsResult.java (89%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/NetworkResult.java (95%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/PeerResult.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/PendingTransactionsResult.java (88%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/PendingTransactionsStatisticsResult.java (94%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/Quantity.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/SignerMetricResult.java (95%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/StructLog.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/StructLogWithError.java (85%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/SyncingResult.java (94%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/TransactionCompleteResult.java (93%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/TransactionHashResult.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/TransactionInfoResult.java (90%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/TransactionPendingResult.java (94%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/TransactionReceiptLogResult.java (93%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/TransactionReceiptRootResult.java (85%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/TransactionReceiptStatusResult.java (85%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/TransactionResult.java (90%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/UncleBlockResult.java (81%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionGroupResult.java (88%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionLegacyResult.java (88%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionReceiptResult.java (88%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionResult.java (89%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/proof/GetProofResult.java (87%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/proof/StorageEntryProof.java (84%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/tracing/Action.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/tracing/FlatTrace.java (96%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/tracing/FlatTraceGenerator.java (95%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/tracing/Result.java (96%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/tracing/Trace.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/tracing/TraceFormatter.java (79%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/tracing/TraceWriter.java (89%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/WebSocketConfiguration.java (95%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/WebSocketRequestHandler.java (83%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/WebSocketService.java (96%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/methods/AbstractSubscriptionMethod.java (76%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/methods/EthSubscribe.java (59%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribe.java (60%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/methods/WebSocketMethodsFactory.java (80%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/methods/WebSocketRpcRequest.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/Subscription.java (93%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilder.java (78%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManager.java (86%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/SubscriptionNotFoundException.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscription.java (79%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionService.java (75%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscription.java (73%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionService.java (83%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDetailResult.java (88%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionService.java (74%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionResult.java (80%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionService.java (79%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/request/InvalidRequestException.java (89%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/request/InvalidSubscriptionRequestException.java (91%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/request/LogsSubscriptionParam.java (93%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/request/SubscribeRequest.java (93%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionParam.java (92%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapper.java (89%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionType.java (94%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/request/UnsubscribeRequest.java (95%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/response/SubscriptionResponse.java (85%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/response/SubscriptionResponseResult.java (87%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/syncing/NotSynchronisingResult.java (82%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscription.java (81%) rename ethereum/api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionService.java (74%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/AbstractDataFetcherTest.java (84%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/AbstractEthGraphQLHttpServiceTest.java (78%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/BlockDataFetcherTest.java (89%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/EthGraphQLHttpBySpecErrorCaseTest.java (98%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/EthGraphQLHttpBySpecTest.java (98%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/GraphQLConfigurationTest.java (95%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/GraphQLHttpServiceCorsTest.java (94%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/GraphQLHttpServiceHostWhitelistTest.java (92%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/GraphQLHttpServiceTest.java (94%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/GraphQLTestHelper.java (96%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/scalar/AddressScalarTest.java (93%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/scalar/BigIntScalarTest.java (93%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/scalar/Bytes32ScalarTest.java (93%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/scalar/BytesScalarTest.java (93%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/scalar/LongScalarTest.java (95%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/AbstractJsonRpcHttpBySpecTest.java (99%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java (78%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/AdminJsonRpcHttpServiceTest.java (93%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/DebugJsonRpcHttpBySpecTest.java (90%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/EthJsonRpcHttpBySpecTest.java (90%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/JsonRpcConfigurationTest.java (98%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/JsonRpcHttpServiceCorsTest.java (97%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/JsonRpcHttpServiceHostWhitelistTest.java (82%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java (92%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java (89%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java (97%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/JsonRpcTestHelper.java (98%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/LatestNonceProviderTest.java (88%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/MockPeerConnection.java (87%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/SimpleTestTransactionBuilder.java (95%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/TraceJsonRpcHttpBySpecTest.java (80%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/authentication/AuthenticationUtilsTest.java (96%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/authentication/TomlAuthTest.java (98%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/health/ReadinessCheckTest.java (91%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/filter/EthJsonRpcHttpServiceTest.java (93%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/filter/FilterIdGeneratorTest.java (89%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/filter/FilterManagerLogFilterTest.java (89%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/filter/FilterManagerTest.java (94%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/filter/FilterRepositoryTest.java (98%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/filter/FilterTest.java (95%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/filter/FilterTimeoutMonitorTest.java (97%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/filter/LogsQueryTest.java (98%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/AdminAddPeerTest.java (88%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevelTest.java (90%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/AdminNodeInfoTest.java (90%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/AdminPeersTest.java (74%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/DebugMetricsTest.java (86%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAtTest.java (73%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHashTest.java (78%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumberTest.java (78%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockTest.java (78%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/DebugTraceTransactionTest.java (81%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthBlockNumberTest.java (79%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthCallTest.java (83%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthChainIdTest.java (82%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthCoinbaseTest.java (82%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java (70%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java (82%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHashTest.java (86%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetFilterChangesTest.java (87%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogsTest.java (80%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java (84%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndexTest.java (72%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCountTest.java (82%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java (80%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java (81%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java (78%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthGetWorkTest.java (83%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthHashrateTest.java (85%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthMiningTest.java (86%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilterTest.java (82%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthNewFilterTest.java (88%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthProtocolVersionTest.java (87%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthSendRawTransactionTest.java (88%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthSendTransactionTest.java (78%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/EthSyncingTest.java (83%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/NetEnodeTest.java (73%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/NetListeningTest.java (75%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/NetVersionTest.java (84%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/RpcModulesTest.java (80%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TxPoolPantheonStatisticsTest.java => org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuStatisticsTest.java} (78%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TxPoolPantheonTransactionsTest.java => org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuTransactionsTest.java} (77%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/Web3ClientVersionTest.java (78%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/Web3Sha3Test.java (90%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java (80%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java (88%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/miner/MinerStartTest.java (76%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/miner/MinerStopTest.java (80%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelistTest.java (84%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelistTest.java (87%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelistTest.java (84%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelistTest.java (84%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java (81%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelistTest.java (84%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelistTest.java (87%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/privacy/eea/EeaGetTransactionCountTest.java (79%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/methods/privacy/eea/EeaPrivateNonceProviderTest.java (87%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/parameters/FilterParameterTest.java (97%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceiptTest.java (84%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransactionTest.java (92%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroupTest.java (89%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddressTest.java (74%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java (80%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCountTest.java (77%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/processor/TransactionTracerTest.java (88%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/queries/BlockchainQueriesTest.java (94%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/internal/results/NetworkResultTest.java (94%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/WebSocketConfigurationTest.java (90%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/WebSocketHostWhitelistTest.java (94%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/WebSocketRequestHandlerTest.java (91%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/WebSocketServiceLoginTest.java (94%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/WebSocketServiceTest.java (93%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/methods/EthSubscribeIntegrationTest.java (83%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/methods/EthSubscribeTest.java (78%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeIntegrationTest.java (88%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeTest.java (80%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/methods/WebSocketMethodsFactoryTest.java (91%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java (89%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerSendMessageTest.java (85%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerTest.java (92%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionServiceTest.java (87%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionServiceTest.java (85%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionServiceTest.java (86%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionServiceTest.java (88%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java (96%) rename ethereum/api/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionServiceTest.java (79%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_blockNumber.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_call_Block8.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_call_BlockLatest.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_estimateGas_contractDeploy.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_estimateGas_noParams.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_estimateGas_transfer.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_gasPrice.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getBalance_0x19.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getBalance_invalidAccountBlockNumber.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getBalance_invalidAccountLatest.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getBalance_latest.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getBalance_toobig_bn.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getBalance_without_addr.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getBlockTransactionCount_byHash.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getBlockTransactionCount_byNumber.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getBlock_byHash.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getBlock_byHashInvalid.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getBlock_byNumber.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getBlock_byNumberInvalid.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getBlock_wrongParams.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getCode.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getCode_noCode.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getLogs_matchTopic.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getStorageAt.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getStorageAt_illegalRangeGreaterThan.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getTransactionCount.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getTransactionReceipt.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getTransaction_byBlockHashAndIndex.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndIndex.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndInvalidIndex.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getTransaction_byHash.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_getTransaction_byHashNull.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_sendRawTransaction_contractCreation.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_sendRawTransaction_messageCall.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_sendRawTransaction_nonceTooLow.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_sendRawTransaction_transferEther.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_sendRawTransaction_unsignedTransaction.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/eth_syncing.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/graphql_blocks_byFrom.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/graphql_blocks_byRange.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/graphql_blocks_byWrongRange.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/graphql/graphql_pending.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/debug/debug_accountRange_blockHash.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/debug/debug_accountRange_complete.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/debug/debug_accountRange_partial.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/debug/debug_storageRangeAt_blockHash.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/debug/debug_storageRangeAt_blockNumber.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/debug/debug_storageRangeAt_midBlock.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_blockNumber.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_call_block_8.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_call_callParamsMissing_block_8.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_call_earliestBlock.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_call_gasLimitTooLow_block_8.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_call_gasPriceTooHigh_block_8.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_call_latestBlock.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_call_pending.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_call_toMissing_block_8.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_call_valueTooHigh_block_8.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_estimateGas_contractDeploy.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_estimateGas_insufficientGas.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_estimateGas_noParams.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_estimateGas_transfer.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeGreaterThan.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeLessThan.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBalance_invalidParams.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBalance_latest.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBalance_pending.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_hashes.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_00.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_01.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_02.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_03.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_04.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_05.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_06.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_07.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_08.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_09.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_10.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_11.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_invalidParams.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_noResult.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_00.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_earliest.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_illegalRangeGreaterThan.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_illegalRangeLessThan.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_invalidParams.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_latest.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_null.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeGreaterThan.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeLessThan.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getCode_invalidParams.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getCode_noCodeLatest.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getCode_noCodeNumber.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getCode_pending.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getCode_success.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getFilterChanges_FilterIdNegative.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getFilterChanges_FilterIdTooLong.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getFilterChanges_NonexistentFilter.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getLogs_blockhash.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getLogs_blockhash_missingBlockHash.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getLogs_failTopicPosition.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getLogs_fromBlockExceedToBlock.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getLogs_invalidInput.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getLogs_matchTopic.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getLogs_nullParam.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getLogs_toBlockOutOfRange.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getNewFilter_addressOnly.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getNewFilter_emptyFilter.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getNewFilter_invalidFilter.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getNewFilter_topicOnly.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getNewFilter_validFilterLatestBlock.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getNewFilter_validFilterWithBlockNumber.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeGreaterThan.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeLessThan.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getStorageAt_invalidParams.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getStorageAt_latest.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getStorageAt_pending.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_00.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_01.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_02.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_intOverflow.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_00.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_01.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParams.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_null.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_wrongParamType.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_00.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_01.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_earliestNull.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_invalidParams.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_latest.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_null.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_pending.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_addressReceiver.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_contractCreation.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidHashAndIndex.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidParams.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_null.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_typeMismatch.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockNumber.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionCount_earliest.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionCount_illegalRange.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionCount_latest.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionCount_missingArgument.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionCount_pending.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_contractAddress.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_logs.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_nullContractAddress.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_newBlockFilter.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_newPendingTransactionFilter.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_protocolVersion.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_contractCreation.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidByteValueHex.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidNonceTooLow.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidRawTransaction.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_messageCall.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_transferEther.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_unsignedTransaction.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_uninstallFilter_FilterIdNegative.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_uninstallFilter_FilterIdTooLong.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/eth/eth_uninstallFilter_NonexistentFilter.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/chain-data/blocks.bin (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/chain-data/genesis.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/chain-data/src/blocks.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x2.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x3.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x4.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x5.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x6.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x7.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x8.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x9.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_latest.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x0.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x1.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x2.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x3.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x4.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x5.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x6.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x7.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x8.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x9.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_earliest.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_invalidBlockParam.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_invalidTraceOptions.json (100%) rename ethereum/api/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_pending.json (100%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/AbstractBlockCreator.java (86%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/AbstractBlockScheduler.java (93%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/AbstractMinerExecutor.java (79%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/AbstractMiningCoordinator.java (85%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/AsyncBlockCreator.java (92%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/BlockCreator.java (78%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/BlockMiner.java (91%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/BlockTransactionSelector.java (86%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/CoinbaseNotSetException.java (93%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/DefaultBlockScheduler.java (94%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/EthHashBlockCreator.java (75%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/EthHashBlockMiner.java (79%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/EthHashMinerExecutor.java (82%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/EthHashMiningCoordinator.java (84%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/IncrementingNonceGenerator.java (95%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/MiningCoordinator.java (79%) rename ethereum/blockcreation/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/RandomNonceGenerator.java (91%) rename ethereum/blockcreation/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/AbstractMiningCoordinatorTest.java (90%) rename ethereum/blockcreation/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/BlockMinerTest.java (87%) rename ethereum/blockcreation/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/BlockTransactionSelectorTest.java (82%) rename ethereum/blockcreation/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/DefaultBlockSchedulerTest.java (85%) rename ethereum/blockcreation/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/EthHashBlockCreatorTest.java (83%) rename ethereum/blockcreation/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/EthHashMinerExecutorTest.java (82%) rename ethereum/blockcreation/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/EthHashMiningCoordinatorTest.java (88%) rename ethereum/blockcreation/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockcreation/IncrementingNonceGeneratorTest.java (96%) rename ethereum/core/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractIntegrationTest.java (83%) rename ethereum/core/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/EntriesFromIntegrationTest.java (77%) rename ethereum/core/src/integration-test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/TraceTransactionIntegrationTest.java (90%) rename ethereum/core/src/jmh/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/BlockHashOperationBenchmark.java (86%) rename ethereum/core/src/jmh/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/OperationBenchmarkHelper.java (82%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/BlockValidator.java (84%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/MainnetBlockValidator.java (86%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/ProtocolContext.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/BlockAddedEvent.java (93%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/BlockAddedObserver.java (93%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/Blockchain.java (94%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/BlockchainStorage.java (85%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/ChainHead.java (88%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/DefaultBlockchain.java (95%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/GenesisState.java (87%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/MinedBlockObserver.java (87%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/MutableBlockchain.java (90%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/TransactionLocation.java (91%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/AbstractWorldUpdater.java (98%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/Account.java (95%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/AccountState.java (96%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/AccountStorageEntry.java (95%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/AccountTransactionOrder.java (98%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/Address.java (93%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/Block.java (90%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/BlockBody.java (94%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/BlockHeader.java (93%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/BlockHeaderBuilder.java (98%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/BlockHeaderFunctions.java (97%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/BlockImporter.java (94%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/Gas.java (96%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/Hash.java (84%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/Log.java (91%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/LogSeries.java (94%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/LogTopic.java (87%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/LogsBloomFilter.java (92%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/MiningParameters.java (96%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/MutableAccount.java (95%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/MutableWorldState.java (95%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/MutableWorldView.java (95%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/ParsedExtraData.java (94%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/PrivacyParameters.java (91%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/ProcessableBlockHeader.java (95%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/SealableBlockHeader.java (95%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/SyncStatus.java (92%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/Synchronizer.java (80%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/Transaction.java (95%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/TransactionFilter.java (94%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/TransactionReceipt.java (96%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/Util.java (91%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/Wei.java (87%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/WorldState.java (94%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/WorldUpdater.java (98%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/WorldView.java (95%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/debug/TraceFrame.java (91%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/debug/TraceOptions.java (96%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/difficulty/fixed/FixedDifficultyCalculators.java (88%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/difficulty/fixed/FixedDifficultyProtocolSchedule.java (83%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/AbstractMessageProcessor.java (93%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/AbstractPrecompiledContract.java (83%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/AttachedBlockHeaderValidationRule.java (87%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/BlockBodyValidator.java (88%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/BlockHeaderValidator.java (96%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/BlockProcessor.java (85%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/BodyValidation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/ConstantinopleFixGasCalculator.java (91%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/ConstantinopleGasCalculator.java (92%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/ContractValidationRule.java (87%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/DetachedBlockHeaderValidationRule.java (90%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/DifficultyCalculator.java (87%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/DirectAcyclicGraphSeed.java (87%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/EthHash.java (98%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/EthHashCacheFactory.java (97%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/EthHashSolution.java (91%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/EthHashSolver.java (95%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/EthHashSolverInputs.java (92%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/EthHasher.java (96%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/FrontierGasCalculator.java (95%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/HeaderValidationMode.java (96%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/HomesteadGasCalculator.java (89%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/IstanbulGasCalculator.java (93%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetBlockBodyValidator.java (93%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetBlockHeaderFunctions.java (74%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetBlockHeaderValidator.java (74%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetBlockImporter.java (79%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetBlockProcessor.java (89%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetContractCreationProcessor.java (92%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetDifficultyCalculators.java (96%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetEvmRegistries.java (64%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetMessageCallProcessor.java (92%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetPrecompiledContractRegistries.java (81%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetProtocolSchedule.java (88%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetProtocolSpecs.java (92%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetTransactionProcessor.java (88%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetTransactionValidator.java (75%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MiningBeneficiaryCalculator.java (81%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MutableProtocolSchedule.java (96%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/PrecompileContractRegistry.java (93%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/PrecompiledContract.java (87%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/PrecompiledContractConfiguration.java (89%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/ProtocolSchedule.java (88%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/ProtocolScheduleBuilder.java (97%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/ProtocolSpec.java (91%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/ProtocolSpecBuilder.java (93%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/ScheduleBasedBlockHeaderFunctions.java (83%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/ScheduledProtocolSpec.java (95%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/SpuriousDragonGasCalculator.java (88%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/TangerineWhistleGasCalculator.java (92%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/TransactionProcessor.java (87%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/TransactionReceiptType.java (93%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/TransactionValidationParams.java (98%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/TransactionValidator.java (93%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/ValidationResult.java (98%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/contractvalidation/MaxCodeSizeRule.java (88%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/headervalidationrules/AncestryValidationRule.java (88%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/headervalidationrules/CalculatedDifficultyValidationRule.java (84%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRule.java (88%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRule.java (86%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRule.java (92%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/headervalidationrules/GasUsageValidationRule.java (86%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRule.java (85%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/headervalidationrules/TimestampBoundedByFutureParameter.java (90%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/headervalidationrules/TimestampMoreRecentThanParent.java (90%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/precompiles/AltBN128AddPrecompiledContract.java (83%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/precompiles/AltBN128MulPrecompiledContract.java (83%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContract.java (85%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContract.java (81%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/precompiles/BigIntegerModularExponentiationPrecompiledContract.java (93%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/precompiles/ECRECPrecompiledContract.java (79%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/precompiles/IDPrecompiledContract.java (74%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/precompiles/RIPEMD160PrecompiledContract.java (71%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/precompiles/SHA256PrecompiledContract.java (73%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContract.java (77%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/PrivateStateKeyValueStorage.java (85%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/PrivateStateStorage.java (82%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/PrivateTransaction.java (96%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/PrivateTransactionHandler.java (83%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/PrivateTransactionKeyValueStorage.java (86%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/PrivateTransactionProcessor.java (83%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/PrivateTransactionStorage.java (81%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/PrivateTransactionValidator.java (68%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/Restriction.java (90%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactory.java (77%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/markertransaction/PrivateMarkerTransactionFactory.java (82%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactory.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/proof/WorldStateProof.java (86%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/proof/WorldStateProofProvider.java (80%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/storage/StorageProvider.java (66%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/storage/keyvalue/KeyValueSegmentIdentifier.java (88%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java (88%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/storage/keyvalue/KeyValueStorageProvider.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/storage/keyvalue/KeyValueStorageProviderBuilder.java (69%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/storage/keyvalue/WorldStateKeyValueStorage.java (90%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/storage/keyvalue/WorldStatePreimageKeyValueStorage.java (83%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/transaction/CallParameter.java (91%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/transaction/TransactionSimulator.java (85%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/transaction/TransactionSimulatorResult.java (69%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/util/BlockchainUtil.java (94%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/util/ByteArrayUtil.java (97%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/util/NonceProvider.java (87%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/util/RawBlockIterator.java (87%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/AbstractCallOperation.java (95%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/AbstractOperation.java (98%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/BlockHashLookup.java (87%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/Code.java (93%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/DebugOperationTracer.java (87%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/EVM.java (91%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/ExceptionalHaltReason.java (94%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/GasCalculator.java (87%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/Memory.java (97%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/MessageFrame.java (97%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/OperandStack.java (97%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/Operation.java (92%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/OperationRegistry.java (97%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/OperationTracer.java (85%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/PreAllocatedOperandStack.java (96%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/Words.java (89%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/ehalt/ExceptionalHaltException.java (90%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/ehalt/ExceptionalHaltManager.java (89%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/ehalt/ExceptionalHaltPredicate.java (79%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/ehalt/InsufficientGasExceptionalHaltPredicate.java (88%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/ehalt/InvalidOperationExceptionalHaltPredicate.java (84%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/ehalt/StackOverflowExceptionalHaltPredicate.java (81%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/ehalt/StackUnderflowExceptionalHaltPredicate.java (81%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/AbstractCreateOperation.java (86%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/AddModOperation.java (79%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/AddOperation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/AddressOperation.java (74%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/AndOperation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/BalanceOperation.java (71%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/BlockHashOperation.java (77%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ByteOperation.java (79%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/CallCodeOperation.java (84%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/CallDataCopyOperation.java (79%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/CallDataLoadOperation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/CallDataSizeOperation.java (74%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/CallOperation.java (84%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/CallValueOperation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/CallerOperation.java (74%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ChainIdOperation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/CodeCopyOperation.java (79%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/CodeSizeOperation.java (73%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/CoinbaseOperation.java (74%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/Create2Operation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/CreateOperation.java (79%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/DelegateCallOperation.java (84%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/DifficultyOperation.java (77%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/DivOperation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/DupOperation.java (80%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/EqOperation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ExpOperation.java (80%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ExtCodeCopyOperation.java (75%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ExtCodeHashOperation.java (72%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ExtCodeSizeOperation.java (69%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/GasLimitOperation.java (75%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/GasOperation.java (74%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/GasPriceOperation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/GtOperation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/InvalidOperation.java (75%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/IsZeroOperation.java (74%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/JumpDestOperation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/JumpOperation.java (77%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/JumpiOperation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/LogOperation.java (77%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/LtOperation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/MLoadOperation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/MSizeOperation.java (75%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/MStore8Operation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/MStoreOperation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ModOperation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/MulModOperation.java (79%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/MulOperation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/NotOperation.java (77%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/NumberOperation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/OrOperation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/OriginOperation.java (74%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/PCOperation.java (75%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/PopOperation.java (77%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/PushOperation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ReturnDataCopyOperation.java (82%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ReturnDataSizeOperation.java (74%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ReturnOperation.java (80%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/RevertOperation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/SDivOperation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/SGtOperation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/SLoadOperation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/SLtOperation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/SModOperation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/SStoreOperation.java (81%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/SarOperation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/SelfBalanceOperation.java (73%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/SelfDestructOperation.java (77%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/Sha3Operation.java (75%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ShlOperation.java (71%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ShrOperation.java (71%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/SignExtendOperation.java (79%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/StaticCallOperation.java (84%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/StopOperation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/SubOperation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/SwapOperation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/TimestampOperation.java (76%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/XorOperation.java (78%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/worldstate/DefaultMutableWorldState.java (93%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/worldstate/MarkSweepPruner.java (87%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/worldstate/Pruner.java (93%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/worldstate/PruningConfiguration.java (95%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/worldstate/StateTrieAccountValue.java (91%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/worldstate/WorldStateArchive.java (80%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/worldstate/WorldStatePreimageStorage.java (83%) rename ethereum/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/worldstate/WorldStateStorage.java (90%) rename ethereum/core/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/AddressHelpers.java (97%) rename ethereum/core/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/BlockDataGenerator.java (96%) rename ethereum/core/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/BlockHeaderTestFixture.java (94%) rename ethereum/core/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/BlockSyncTestUtils.java (86%) rename ethereum/core/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/BlockchainSetupUtil.java (86%) rename ethereum/core/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/ExecutionContextTestFixture.java (76%) rename ethereum/core/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/InMemoryStorageProvider.java (65%) rename ethereum/core/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/MessageFrameTestFixture.java (92%) rename ethereum/core/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/MiningParametersTestBuilder.java (93%) rename ethereum/core/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/PrivateTransactionTestFixture.java (92%) rename ethereum/core/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/TestCodeExecutor.java (84%) rename ethereum/core/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/TransactionTestFixture.java (93%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/DefaultBlockchainTest.java (93%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/GenesisStateTest.java (95%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/AccountTransactionOrderTest.java (96%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/BlockHeaderMock.java (87%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/HashTest.java (95%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/LogTest.java (91%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/LogsBloomFilterTest.java (95%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/LogsBloomFilterTestCaseSpec.java (92%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/TransactionIntegrationTest.java (95%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/TransactionReceiptTest.java (90%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/TransactionTest.java (91%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/TransactionTestCaseSpec.java (96%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/core/UtilTest.java (96%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/difficulty/fixed/FixedProtocolScheduleTest.java (85%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/BlockHeaderValidatorTest.java (97%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/BodyValidationTest.java (89%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/EthHashSolverTest.java (91%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/EthHashTest.java (94%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/IntrinsicGasTest.java (91%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetBlockHeaderValidatorTest.java (96%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetBlockImporterTest.java (73%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetBlockProcessorTest.java (79%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetProtocolScheduleTest.java (98%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetTransactionProcessorTest.java (77%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/MainnetTransactionValidatorTest.java (81%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/ProtocolScheduleTest.java (98%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/RefundSstoreGasTest.java (89%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/TransactionValidationParamsTest.java (98%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/ValidationResultTest.java (97%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/ValidationTestUtils.java (85%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/headervalidationrules/AncestryValidationRuleTest.java (90%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRuleTest.java (87%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRuleTest.java (87%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRuleTest.java (92%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/headervalidationrules/GasUsageValidationRuleTest.java (90%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRuleTest.java (86%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/headervalidationrules/TimestampValidationRuleTest.java (96%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContractTest.java (94%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContractTest.java (94%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/precompiles/ECRECPrecompiledContractTest.java (99%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractTest.java (82%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/PrivateTransactionHandlerTest.java (84%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/PrivateTransactionTest.java (96%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/PrivateTransactionValidatorTest.java (78%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactoryTest.java (85%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactoryTest.java (87%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/proof/WorldStateProofProviderTest.java (83%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/storage/keyvalue/KeyValueStorageWorldStateStorageTest.java (94%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/transaction/TransactionSimulatorResultTest.java (93%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/transaction/TransactionSimulatorTest.java (92%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/util/BlockchainUtilParameterizedTest.java (88%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/util/RawBlockIteratorTest.java (89%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/.gitignore (100%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/AbstractRetryingTest.java (98%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/AddressMock.java (90%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/AddressTest.java (93%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/BlockHashLookupTest.java (85%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/BlockchainReferenceTestCaseSpec.java (83%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/BlockchainReferenceTestTools.java (82%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/CodeMock.java (90%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/DebugOperationTracerTest.java (88%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/EnvironmentInformation.java (94%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/GeneralStateReferenceTestTools.java (87%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/GeneralStateTestCaseEipSpec.java (90%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/GeneralStateTestCaseSpec.java (94%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/LogMock.java (85%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/MemoryTest.java (96%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/PreAllocatedOperandStackTest.java (97%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/ReferenceTestProtocolSchedules.java (89%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/StateTestVersionedTransaction.java (88%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/TestBlockchain.java (87%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/VMReferenceTest.java (87%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/VMReferenceTestCaseSpec.java (92%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/WorldStateMock.java (83%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/blockchain/.keep (100%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/generalstate/.keep (100%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/BlockHashOperationTest.java (85%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ChainIdOperationTest.java (88%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ConstantinopleSStoreOperationGasCostTest.java (84%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/Create2OperationTest.java (91%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ExtCodeHashOperationTest.java (78%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/RevertOperationTest.java (84%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/SStoreOperationTest.java (77%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/SarOperationTest.java (94%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ShlOperationTest.java (92%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/operations/ShrOperationTest.java (93%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/worldstate/DefaultMutableWorldStateTest.java (95%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/worldstate/MarkSweepPrunerTest.java (91%) rename ethereum/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/worldstate/PrunerTest.java (87%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockvalidation/block_1200000.blocks (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockvalidation/block_1200001.blocks (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockvalidation/block_300005.blocks (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockvalidation/block_300006.blocks (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockvalidation/block_4400000.blocks (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockvalidation/block_4400001.blocks (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/blockvalidation/block_4400002.blocks (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/genesis-olympic.json (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/genesis1.json (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/genesis2.json (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/genesis3.json (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/genesis4.json (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/chain/genesisNonce.json (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/block_1.blocks (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/block_1200000.blocks (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/block_1200001.blocks (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/block_300005.blocks (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/block_300006.blocks (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/block_4400000.blocks (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/block_4400001.blocks (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/mainnet/block_4400002.blocks (100%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/BlockchainReferenceTest.java.template (75%) rename ethereum/core/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/vm/GeneralStateReferenceTest.java.template (75%) rename ethereum/eth/src/jmh/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/WorldStateDownloaderBenchmark.java (68%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/EthProtocol.java (92%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/EthProtocolConfiguration.java (97%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/ChainState.java (94%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/EthContext.java (95%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/EthMessage.java (88%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/EthMessages.java (93%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/EthPeer.java (86%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/EthPeers.java (92%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/EthProtocolManager.java (87%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/EthScheduler.java (90%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/EthServer.java (84%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/MonitoredExecutors.java (90%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/PeerReputation.java (95%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/PeerRequest.java (75%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/PendingPeerRequest.java (90%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/RequestManager.java (96%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/bounded/BoundedQueue.java (82%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/exceptions/EthTaskException.java (94%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/exceptions/IncompleteResultsException.java (92%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/exceptions/MaxRetriesReachedException.java (92%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/exceptions/NoAvailablePeersException.java (92%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/exceptions/PeerBreachedProtocolException.java (92%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/exceptions/PeerDisconnectedException.java (88%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/AbstractEthTask.java (89%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/AbstractGetHeadersFromPeerTask.java (86%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/AbstractPeerRequestTask.java (78%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/AbstractPeerTask.java (81%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/AbstractRetryingPeerTask.java (87%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/EthTask.java (93%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/GetBlockFromPeerTask.java (86%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/GetBodiesFromPeerTask.java (85%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/GetHeadersFromPeerByHashTask.java (90%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTask.java (89%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/GetNodeDataFromPeerTask.java (83%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/GetReceiptsFromPeerTask.java (84%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTask.java (87%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/WaitForPeerTask.java (89%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/WaitForPeersTask.java (91%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/BlockBodiesMessage.java (74%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/BlockHeadersMessage.java (76%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/EthPV62.java (95%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/EthPV63.java (94%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/GetBlockBodiesMessage.java (80%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/GetBlockHeadersMessage.java (92%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/GetNodeDataMessage.java (80%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/GetReceiptsMessage.java (80%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/LimitedTransactionsMessages.java (91%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/NewBlockHashesMessage.java (89%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/NewBlockMessage.java (81%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/NodeDataMessage.java (81%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/ReceiptsMessage.java (82%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/StatusMessage.java (87%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/TransactionsMessage.java (79%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/peervalidation/DaoForkPeerValidator.java (88%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/peervalidation/PeerValidator.java (88%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/peervalidation/PeerValidatorRunner.java (92%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/BlockBroadcaster.java (83%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/BlockPropagationManager.java (88%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/ChainDownloader.java (93%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/ChainHeadTracker.java (80%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/CheckpointHeaderFetcher.java (89%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/CheckpointHeaderValidationStep.java (88%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/CheckpointRange.java (93%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/CheckpointRangeHeaders.java (95%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/CheckpointRangeSource.java (96%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/DefaultSynchronizer.java (81%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/DownloadBodiesStep.java (77%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/DownloadHeadersStep.java (87%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/DownloadPipelineFactory.java (84%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/PipelineChainDownloader.java (84%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/SyncMode.java (95%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/SyncTargetManager.java (88%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/SynchronizerConfiguration.java (98%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/TrailingPeerLimiter.java (87%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/TrailingPeerRequirements.java (96%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/ValidationPolicy.java (85%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/BlockWithReceipts.java (87%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/DownloadReceiptsStep.java (83%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastDownloaderFactory.java (81%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastImportBlocksStep.java (87%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastSyncActions.java (86%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastSyncChainDownloader.java (70%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastSyncDownloadPipelineFactory.java (74%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastSyncDownloader.java (89%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastSyncError.java (92%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastSyncException.java (93%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastSyncState.java (95%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastSyncStateStorage.java (89%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastSyncTargetManager.java (81%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastSyncValidationPolicy.java (83%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/PivotBlockRetriever.java (90%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluator.java (86%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fullsync/ExtractTxSignaturesStep.java (86%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fullsync/FullImportBlockStep.java (79%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fullsync/FullSyncChainDownloader.java (71%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fullsync/FullSyncDownloadPipelineFactory.java (77%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fullsync/FullSyncDownloader.java (76%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fullsync/FullSyncTargetManager.java (80%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/state/PendingBlocks.java (95%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/state/SyncState.java (89%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/state/SyncTarget.java (83%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/tasks/CompleteBlocksTask.java (86%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/tasks/DetermineCommonAncestorTask.java (90%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/tasks/DownloadHeaderSequenceTask.java (87%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/tasks/GetReceiptsForHeadersTask.java (87%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/tasks/PersistBlockTask.java (90%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByNumberTask.java (81%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/tasks/exceptions/InvalidBlockException.java (87%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/AccountTrieNodeDataRequest.java (70%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/CodeNodeDataRequest.java (79%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/CompleteTaskStep.java (87%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/LoadLocalDataStep.java (76%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/NodeDataRequest.java (90%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/PersistDataStep.java (83%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/RequestDataStep.java (84%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/RequestType.java (95%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/StalledDownloadException.java (92%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/StorageTrieNodeDataRequest.java (82%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/TaskQueueIterator.java (90%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/TrieNodeDataRequest.java (87%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/WorldDownloadState.java (92%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/WorldStateDownloadProcess.java (91%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/WorldStateDownloader.java (90%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/WorldStateDownloaderException.java (92%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/PeerTransactionTracker.java (89%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/PendingTransactionDroppedListener.java (86%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/PendingTransactionListener.java (86%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/PendingTransactions.java (95%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/TransactionPool.java (84%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/TransactionPoolConfiguration.java (98%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/TransactionPoolFactory.java (82%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/TransactionSender.java (85%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/TransactionsMessageHandler.java (80%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/TransactionsMessageProcessor.java (84%) rename ethereum/eth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/TransactionsMessageSender.java (82%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/ChainStateTest.java (95%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/DeterministicEthScheduler.java (96%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/EthContextTestUtil.java (79%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/EthPeerTest.java (91%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/EthPeersTest.java (92%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/EthProtocolManagerTest.java (93%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/EthProtocolManagerTestUtil.java (83%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/EthSchedulerShutdownTest.java (98%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/EthSchedulerTest.java (98%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/EthServerTest.java (87%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/MockEthTask.java (88%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/MockPeerConnection.java (82%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/MockScheduledExecutor.java (96%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/PeerReputationTest.java (50%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/RequestManagerTest.java (82%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/RespondingEthPeer.java (90%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/bounded/BoundedQueueTest.java (93%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java (83%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/ethtaskutils/PeerMessageTaskTest.java (72%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskTest.java (90%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/AbstractEthTaskTest.java (95%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/GetBlockFromPeerTaskTest.java (67%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java (79%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/GetHeadersFromPeerByHashTaskTest.java (84%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTaskTest.java (90%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/GetNodeDataFromPeerTaskTest.java (79%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/GetReceiptsFromPeerTaskTest.java (79%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTaskTest.java (85%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/WaitForPeerTaskTest.java (87%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/manager/task/WaitForPeersTaskTest.java (89%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/BlockBodiesMessageTest.java (76%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/BlockHeadersMessageTest.java (77%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/GetBlockBodiesMessageTest.java (78%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/GetBlockHeadersMessageTest.java (89%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/GetNodeDataMessageTest.java (85%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/GetReceiptsMessageTest.java (85%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/LimitedTransactionsMessagesTest.java (91%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/NewBlockHashesMessageTest.java (81%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/NewBlockMessageTest.java (83%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/NodeDataMessageTest.java (85%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/ReceiptsMessageTest.java (86%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/StatusMessageTest.java (84%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/messages/TransactionsMessageTest.java (86%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/peervalidation/DaoForkPeerValidatorTest.java (84%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/peervalidation/PeerValidatorRunnerTest.java (93%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/BlockBroadcasterTest.java (82%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/BlockPropagationManagerTest.java (89%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/ChainHeadTrackerTest.java (71%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/CheckpointHeaderFetcherTest.java (90%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/CheckpointHeaderValidationStepTest.java (86%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/CheckpointRangeSourceTest.java (94%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/DownloadHeadersStepTest.java (84%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/PipelineChainDownloaderTest.java (93%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/TrailingPeerLimiterTest.java (87%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/DownloadReceiptsStepTest.java (79%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastImportBlocksStepTest.java (83%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastSyncActionsTest.java (87%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastSyncChainDownloaderTest.java (80%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastSyncDownloaderTest.java (78%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastSyncStateStorageTest.java (85%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/FastSyncValidationPolicyTest.java (85%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fastsync/PivotBlockRetrieverTest.java (83%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluatorTest.java (93%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fullsync/FullImportBlockStepTest.java (79%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fullsync/FullSyncChainDownloaderForkTest.java (73%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fullsync/FullSyncChainDownloaderTest.java (85%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fullsync/FullSyncDownloaderTest.java (77%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/fullsync/FullSyncTargetManagerTest.java (76%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/state/PendingBlocksTest.java (96%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/state/SyncStateTest.java (92%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/tasks/CompleteBlocksTaskTest.java (82%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskParameterizedTest.java (81%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskTest.java (85%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/tasks/DownloadHeaderSequenceTaskTest.java (82%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/tasks/GetReceiptsForHeadersTaskTest.java (84%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/tasks/PersistBlockTaskTest.java (94%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByNumberTaskTest.java (84%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/CompleteTaskStepTest.java (89%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/LoadLocalDataStepTest.java (83%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/NodeDataRequestTest.java (95%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/PersistDataStepTest.java (89%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/RequestDataStepTest.java (92%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/StubTask.java (88%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/WorldDownloadStateTest.java (84%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/sync/worldstate/WorldStateDownloaderTest.java (91%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/PeerTransactionTrackerTest.java (94%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/PendingTransactionsTest.java (95%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/TestNode.java (73%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/TestNodeList.java (95%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/TransactionPoolPropagationTest.java (89%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/TransactionPoolTest.java (91%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/TransactionsMessageProcessorTest.java (89%) rename ethereum/eth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/eth/transactions/TransactionsMessageSenderTest.java (90%) rename ethereum/mock-p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/testing/MockNetwork.java (89%) rename ethereum/mock-p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/testing/MockNetworkTest.java (87%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/config/DiscoveryConfiguration.java (98%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/config/NetworkingConfiguration.java (98%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/config/RlpxConfiguration.java (96%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/config/SubProtocolConfiguration.java (86%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/DiscoveryPeer.java (89%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/Endpoint.java (93%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/PeerBondedObserver.java (83%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/PeerDiscoveryAgent.java (89%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/PeerDiscoveryEvent.java (89%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/PeerDiscoveryPacketDecodingException.java (94%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/PeerDiscoveryServiceException.java (93%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/PeerDiscoveryStatus.java (95%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/VertxPeerDiscoveryAgent.java (89%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/Bucket.java (95%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/DiscoveryProtocolLogger.java (83%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/FindNeighborsPacketData.java (90%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/NeighborsPacketData.java (90%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/OutboundMessageHandler.java (85%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/Packet.java (88%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PacketData.java (89%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PacketType.java (94%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PeerDiscoveryController.java (94%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PeerDiscoveryPermissions.java (63%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PeerDistanceCalculator.java (92%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PeerRequirement.java (94%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PeerTable.java (91%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PingPacketData.java (91%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PongPacketData.java (88%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/RecursivePeerRefreshState.java (95%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/RetryDelayFunction.java (94%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/TimerUtil.java (93%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/VertxTimerUtil.java (94%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/network/DefaultP2PNetwork.java (90%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/network/NetworkRunner.java (92%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/network/NoopP2PNetwork.java (78%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/network/P2PNetwork.java (87%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/network/PeerReputationManager.java (82%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/network/ProtocolManager.java (85%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/network/exceptions/BreachOfProtocolException.java (92%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/network/exceptions/IncompatiblePeerException.java (92%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/network/exceptions/P2PDisabledException.java (92%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/network/exceptions/PeerDisconnectedException.java (83%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/network/exceptions/UnexpectedPeerConnectionException.java (92%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/DefaultLocalNode.java (93%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/DefaultPeer.java (98%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/DefaultPeerId.java (87%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/DefaultPeerPrivileges.java (94%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/EnodeURL.java (98%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/LocalNode.java (92%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/MaintainedPeers.java (96%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/MutableLocalNode.java (90%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/Peer.java (88%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/PeerId.java (87%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/PeerPrivileges.java (95%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/StaticNodesParser.java (98%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/permissions/PeerPermissions.java (96%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/permissions/PeerPermissionsBlacklist.java (90%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/permissions/PeerPermissionsException.java (85%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/permissions/PermissionsUpdateCallback.java (92%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/ConnectCallback.java (84%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/DisconnectCallback.java (77%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/MessageCallback.java (80%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/RlpxAgent.java (92%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/AbstractPeerConnection.java (88%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/ConnectionInitializer.java (90%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/PeerConnection.java (86%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/PeerConnectionEventDispatcher.java (75%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/PeerConnectionEvents.java (72%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/PeerRlpxPermissions.java (64%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/RlpxConnection.java (95%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java (81%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/netty/ApiHandler.java (77%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/netty/DeFramer.java (77%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerInbound.java (75%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerOutbound.java (80%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/netty/MessageFramer.java (85%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/netty/NettyConnectionInitializer.java (90%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/netty/NettyPeerConnection.java (67%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/netty/OutboundMessage.java (83%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/netty/TimeoutHandler.java (96%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/netty/WireKeepAlive.java (80%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/framing/Framer.java (96%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/framing/FramingException.java (94%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/framing/SnappyCompressor.java (96%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/HandshakeException.java (93%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/HandshakeSecrets.java (97%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/Handshaker.java (97%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/ecies/ECIESEncryptionEngine.java (98%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshaker.java (95%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessage.java (95%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessage.java (78%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV1.java (73%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4.java (86%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessage.java (77%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV1.java (73%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV4.java (82%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/AbstractMessageData.java (92%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/Capability.java (88%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/CapabilityMultiplexer.java (98%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/DefaultMessage.java (89%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/Message.java (88%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/MessageData.java (90%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/PeerInfo.java (89%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/RawMessage.java (89%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/SubProtocol.java (97%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/messages/DisconnectMessage.java (90%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/messages/EmptyMessage.java (81%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/messages/HelloMessage.java (79%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/messages/PingMessage.java (93%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/messages/PongMessage.java (93%) rename ethereum/p2p/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/messages/WireMessageCodes.java (94%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/NetworkingTestHelper.java (77%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/config/DiscoveryConfigurationTest.java (92%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/config/RlpxConfigurationTest.java (97%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/PeerDiscoveryAgentTest.java (95%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/PeerDiscoveryBondingTest.java (87%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/PeerDiscoveryBootstrappingTest.java (90%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/PeerDiscoveryObserversTest.java (94%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java (90%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/PeerDiscoveryPacketSedesTest.java (87%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/PeerDiscoveryTestHelper.java (90%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/PeerDiscoveryTimestampsTest.java (84%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/BlockingAsyncExecutor.java (84%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/BucketTest.java (96%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/FindNeighborsPacketDataTest.java (89%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/MockPacketDataFactory.java (90%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/MockPeerDiscoveryAgent.java (85%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/MockTimerUtil.java (97%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/NeighborsPacketDataTest.java (87%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PacketTest.java (93%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PacketTypeTest.java (95%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PeerDiscoveryControllerDistanceCalculatorTest.java (92%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PeerDiscoveryControllerTest.java (97%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PeerDiscoveryTableRefreshTest.java (87%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PeerRequirementCombineTest.java (98%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PeerTableTest.java (86%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PingPacketDataTest.java (93%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/PongPacketDataTest.java (89%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/discovery/internal/RecursivePeerRefreshStateTest.java (97%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/network/DefaultP2PNetworkTest.java (77%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/network/NetworkingServiceLifecycleTest.java (88%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/network/P2PNetworkTest.java (85%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/network/PeerReputationManagerTest.java (83%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/DefaultLocalNodeTest.java (74%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/EnodeURLTest.java (99%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/MaintainedPeersTest.java (97%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/PeerTest.java (94%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/PeerTestHelper.java (90%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/StaticNodesParserTest.java (99%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/permissions/PeerPermissionsBlacklistTest.java (95%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/permissions/PeerPermissionsTest.java (95%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/RlpxAgentTest.java (92%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/AbstractPeerConnectionTest.java (87%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/MockConnectionInitializer.java (92%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/MockPeerConnection.java (78%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/RlpxConnectionTest.java (96%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/netty/DeFramerTest.java (88%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/connections/netty/testhelpers/NettyMocks.java (94%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/framing/FramerTest.java (95%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/framing/SnappyCompressorTest.java (97%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshakeTest.java (96%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessageTest.java (89%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4Test.java (92%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/CapabilityMultiplexerTest.java (95%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/MockSubProtocol.java (95%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/WireMessagesSedesTest.java (91%) rename ethereum/p2p/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/wire/messages/DisconnectMessageTest.java (90%) rename ethereum/p2p/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/invalid_static_nodes.json (100%) rename ethereum/p2p/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/invalid_static_nodes_no_listening_port.json (100%) rename ethereum/p2p/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/peers/valid_static_nodes.json (100%) rename ethereum/p2p/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/ecies/test.initiatormessage (100%) rename ethereum/p2p/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/p2p/rlpx/handshake/ecies/test.keypair (100%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/AccountLocalConfigPermissioningController.java (93%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/LocalPermissioningConfiguration.java (97%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/NodeLocalConfigPermissioningController.java (94%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/NodePermissioningControllerFactory.java (87%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/NodeSmartContractPermissioningController.java (89%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/PermissioningConfiguration.java (96%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/PermissioningConfigurationBuilder.java (97%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/SmartContractPermissioningConfiguration.java (95%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/TomlConfigFileParser.java (98%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/TransactionSmartContractPermissioningController.java (89%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/WhitelistFileSyncException.java (92%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/WhitelistOperationResult.java (94%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/WhitelistPersistor.java (99%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/account/AccountPermissioningController.java (88%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/account/AccountPermissioningControllerFactory.java (85%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/account/TransactionPermissioningProvider.java (85%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/node/ContextualNodePermissioningProvider.java (93%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/node/InsufficientPeersPermissioningProvider.java (90%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/node/NodePermissioningController.java (92%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/node/NodePermissioningProvider.java (86%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/node/NodeWhitelistUpdatedEvent.java (93%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/node/PeerPermissionsAdapter.java (92%) rename ethereum/permissioning/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProvider.java (85%) rename ethereum/permissioning/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/AccountLocalConfigPermissioningControllerTest.java (96%) rename ethereum/permissioning/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/LocalPermissioningConfigurationBuilderTest.java (99%) rename ethereum/permissioning/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/LocalPermissioningConfigurationTest.java (98%) rename ethereum/permissioning/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/NodeLocalConfigPermissioningControllerTest.java (83%) rename ethereum/permissioning/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/NodeSmartContractPermissioningControllerTest.java (90%) rename ethereum/permissioning/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/TransactionSmartContractPermissioningControllerTest.java (83%) rename ethereum/permissioning/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/WhitelistPersistorTest.java (97%) rename ethereum/permissioning/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/account/AccountPermissioningControllerFactoryTest.java (89%) rename ethereum/permissioning/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/account/AccountPermissioningControllerTest.java (90%) rename ethereum/permissioning/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/node/InsufficientPeersPermissioningProviderTest.java (96%) rename ethereum/permissioning/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/node/NodePermissioningControllerFactoryTest.java (90%) rename ethereum/permissioning/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/node/NodePermissioningControllerTest.java (96%) rename ethereum/permissioning/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/node/PeerPermissionsAdapterTest.java (95%) rename ethereum/permissioning/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProviderTest.java (92%) rename ethereum/retesteth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/retesteth/NoRewardProtocolScheduleWrapper.java (80%) rename ethereum/retesteth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/retesteth/RetestethClock.java (97%) rename ethereum/retesteth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/retesteth/RetestethConfiguration.java (94%) rename ethereum/retesteth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/retesteth/RetestethContext.java (72%) rename ethereum/retesteth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/retesteth/RetestethService.java (61%) rename ethereum/retesteth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/retesteth/methods/TestGetLogHash.java (68%) rename ethereum/retesteth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/retesteth/methods/TestImportRawBlock.java (71%) rename ethereum/retesteth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/retesteth/methods/TestMineBlocks.java (70%) rename ethereum/retesteth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/retesteth/methods/TestModifyTimestamp.java (69%) rename ethereum/retesteth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/retesteth/methods/TestRewindToBlock.java (69%) rename ethereum/retesteth/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/retesteth/methods/TestSetChainParams.java (89%) rename ethereum/retesteth/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/retesteth/methods/TestSetChainParamsTest.java (91%) rename ethereum/retesteth/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/retesteth/methods/multimpleBalanceInstructionChainParams.json (100%) rename ethereum/rlp/src/jmh/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/RLPBench.java (93%) rename ethereum/rlp/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/AbstractRLPInput.java (96%) rename ethereum/rlp/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/AbstractRLPOutput.java (90%) rename ethereum/rlp/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/BytesValueRLPInput.java (91%) rename ethereum/rlp/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/BytesValueRLPOutput.java (87%) rename ethereum/rlp/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/CorruptedRLPInputException.java (94%) rename ethereum/rlp/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/MalformedRLPInputException.java (95%) rename ethereum/rlp/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/RLP.java (89%) rename ethereum/rlp/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/RLPDecodingHelpers.java (99%) rename ethereum/rlp/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/RLPEncodingHelpers.java (95%) rename ethereum/rlp/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/RLPException.java (94%) rename ethereum/rlp/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/RLPInput.java (98%) rename ethereum/rlp/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/RLPOutput.java (97%) create mode 100644 ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/package-info.java delete mode 100644 ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/package-info.java rename ethereum/rlp/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/BytesValueRLPInputTest.java (99%) rename ethereum/rlp/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/BytesValueRLPOutputTest.java (99%) rename ethereum/rlp/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/InvalidRLPRefTest.java (86%) rename ethereum/rlp/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/InvalidRLPRefTestCaseSpec.java (91%) rename ethereum/rlp/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/RLPRefTest.java (91%) rename ethereum/rlp/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/RLPRefTestCaseSpec.java (94%) rename ethereum/rlp/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/RLPTest.java (97%) rename ethereum/rlp/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/util/RLPTestUtil.java (93%) rename ethereum/rlp/src/test/resources/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/rlp/invalidRLPTest.json (100%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/AllNodesVisitor.java (96%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/BranchNode.java (94%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/CommitVisitor.java (94%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/CompactEncoding.java (96%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/DefaultNodeFactory.java (96%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/ExtensionNode.java (91%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/GetVisitor.java (95%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/KeyValueMerkleStorage.java (86%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/LeafNode.java (91%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/MerklePatriciaTrie.java (91%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/MerkleStorage.java (91%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/MerkleTrieException.java (95%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/Node.java (91%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/NodeFactory.java (90%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/NodeLoader.java (82%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/NodeUpdater.java (81%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/NodeVisitor.java (94%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/NullNode.java (93%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/PathNodeVisitor.java (89%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/Proof.java (91%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/ProofVisitor.java (94%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/PutVisitor.java (97%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/RemoveVisitor.java (95%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/SimpleMerklePatriciaTrie.java (93%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/StorageEntriesCollector.java (85%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/StoredMerklePatriciaTrie.java (90%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/StoredNode.java (93%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/StoredNodeFactory.java (96%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/TrieIterator.java (95%) rename ethereum/trie/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/TrieNodeDecoder.java (97%) rename ethereum/trie/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/AbstractMerklePatriciaTrieTest.java (97%) rename ethereum/trie/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/AllNodesVisitorTest.java (97%) rename ethereum/trie/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/CompactEncodingTest.java (91%) rename ethereum/trie/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/SimpleMerklePatriciaTrieTest.java (90%) rename ethereum/trie/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/StoredMerklePatriciaTrieTest.java (94%) rename ethereum/trie/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/TrieIteratorTest.java (92%) rename ethereum/trie/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/TrieNodeDecoderTest.java (96%) rename ethereum/trie/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/TrieRefTest.java (92%) rename ethereum/trie/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/ethereum/trie/TrieRefTestCaseSpec.java (96%) rename metrics/core/src/main/java/{tech/pegasys/pantheon/metrics/PantheonMetricCategory.java => org/hyperledger/besu/metrics/BesuMetricCategory.java} (72%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/ObservableMetricsSystem.java (82%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/Observation.java (95%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/RunnableCounter.java (94%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/StandardMetricCategory.java (90%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/noop/NoOpCounter.java (87%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/noop/NoOpMetricsSystem.java (89%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/prometheus/CurrentValueCollector.java (96%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/prometheus/MetricsConfiguration.java (96%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/prometheus/MetricsHttpService.java (98%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/prometheus/MetricsPushGatewayService.java (97%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/prometheus/MetricsService.java (93%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/prometheus/PrometheusCounter.java (88%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/prometheus/PrometheusMetricsSystem.java (91%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/prometheus/PrometheusTimer.java (84%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/vertx/PoolMetricsAdapter.java (85%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/vertx/VertxMetricsAdapter.java (91%) rename metrics/core/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/vertx/VertxMetricsAdapterFactory.java (91%) rename metrics/core/src/test-support/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/StubMetricsSystem.java (90%) rename metrics/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/noop/NoOpMetricsSystemTest.java (88%) rename metrics/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/prometheus/MetricsHttpServiceTest.java (98%) rename metrics/core/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/prometheus/PrometheusMetricsSystemTest.java (90%) rename metrics/rocksdb/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/metrics/rocksdb/RocksDBStats.java (97%) rename nat/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/nat/NatMethod.java (96%) rename nat/src/main/java/{tech/pegasys/pantheon/nat/upnp/PantheonUpnpRegistryListener.java => org/hyperledger/besu/nat/upnp/BesuUpnpRegistryListener.java} (93%) rename nat/src/main/java/{tech/pegasys/pantheon/nat/upnp/PantheonUpnpServiceConfiguration.java => org/hyperledger/besu/nat/upnp/BesuUpnpServiceConfiguration.java} (97%) rename nat/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/nat/upnp/OkHttpStreamClient.java (98%) rename nat/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/nat/upnp/UpnpNatManager.java (99%) rename nat/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/nat/upnp/UpnpNatManagerTest.java (99%) rename plugin-api/src/main/java/{tech/pegasys/pantheon/plugin/PantheonContext.java => org/hyperledger/besu/plugin/BesuContext.java} (86%) rename plugin-api/src/main/java/{tech/pegasys/pantheon/plugin/PantheonPlugin.java => org/hyperledger/besu/plugin/BesuPlugin.java} (58%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/Unstable.java (96%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/data/Address.java (89%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/data/BinaryData.java (94%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/data/BlockHeader.java (98%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/data/Hash.java (90%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/data/Log.java (92%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/data/Quantity.java (93%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/data/SyncStatus.java (93%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/data/Transaction.java (97%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/data/UnformattedData.java (89%) rename plugin-api/src/main/java/{tech/pegasys/pantheon/plugin/services/PantheonConfiguration.java => org/hyperledger/besu/plugin/services/BesuConfiguration.java} (77%) rename plugin-api/src/main/java/{tech/pegasys/pantheon/plugin/services/PantheonEvents.java => org/hyperledger/besu/plugin/services/BesuEvents.java} (89%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/MetricsSystem.java (93%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/PicoCLIOptions.java (81%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/StorageService.java (86%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/exception/StorageException.java (96%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/metrics/Counter.java (94%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/metrics/LabelledMetric.java (95%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/metrics/MetricCategory.java (96%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/metrics/MetricCategoryRegistry.java (95%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/metrics/OperationTimer.java (95%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/KeyValueStorage.java (94%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/KeyValueStorageFactory.java (85%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/KeyValueStorageTransaction.java (90%) rename plugin-api/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/SegmentIdentifier.java (91%) rename plugins/rocksdb/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/RocksDBKeyValuePrivacyStorageFactory.java (75%) rename plugins/rocksdb/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactory.java (73%) rename plugins/rocksdb/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/RocksDBMetrics.java (83%) rename plugins/rocksdb/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/RocksDBPlugin.java (82%) rename plugins/rocksdb/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/RocksDbUtil.java (90%) rename plugins/rocksdb/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/configuration/DatabaseMetadata.java (96%) rename plugins/rocksdb/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/configuration/RocksDBCLIOptions.java (97%) rename plugins/rocksdb/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/configuration/RocksDBConfiguration.java (95%) rename plugins/rocksdb/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/configuration/RocksDBConfigurationBuilder.java (80%) rename plugins/rocksdb/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/configuration/RocksDBFactoryConfiguration.java (95%) rename plugins/rocksdb/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueStorage.java (91%) rename plugins/rocksdb/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/unsegmented/RocksDBKeyValueStorage.java (86%) rename plugins/rocksdb/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/unsegmented/RocksDBTransaction.java (85%) rename plugins/rocksdb/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/RocksDBCLIOptionsTest.java (86%) rename plugins/rocksdb/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactoryTest.java (89%) rename plugins/rocksdb/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/RocksDBMetricsTest.java (83%) rename plugins/rocksdb/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/segmented/RocksDBKeyValueStorageTest.java (79%) rename plugins/rocksdb/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/plugin/services/storage/rocksdb/unsegmented/RocksDBColumnarKeyValueStorageTest.java (83%) rename services/kvstore/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/kvstore/InMemoryKeyValueStorage.java (91%) rename services/kvstore/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/kvstore/KeyValueStorageTransactionTransitionValidatorDecorator.java (89%) rename services/kvstore/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/kvstore/LimitedInMemoryKeyValueStorage.java (92%) rename services/kvstore/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/kvstore/SegmentedKeyValueStorage.java (91%) rename services/kvstore/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/kvstore/SegmentedKeyValueStorageAdapter.java (87%) rename services/kvstore/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/kvstore/SegmentedKeyValueStorageTransactionTransitionValidatorDecorator.java (89%) rename services/kvstore/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/kvstore/InMemoryKeyValueStorageTest.java (80%) rename services/kvstore/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/kvstore/LimitedInMemoryKeyValueStorageTest.java (85%) rename services/pipeline/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/AsyncOperationProcessor.java (98%) rename services/pipeline/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/BatchingReadPipe.java (95%) rename services/pipeline/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/CompleterStage.java (96%) rename services/pipeline/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/FlatMapProcessor.java (95%) rename services/pipeline/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/IteratorSourceStage.java (96%) rename services/pipeline/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/MapProcessor.java (95%) rename services/pipeline/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/Pipe.java (97%) rename services/pipeline/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/Pipeline.java (98%) rename services/pipeline/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/PipelineBuilder.java (98%) rename services/pipeline/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/ProcessingStage.java (96%) rename services/pipeline/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/Processor.java (94%) rename services/pipeline/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/ReadPipe.java (97%) rename services/pipeline/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/SharedWritePipe.java (97%) rename services/pipeline/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/Stage.java (92%) rename services/pipeline/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/WritePipe.java (97%) rename services/pipeline/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/AsyncOperationProcessorTest.java (99%) rename services/pipeline/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/BatchingReadPipeTest.java (94%) rename services/pipeline/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/CompleterStageTest.java (90%) rename services/pipeline/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/FlatMapProcessorTest.java (93%) rename services/pipeline/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/IteratorSourceStageTest.java (92%) rename services/pipeline/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/MapProcessorTest.java (93%) rename services/pipeline/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/PipeTest.java (96%) rename services/pipeline/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/PipelineBuilderTest.java (98%) rename services/pipeline/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/ProcessingStageTest.java (96%) rename services/pipeline/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/pipeline/SharedWritePipeTest.java (96%) rename services/tasks/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/tasks/CachingTaskCollection.java (98%) rename services/tasks/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/tasks/FlatFileTaskCollection.java (98%) rename services/tasks/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/tasks/InMemoryTaskQueue.java (98%) rename services/tasks/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/tasks/Task.java (94%) rename services/tasks/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/tasks/TaskCollection.java (96%) rename services/tasks/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/tasks/AbstractTaskQueueTest.java (98%) rename services/tasks/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/tasks/CachingTaskCollectionTest.java (98%) rename services/tasks/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/tasks/FlatFileTaskCollectionTest.java (96%) rename services/tasks/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/services/tasks/InMemoryTaskQueueTest.java (89%) rename testutil/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/kvstore/AbstractKeyValueStorageTest.java (97%) rename testutil/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/testutil/BlockTestUtil.java (98%) rename testutil/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/testutil/JsonTestParameters.java (99%) rename testutil/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/testutil/MockExecutorService.java (99%) rename testutil/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/testutil/TestClock.java (97%) rename testutil/src/main/java/{tech/pegasys => org/hyperledger}/orion/testutil/OrionConfiguration.java (97%) rename testutil/src/main/java/{tech/pegasys => org/hyperledger}/orion/testutil/OrionKeyConfiguration.java (96%) rename testutil/src/main/java/{tech/pegasys => org/hyperledger}/orion/testutil/OrionKeyUtils.java (98%) rename testutil/src/main/java/{tech/pegasys => org/hyperledger}/orion/testutil/OrionTestHarness.java (99%) rename testutil/src/main/java/{tech/pegasys => org/hyperledger}/orion/testutil/OrionTestHarnessFactory.java (97%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/ExceptionUtils.java (96%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/FutureUtils.java (99%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/InvalidConfigurationException.java (95%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/LimitedSet.java (98%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/NetworkUtility.java (98%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/Preconditions.java (96%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/Subscribers.java (99%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/AbstractBytes32Backed.java (95%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/AbstractBytesValue.java (99%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/ArrayWrappingBytes32.java (97%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/ArrayWrappingBytesValue.java (98%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/BaseDelegatingBytesValue.java (98%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/Bytes32.java (97%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/Bytes32Backed.java (94%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/Bytes32s.java (98%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/BytesBacked.java (91%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/BytesValue.java (99%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/BytesValues.java (99%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/DelegatingBytes32.java (96%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/DelegatingBytesValue.java (96%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/MutableArrayWrappingBytes32.java (96%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/MutableArrayWrappingBytesValue.java (98%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/MutableBufferWrappingBytesValue.java (98%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/MutableByteBufWrappingBytesValue.java (98%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/MutableByteBufferWrappingBytesValue.java (98%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/MutableBytes32.java (97%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/MutableBytesValue.java (99%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/WrappingBytes32.java (97%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/number/Fraction.java (98%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/number/Percentage.java (97%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/number/PositiveNumber.java (97%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/uint/AbstractUInt256Value.java (96%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/uint/BaseUInt256Value.java (96%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/uint/Counter.java (94%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/uint/DefaultInt256.java (92%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/uint/DefaultUInt256.java (93%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/uint/Int256.java (91%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/uint/Int256Bytes.java (92%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/uint/UInt256.java (95%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/uint/UInt256Bytes.java (97%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/uint/UInt256Value.java (97%) rename util/src/main/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/uint/UInt256s.java (97%) rename util/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/ExceptionUtilsTest.java (97%) rename util/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/FutureUtilsTest.java (96%) rename util/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/LimitedSetTest.java (95%) rename util/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/NetworkUtilityTest.java (97%) rename util/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/SubscribersTest.java (98%) rename util/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/Bytes32Test.java (97%) rename util/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/Bytes32sSingleLeftShiftTest.java (98%) rename util/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/BytesValueImplementationsTest.java (99%) rename util/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/BytesValueTest.java (97%) rename util/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/bytes/BytesValuesTest.java (92%) rename util/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/number/FractionTest.java (97%) rename util/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/number/PercentageTest.java (97%) rename util/src/test/java/{tech/pegasys/pantheon => org/hyperledger/besu}/util/uint/UInt256BytesTest.java (97%) diff --git a/.github/issue_template.md b/.github/issue_template.md index 09d66e1103..c1bb6a45fc 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -1,10 +1,10 @@ - + - - + + ### Description @@ -25,7 +25,7 @@ As an [Actor], I want [feature] so that [why]. **Frequency:** [What percentage of the time does it occur?] ### Versions (Add all that apply) -* Software version: [`pantheon --version`] +* Software version: [`besu --version`] * Java version: [`java -version`] * OS Name & Version: [`cat /etc/*release`] * Kernel Version: [`uname -a`] diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index bae089ba63..d924d8e4e4 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,5 +1,5 @@ - + ## PR description diff --git a/CHANGELOG.md b/CHANGELOG.md index 46ef10c374..8f62c08b86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,12 @@ ### Java 11 Required from v1.2 -From v1.2, Pantheon requires Java 11. Pantheon on Java 8 is no longer supported. +From v1.2, Besu requires Java 11. Besu on Java 8 is no longer supported. ### Docker Image Migration -In v1.2, we removed the entry-point script from our Docker image. Refer to the [migration guide](https://docs.pantheon.pegasys.tech/en/latest/Deploying-Pantheon/High-Availability/) -for information on options that were previously automatically added to the Pantheon command line. +In v1.2, we removed the entry-point script from our Docker image. Refer to the [migration guide](https://besu.hyperledger.org/en/latest/Deploying-Besu/High-Availability/) +for information on options that were previously automatically added to the Besu command line. ## 1.2.3 @@ -25,7 +25,7 @@ for information on options that were previously automatically added to the Panth - Ignore flaky tracing tests [\#1907](https://github.com/PegaSysEng/pantheon/pull/1907) - Ensure plugin-api module gets published at the correct maven path [\#1905](https://github.com/PegaSysEng/pantheon/pull/1905) - Return the plugin-apis to this repo [\#1900](https://github.com/PegaSysEng/pantheon/pull/1900) -- Stop autogenerating PantheonInfo.java [\#1899](https://github.com/PegaSysEng/pantheon/pull/1899) +- Stop autogenerating BesuInfo.java [\#1899](https://github.com/PegaSysEng/pantheon/pull/1899) - Extracted Metrics interfaces to plugins-api. [\#1898](https://github.com/PegaSysEng/pantheon/pull/1898) - Fix key value storage clear so it removes all values [\#1894](https://github.com/PegaSysEng/pantheon/pull/1894) - Ethsigner test [\#1892](https://github.com/PegaSysEng/pantheon/pull/1892) (thanks to [iikirilov](https://github.com/iikirilov)) @@ -45,7 +45,7 @@ for information on options that were previously automatically added to the Panth - [Improved navigation](https://docs.pantheon.pegasys.tech/en/latest/) - [Added permissioning diagram](https://docs.pantheon.pegasys.tech/en/latest/Concepts/Permissioning/Permissioning-Overview/#onchain) - [Added Responsible Disclosure policy](https://docs.pantheon.pegasys.tech/en/latest/Reference/Responsible-Disclosure/) - - [Added `blocks export` subcommand](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI/Pantheon-CLI-Subcommands/#export) + - [Added `blocks export` subcommand](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI/Besu-CLI-Subcommands/#export) ### Technical Improvements - Update the `pantheon blocks export` command usage [\#1887](https://github.com/PegaSysEng/pantheon/pull/1887) (thanks to [matkt](https://github.com/matkt)) @@ -152,7 +152,7 @@ for information on options that were previously automatically added to the Panth - Added PrivateTransactionValidator to unify logic [#1713](https://github.com/PegaSysEng/pantheon/pull/1713) - Added JSON-RPC API to report validator block production information [#1687](https://github.com/PegaSysEng/pantheon/pull/1687) (thanks to [matkt](https://github.com/matkt)) - Added Mark Sweep Pruner [#1638](https://github.com/PegaSysEng/pantheon/pull/1638) -- Added the Blake2b F compression function as a precompile in Pantheon [#1614](https://github.com/PegaSysEng/pantheon/pull/1614) (thanks to [iikirilov](https://github.com/iikirilov)) +- Added the Blake2b F compression function as a precompile in Besu [#1614](https://github.com/PegaSysEng/pantheon/pull/1614) (thanks to [iikirilov](https://github.com/iikirilov)) - Documentation updates include: - Added CPU requirements [#1734](https://github.com/PegaSysEng/pantheon/pull/1734) - Added reference to Ansible role [#1733](https://github.com/PegaSysEng/pantheon/pull/1733) @@ -188,7 +188,7 @@ for information on options that were previously automatically added to the Panth [#1810](https://github.com/PegaSysEng/pantheon/pull/1810) [#1817](https://github.com/PegaSysEng/pantheon/pull/1817) - Added documentation for getSignerMetrics [#1723](https://github.com/PegaSysEng/pantheon/pull/1723) (thanks to [matkt](https://github.com/matkt)) - - Added Java 11+ as a prerequisite for installing Pantheon using Homebrew. [#1755](https://github.com/PegaSysEng/pantheon/pull/1755) + - Added Java 11+ as a prerequisite for installing Besu using Homebrew. [#1755](https://github.com/PegaSysEng/pantheon/pull/1755) - Fixed documentation formatting and typos [#1718](https://github.com/PegaSysEng/pantheon/pull/1718) [#1742](https://github.com/PegaSysEng/pantheon/pull/1742) [#1763](https://github.com/PegaSysEng/pantheon/pull/1763) @@ -217,28 +217,28 @@ for information on options that were previously automatically added to the Panth - New release docker image [\#1664](https://github.com/PegaSysEng/pantheon/pull/1664) - Support changing log level at runtime [\#1656](https://github.com/PegaSysEng/pantheon/pull/1656) (thanks to [matkt](https://github.com/matkt)) - Implement dump command to dump a specific block from storage [\#1641](https://github.com/PegaSysEng/pantheon/pull/1641) (thanks to [matkt](https://github.com/matkt)) -- Add eea\_findPrivacyGroup endpoint to Pantheon [\#1635](https://github.com/PegaSysEng/pantheon/pull/1635) (thanks to [Puneetha17](https://github.com/Puneetha17)) +- Add eea\_findPrivacyGroup endpoint to Besu [\#1635](https://github.com/PegaSysEng/pantheon/pull/1635) (thanks to [Puneetha17](https://github.com/Puneetha17)) - Updated eea send raw transaction with privacy group ID [\#1611](https://github.com/PegaSysEng/pantheon/pull/1611) (thanks to [iikirilov](https://github.com/iikirilov)) - Added Revert Reason [\#1603](https://github.com/PegaSysEng/pantheon/pull/1603) - Documentation updates include: - - Added [UPnP content](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Pantheon/Networking/Using-UPnP/) - - Added [load balancer image](https://docs.pantheon.pegasys.tech/en/latest/Deploying-Pantheon/High-Availability/) - - Added [revert reason](https://docs.pantheon.pegasys.tech/en/latest/Using-Pantheon/Transactions/Revert-Reason/) - - Added [admin\_changeLogLevel](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-API-Methods/#admin_changeloglevel) JSON RPC API (thanks to [matkt](https://github.com/matkt)) + - Added [UPnP content](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Besu/Networking/Using-UPnP/) + - Added [load balancer image](https://docs.pantheon.pegasys.tech/en/latest/Deploying-Besu/High-Availability/) + - Added [revert reason](https://docs.pantheon.pegasys.tech/en/latest/Using-Besu/Transactions/Revert-Reason/) + - Added [admin\_changeLogLevel](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-API-Methods/#admin_changeloglevel) JSON RPC API (thanks to [matkt](https://github.com/matkt)) - Updated for [new Docker image](https://docs.pantheon.pegasys.tech/en/latest/Getting-Started/Run-Docker-Image/) - - Added [Docker image migration content](https://docs.pantheon.pegasys.tech/en/latest/Deploying-Pantheon/Migration-Docker/) - - Added [transaction validation content](https://docs.pantheon.pegasys.tech/en/latest/Using-Pantheon/Transactions/Transaction-Validation/) + - Added [Docker image migration content](https://docs.pantheon.pegasys.tech/en/latest/Deploying-Besu/Migration-Docker/) + - Added [transaction validation content](https://docs.pantheon.pegasys.tech/en/latest/Using-Besu/Transactions/Transaction-Validation/) - Updated [permissioning overview](https://docs.pantheon.pegasys.tech/en/latest/Permissions/Permissioning-Overview/) for onchain account permissioning - Updated [quickstart](https://docs.pantheon.pegasys.tech/en/latest/Tutorials/Private-Network-Quickstart/#monitoring-nodes-with-prometheus-and-grafana) to include Prometheus and Grafana - - Added [remote connections limits options](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#remote-connections-limit-enabled) + - Added [remote connections limits options](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#remote-connections-limit-enabled) - Updated [web3.js-eea reference](https://docs.pantheon.pegasys.tech/en/latest/Reference/web3js-eea-Methods/) to include privacy group methods - Updated [onchain permissioning to include account permissioning](https://docs.pantheon.pegasys.tech/en/latest/Permissions/Onchain-Permissioning/Onchain-Permissioning/) and [Permissioning Management Dapp](https://docs.pantheon.pegasys.tech/en/latest/Permissions/Onchain-Permissioning/Production/) - Added [deployment procedure for Permissioning Management Dapp](https://docs.pantheon.pegasys.tech/en/latest/Permissions/Onchain-Permissioning/Production/) - - Added privacy content for [EEA-compliant and Pantheon-extended privacy](https://docs.pantheon.pegasys.tech/en/latest/Privacy/Explanation/Privacy-Groups/) + - Added privacy content for [EEA-compliant and Besu-extended privacy](https://docs.pantheon.pegasys.tech/en/latest/Privacy/Explanation/Privacy-Groups/) - Added content on [creating and managing privacy groups](https://docs.pantheon.pegasys.tech/en/latest/Privacy/How-To/Create-Manage-Privacy-Groups/) - Added content on [accessing private and privacy marker transactions](https://docs.pantheon.pegasys.tech/en/latest/Privacy/How-To/Access-Private-Transactions/) - Added content on [system requirements](https://docs.pantheon.pegasys.tech/en/latest/Installation/System-Requirements/) - - Added reference to [Pantheon role on Galaxy to deploy using Ansible](https://docs.pantheon.pegasys.tech/en/latest/Deploying-Pantheon/Ansible/). + - Added reference to [Besu role on Galaxy to deploy using Ansible](https://docs.pantheon.pegasys.tech/en/latest/Deploying-Besu/Ansible/). ### Technical Improvements @@ -280,7 +280,7 @@ for information on options that were previously automatically added to the Panth - Add hooks for validation [\#1671](https://github.com/PegaSysEng/pantheon/pull/1671) - Upgrade to pantheon-build:0.0.6-jdk11 which really does include jdk11 [\#1670](https://github.com/PegaSysEng/pantheon/pull/1670) - Onchain permissioning startup check [\#1669](https://github.com/PegaSysEng/pantheon/pull/1669) -- Update PantheonCommand to accept minTransactionGasPriceWei as an integer [\#1668](https://github.com/PegaSysEng/pantheon/pull/1668) (thanks to [matkt](https://github.com/matkt)) +- Update BesuCommand to accept minTransactionGasPriceWei as an integer [\#1668](https://github.com/PegaSysEng/pantheon/pull/1668) (thanks to [matkt](https://github.com/matkt)) - Privacy group id consistent [\#1667](https://github.com/PegaSysEng/pantheon/pull/1667) (thanks to [iikirilov](https://github.com/iikirilov)) - Change eea\_getPrivateTransaction endpoint to accept hex [\#1666](https://github.com/PegaSysEng/pantheon/pull/1666) (thanks to [Puneetha17](https://github.com/Puneetha17)) - Factorise metrics code for KeyValueStorage database [\#1663](https://github.com/PegaSysEng/pantheon/pull/1663)) @@ -304,14 +304,14 @@ for information on options that were previously automatically added to the Panth ### Additions and Improvements - \[PAN-2832\] Support setting config options via environment variables [\#1597](https://github.com/PegaSysEng/pantheon/pull/1597) -- Print Pantheon version when starting [\#1593](https://github.com/PegaSysEng/pantheon/pull/1593) +- Print Besu version when starting [\#1593](https://github.com/PegaSysEng/pantheon/pull/1593) - \[PAN-2746\] Add eea\_createPrivacyGroup & eea\_deletePrivacyGroup endpoint [\#1560](https://github.com/PegaSysEng/pantheon/pull/1560) (thanks to [Puneetha17](https://github.com/Puneetha17)) Documentation updates include: -- Added [readiness and liveness endpoints](https://docs.pantheon.pegasys.tech/en/latest/Pantheon-API/Using-JSON-RPC-API/#readiness-and-liveness-endpoints) -- Added [high availability content](https://docs.pantheon.pegasys.tech/en/latest/Deploying-Pantheon/High-Availability/) +- Added [readiness and liveness endpoints](https://docs.pantheon.pegasys.tech/en/latest/Besu-API/Using-JSON-RPC-API/#readiness-and-liveness-endpoints) +- Added [high availability content](https://docs.pantheon.pegasys.tech/en/latest/Deploying-Besu/High-Availability/) - Added [web3js-eea client library](https://docs.pantheon.pegasys.tech/en/latest/Privacy/Private-Transactions/eeajs/) -- Added content on [setting CLI options using environment variables](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#specifying-options) +- Added content on [setting CLI options using environment variables](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#specifying-options) ### Technical Improvements @@ -323,7 +323,7 @@ Documentation updates include: - Refactor experimental CLI options [\#1629](https://github.com/PegaSysEng/pantheon/pull/1629) - JSON-RPC api net_services should display the actual ports [\#1628](https://github.com/PegaSysEng/pantheon/pull/1628) - Refactor CLI [\#1627](https://github.com/PegaSysEng/pantheon/pull/1627) -- Simplify PantheonCommand `run` and `parse` methods. [\#1626](https://github.com/PegaSysEng/pantheon/pull/1626) +- Simplify BesuCommand `run` and `parse` methods. [\#1626](https://github.com/PegaSysEng/pantheon/pull/1626) - PAN-2860: Ignore discport during startup whitelist validation [\#1625](https://github.com/PegaSysEng/pantheon/pull/1625) - Freeze plugin api version [\#1624](https://github.com/PegaSysEng/pantheon/pull/1624) - Implement incoming transaction messages CLI option as an unstable command. [\#1622](https://github.com/PegaSysEng/pantheon/pull/1622) @@ -353,7 +353,7 @@ Documentation updates include: ### Additions and Improvements -- \[PAN-2811\] Be more lenient with discovery message deserialization. Completes our support for EIP-8 and enables Pantheon to work on Rinkeby again. [\#1580](https://github.com/PegaSysEng/pantheon/pull/1580) +- \[PAN-2811\] Be more lenient with discovery message deserialization. Completes our support for EIP-8 and enables Besu to work on Rinkeby again. [\#1580](https://github.com/PegaSysEng/pantheon/pull/1580) - Added liveness and readiness probe stub endpoints [\#1553](https://github.com/PegaSysEng/pantheon/pull/1553) - Implemented operator tool. \(blockchain network configuration for permissioned networks\) [\#1511](https://github.com/PegaSysEng/pantheon/pull/1511) - \[PAN-2754\] Added eea\_getPrivacyPrecompileAddress [\#1579](https://github.com/PegaSysEng/pantheon/pull/1579) (thanks to [Puneetha17](https://github.com/Puneetha17)) @@ -364,18 +364,18 @@ Documentation updates include: Documentation updates include: - Updated [IBFT 2.0 tutorial](https://docs.pantheon.pegasys.tech/en/latest/Tutorials/Create-IBFT-Network/) to use network configuration tool -- Added [debug\_traceBlock\* methods](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-API-Methods/#debug_traceblock) +- Added [debug\_traceBlock\* methods](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-API-Methods/#debug_traceblock) - Reorganised [monitoring documentation](https://docs.pantheon.pegasys.tech/en/latest/Monitoring/Monitoring-Performance/) - Added [link to sample Grafana dashboard](https://docs.pantheon.pegasys.tech/en/latest/Monitoring/Monitoring-Performance/#monitor-node-performance-using-prometheus) -- Added [note about replacing transactions in transaction pool](https://docs.pantheon.pegasys.tech/en/latest/Using-Pantheon/Transactions/Transaction-Pool/#replacing-transactions-with-same-nonce) -- Updated [example transaction scripts](https://docs.pantheon.pegasys.tech/en/latest/Using-Pantheon/Transactions/Transactions/#example-javascript-scripts) +- Added [note about replacing transactions in transaction pool](https://docs.pantheon.pegasys.tech/en/latest/Using-Besu/Transactions/Transaction-Pool/#replacing-transactions-with-same-nonce) +- Updated [example transaction scripts](https://docs.pantheon.pegasys.tech/en/latest/Using-Besu/Transactions/Transactions/#example-javascript-scripts) - Updated [Alethio Ethstats and Explorer documentation](https://docs.pantheon.pegasys.tech/en/latest/Monitoring/Alethio/Overview/) ### Technical Improvements - PAN-2816: Hiding experimental account permissioning cli options [\#1584](https://github.com/PegaSysEng/pantheon/pull/1584) - \[PAN-2630\] Synchronizer should disconnect the sync target peer on invalid block data [\#1578](https://github.com/PegaSysEng/pantheon/pull/1578) -- Rename MetricCategory to PantheonMetricCategory [\#1574](https://github.com/PegaSysEng/pantheon/pull/1574) +- Rename MetricCategory to BesuMetricCategory [\#1574](https://github.com/PegaSysEng/pantheon/pull/1574) - Convert MetricsConfigiguration to use a builder [\#1572](https://github.com/PegaSysEng/pantheon/pull/1572) - PAN-2794: Including flag for onchain permissioning check on tx processor [\#1571](https://github.com/PegaSysEng/pantheon/pull/1571) - Fix behaviour for absent account permissiong smart contract [\#1569](https://github.com/PegaSysEng/pantheon/pull/1569) @@ -408,11 +408,11 @@ Documentation updates include: Documentation updates include: -- Added [GraphQL options](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#graphql-http-cors-origins) +- Added [GraphQL options](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#graphql-http-cors-origins) - Added [troubleshooting point about illegal reflective access error](https://docs.pantheon.pegasys.tech/en/latest/Troubleshooting/Troubleshooting/#illegal-reflective-access-error-on-startup) - Added [trusted bootnode behaviour for permissioning](https://docs.pantheon.pegasys.tech/en/latest/Permissions/Onchain-Permissioning/#bootnodes) -- Added [how to obtain a WS authentication token](https://docs.pantheon.pegasys.tech/en/latest/Pantheon-API/Authentication/#obtaining-an-authentication-token) -- Updated [example scripts and added package.json file for creating signed transactions](https://docs.pantheon.pegasys.tech/en/stable/Using-Pantheon/Transactions/Transactions/) +- Added [how to obtain a WS authentication token](https://docs.pantheon.pegasys.tech/en/latest/Besu-API/Authentication/#obtaining-an-authentication-token) +- Updated [example scripts and added package.json file for creating signed transactions](https://docs.pantheon.pegasys.tech/en/stable/Using-Besu/Transactions/Transactions/) ### Technical Improvements @@ -458,13 +458,13 @@ Documentation updates include: ### Additions and Improvements -- [GraphQL](https://docs.pantheon.pegasys.tech/en/latest/Pantheon-API/GraphQL/) [\#1311](https://github.com/PegaSysEng/pantheon/pull/1311) (thanks to [zyfrank](https://github.com/zyfrank)) -- Added [`--tx-pool-retention-hours`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#tx-pool-retention-hours) [\#1333](https://github.com/PegaSysEng/pantheon/pull/1333) +- [GraphQL](https://docs.pantheon.pegasys.tech/en/latest/Besu-API/GraphQL/) [\#1311](https://github.com/PegaSysEng/pantheon/pull/1311) (thanks to [zyfrank](https://github.com/zyfrank)) +- Added [`--tx-pool-retention-hours`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#tx-pool-retention-hours) [\#1333](https://github.com/PegaSysEng/pantheon/pull/1333) - Added Genesis file support for specifying the maximum stack size. [\#1431](https://github.com/PegaSysEng/pantheon/pull/1431) - Included transaction details when subscribed to Pending transactions [\#1410](https://github.com/PegaSysEng/pantheon/pull/1410) - Documentation updates include: - - [Added configuration items specified in the genesis file](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Pantheon/Config-Items/) - - [Added pending transaction details subscription](https://docs.pantheon.pegasys.tech/en/latest/Pantheon-API/RPC-PubSub/#pending-transactions) + - [Added configuration items specified in the genesis file](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Besu/Config-Items/) + - [Added pending transaction details subscription](https://docs.pantheon.pegasys.tech/en/latest/Besu-API/RPC-PubSub/#pending-transactions) - [Added Troubleshooting content](https://docs.pantheon.pegasys.tech/en/latest/Troubleshooting/Troubleshooting/) - [Added Privacy Quickstart](https://docs.pantheon.pegasys.tech/en/latest/Privacy/Privacy-Quickstart/) - [Added privacy roadmap](https://github.com/PegaSysEng/pantheon/blob/master/PRIVACYROADMAP.MD) @@ -474,7 +474,7 @@ Documentation updates include: - Create MaintainedPeers class [\#1484](https://github.com/PegaSysEng/pantheon/pull/1484) - Fix for permissioned network with single bootnode [\#1479](https://github.com/PegaSysEng/pantheon/pull/1479) -- Have ThreadPantheonNodeRunner support plugin tests [\#1477](https://github.com/PegaSysEng/pantheon/pull/1477) +- Have ThreadBesuNodeRunner support plugin tests [\#1477](https://github.com/PegaSysEng/pantheon/pull/1477) - Less pointless plugins errors [\#1473](https://github.com/PegaSysEng/pantheon/pull/1473) - Rename GraphQLRPC to just GraphQL [\#1472](https://github.com/PegaSysEng/pantheon/pull/1472) - eth\_protocolVersion is a Quantity, not an Integer [\#1470](https://github.com/PegaSysEng/pantheon/pull/1470) @@ -487,10 +487,10 @@ Documentation updates include: - Optimise TransactionPool.addRemoteTransaction [\#1448](https://github.com/PegaSysEng/pantheon/pull/1448) - Reduce synchronization in PendingTransactions [\#1447](https://github.com/PegaSysEng/pantheon/pull/1447) - Add simple PeerPermissions interface [\#1446](https://github.com/PegaSysEng/pantheon/pull/1446) -- Make sure ThreadPantheonNodeRunner is exercised by automation [\#1442](https://github.com/PegaSysEng/pantheon/pull/1442) +- Make sure ThreadBesuNodeRunner is exercised by automation [\#1442](https://github.com/PegaSysEng/pantheon/pull/1442) - Decode devp2p packets off the event thread [\#1439](https://github.com/PegaSysEng/pantheon/pull/1439) - Allow config files to specify no bootnodes [\#1438](https://github.com/PegaSysEng/pantheon/pull/1438) -- Capture all logs and errors in the Pantheon log output [\#1437](https://github.com/PegaSysEng/pantheon/pull/1437) +- Capture all logs and errors in the Besu log output [\#1437](https://github.com/PegaSysEng/pantheon/pull/1437) - Ensure failed Txns are deleted when detected during mining [\#1436](https://github.com/PegaSysEng/pantheon/pull/1436) - Plugin Framework [\#1435](https://github.com/PegaSysEng/pantheon/pull/1435) - Equals cleanup [\#1434](https://github.com/PegaSysEng/pantheon/pull/1434) @@ -563,7 +563,7 @@ Documentation updates include: - Missing p2p info when queried live [\#1310](https://github.com/PegaSysEng/pantheon/pull/1310) - Tx limit size send peers follow up [\#1308](https://github.com/PegaSysEng/pantheon/pull/1308) - Remove remnants of the old dev mode [\#1307](https://github.com/PegaSysEng/pantheon/pull/1307) -- Remove duplicate init code from PantheonController instances [\#1305](https://github.com/PegaSysEng/pantheon/pull/1305) +- Remove duplicate init code from BesuController instances [\#1305](https://github.com/PegaSysEng/pantheon/pull/1305) - Stop synchronizer prior to stopping the network [\#1302](https://github.com/PegaSysEng/pantheon/pull/1302) - Evict old transactions [\#1299](https://github.com/PegaSysEng/pantheon/pull/1299) - Send local transactions to new peers [\#1253](https://github.com/PegaSysEng/pantheon/pull/1253) @@ -574,13 +574,13 @@ Documentation updates include: - [Privacy](https://docs.pantheon.pegasys.tech/en/latest/Privacy/Privacy-Overview/) - [Onchain Permissioning](https://docs.pantheon.pegasys.tech/en/latest/Permissions/Onchain-Permissioning/) -- [Fastsync](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#fast-sync-options) +- [Fastsync](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#fast-sync-options) - Documentation updates include: - Added JSON-RPC methods: - [`txpool_pantheonStatistics`](https://docs.pantheon.pegasys.tech/en/latest/Reference/JSON-RPC-API-Methods/#txpool_pantheonstatistics) - [`net_services`](https://docs.pantheon.pegasys.tech/en/latest/Reference/JSON-RPC-API-Methods/#net_services) - [Updated to indicate Docker image doesn't run on Windows](https://docs.pantheon.pegasys.tech/en/latest/Getting-Started/Run-Docker-Image/) - - [Added how to configure a free gas network](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Pantheon/FreeGas/) + - [Added how to configure a free gas network](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Besu/FreeGas/) ### Technical Improvements @@ -636,21 +636,21 @@ Documentation updates include: - Notify of dropped messages [\#1156](https://github.com/PegaSysEng/pantheon/pull/1156) - Documentation updates include: - Added [Permissioning Overview](https://docs.pantheon.pegasys.tech/en/latest/Permissions/Permissioning-Overview/) - - Added content on [Network vs Node Configuration](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Pantheon/Using-Configuration-File/) + - Added content on [Network vs Node Configuration](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Besu/Using-Configuration-File/) - Updated [RAM requirements](https://docs.pantheon.pegasys.tech/en/latest/Installation/Overview/) - Added [Privacy Overview](https://docs.pantheon.pegasys.tech/en/latest/Privacy/Privacy-Overview/) and [Processing Private Transactions](https://docs.pantheon.pegasys.tech/en/latest/Privacy/Private-Transaction-Processing/) - Renaming of Ethstats Lite Explorer to [Ethereum Lite Explorer](https://docs.pantheon.pegasys.tech/en/latest/EthStats/Lite-Block-Explorer/) (thanks to [tzapu](https://github.com/tzapu)) - - Added content on using [Truffle with Pantheon](https://docs.pantheon.pegasys.tech/en/latest/Using-Pantheon/Truffle/) - - Added [`droppedPendingTransactions` RPC Pub/Sub subscription](https://docs.pantheon.pegasys.tech/en/latest/Using-Pantheon/RPC-PubSub/#dropped-transactions) + - Added content on using [Truffle with Besu](https://docs.pantheon.pegasys.tech/en/latest/Using-Besu/Truffle/) + - Added [`droppedPendingTransactions` RPC Pub/Sub subscription](https://docs.pantheon.pegasys.tech/en/latest/Using-Besu/RPC-PubSub/#dropped-transactions) - Added [`eea_*` JSON-RPC API methods](https://docs.pantheon.pegasys.tech/en/latest/Reference/JSON-RPC-API-Methods/#eea-methods) - Added [architecture diagram](https://docs.pantheon.pegasys.tech/en/latest/Architecture/Overview/) - - Updated [permissioning CLI options](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#permissions-accounts-config-file-enabled) and [permissioned network tutorial](https://docs.pantheon.pegasys.tech/en/latest/Tutorials/Create-Permissioned-Network/) + - Updated [permissioning CLI options](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#permissions-accounts-config-file-enabled) and [permissioned network tutorial](https://docs.pantheon.pegasys.tech/en/latest/Tutorials/Create-Permissioned-Network/) ### Technical Improvements - Choose sync target based on td rather than height [\#1256](https://github.com/PegaSysEng/pantheon/pull/1256) - CLI ewp options [\#1246](https://github.com/PegaSysEng/pantheon/pull/1246) -- Update PantheonCommand.java [\#1245](https://github.com/PegaSysEng/pantheon/pull/1245) +- Update BesuCommand.java [\#1245](https://github.com/PegaSysEng/pantheon/pull/1245) - Reduce memory usage in import [\#1239](https://github.com/PegaSysEng/pantheon/pull/1239) - Improve eea_sendRawTransaction error messages [\#1238](https://github.com/PegaSysEng/pantheon/pull/1238) (thanks to [Puneetha17](https://github.com/Puneetha17)) - Single topic filter [\#1235](https://github.com/PegaSysEng/pantheon/pull/1235) @@ -705,17 +705,17 @@ Documentation updates include: - Added [`admin_removePeer`](https://docs.pantheon.pegasys.tech/en/latest/Reference/JSON-RPC-API-Methods/#admin_removepeer) - Updated [tutorials](https://docs.pantheon.pegasys.tech/en/latest/Tutorials/Create-Private-Clique-Network/) for printing of enode on startup - Added [`txpool_pantheonTransactions`](https://docs.pantheon.pegasys.tech/en/latest/Reference/JSON-RPC-API-Methods/#txpool_pantheontransactions) - - Added [Transaction Pool content](https://docs.pantheon.pegasys.tech/en/latest/Using-Pantheon/Transactions/Transaction-Pool/) - - Added [`tx-pool-max-size` CLI option](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#tx-pool-max-size) + - Added [Transaction Pool content](https://docs.pantheon.pegasys.tech/en/latest/Using-Besu/Transactions/Transaction-Pool/) + - Added [`tx-pool-max-size` CLI option](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#tx-pool-max-size) - Updated [developer build instructions to use installDist](https://github.com/PegaSysEng/pantheon/blob/master/docs/development/running-developer-builds.md) - Added [Azure quickstart tutorial](https://docs.pantheon.pegasys.tech/en/latest/Tutorials/Azure/Azure-Private-Network-Quickstart/) - Enabled copy button in code blocks - Added [IBFT 1.0](https://docs.pantheon.pegasys.tech/en/latest/Consensus-Protocols/QuorumIBFT/) - - Added section on using [Geth attach with Pantheon](https://docs.pantheon.pegasys.tech/en/latest/JSON-RPC-API/Using-JSON-RPC-API/#geth-console) + - Added section on using [Geth attach with Besu](https://docs.pantheon.pegasys.tech/en/latest/JSON-RPC-API/Using-JSON-RPC-API/#geth-console) - Enabled the edit link doc site to ease external doc contributions - Added [EthStats docs](https://docs.pantheon.pegasys.tech/en/latest/EthStats/Overview/) (thanks to [baxy](https://github.com/baxy)) - Updated [Postman collection](https://docs.pantheon.pegasys.tech/en/latest/JSON-RPC-API/Using-JSON-RPC-API/#postman) - - Added [`metrics-category` CLI option](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#metrics-category) + - Added [`metrics-category` CLI option](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#metrics-category) - Added information on [block time and timeout settings](https://docs.pantheon.pegasys.tech/en/latest/Consensus-Protocols/IBFT/#block-time) for IBFT 2.0 - Added [`admin_nodeInfo`](https://docs.pantheon.pegasys.tech/en/latest/Reference/JSON-RPC-API-Methods/#admin_nodeinfo) - Added [permissions images](https://docs.pantheon.pegasys.tech/en/latest/Permissions/Permissioning/) @@ -761,9 +761,9 @@ Documentation updates include: - Updated local config permissioning flags [\#1118](https://github.com/PegaSysEng/pantheon/pull/1118) - Pipeline Improvements [\#1117](https://github.com/PegaSysEng/pantheon/pull/1117) - Permissioning cli smart contract [\#1116](https://github.com/PegaSysEng/pantheon/pull/1116) -- Adding default pending transactions value in PantheonControllerBuilder [\#1114](https://github.com/PegaSysEng/pantheon/pull/1114) +- Adding default pending transactions value in BesuControllerBuilder [\#1114](https://github.com/PegaSysEng/pantheon/pull/1114) - Fix intermittency in WorldStateDownloaderTest [\#1113](https://github.com/PegaSysEng/pantheon/pull/1113) -- Reduce number of seen blocks and transactions Pantheon tracks [\#1112](https://github.com/PegaSysEng/pantheon/pull/1112) +- Reduce number of seen blocks and transactions Besu tracks [\#1112](https://github.com/PegaSysEng/pantheon/pull/1112) - Timeout long test [\#1111](https://github.com/PegaSysEng/pantheon/pull/1111) - Errorprone 2.3.3 upgrades [\#1110](https://github.com/PegaSysEng/pantheon/pull/1110) - Add metric to capture memory used by RocksDB table readers [\#1108](https://github.com/PegaSysEng/pantheon/pull/1108) @@ -868,7 +868,7 @@ Public key address export subcommand was missing in 1.0 release. ### Additions and Improvements - Added `public-key export-address` subcommand [\#888](https://github.com/PegaSysEng/pantheon/pull/888) -- Documentation update for the [`public-key export-address`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#public-key) subcommand. +- Documentation update for the [`public-key export-address`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#public-key) subcommand. - Updated [IBFT 2.0 overview](https://docs.pantheon.pegasys.tech/en/latest/Consensus-Protocols/IBFT/) to include use of `rlp encode` command and information on setting IBFT 2.0 properties to achieve your desired block time. ## 1.0 @@ -882,8 +882,8 @@ Public key address export subcommand was missing in 1.0 release. - Added rebind mitigation for Websockets. [\#905](https://github.com/PegaSysEng/pantheon/pull/905) - Support genesis contract code [\#749](https://github.com/PegaSysEng/pantheon/pull/749) (thanks to [kziemianek](https://github.com/kziemianek)). Fixes issue [\#662](https://github.com/PegaSysEng/pantheon/issues/662). - Documentation updates include: - - Added details on [port configuration](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Pantheon/Networking/#port-configuration) - - Added [Resources page](https://docs.pantheon.pegasys.tech/en/latest/Resources/Resources/) linking to Pantheon blog posts and webinars + - Added details on [port configuration](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Besu/Networking/#port-configuration) + - Added [Resources page](https://docs.pantheon.pegasys.tech/en/latest/Resources/Resources/) linking to Besu blog posts and webinars - Added [JSON-RPC Authentication](https://docs.pantheon.pegasys.tech/en/latest/JSON-RPC-API/Authentication/) - Added [tutorial to create permissioned network](https://docs.pantheon.pegasys.tech/en/latest/Tutorials/Create-Permissioned-Network/) - Added [Permissioning](https://docs.pantheon.pegasys.tech/en/latest/Permissions/Permissioning/) content @@ -899,7 +899,7 @@ Public key address export subcommand was missing in 1.0 release. - Disable picocli ansi when testing [\#975](https://github.com/PegaSysEng/pantheon/pull/975) - Create peer discovery packets on a worker thread [\#961](https://github.com/PegaSysEng/pantheon/pull/961) - Removed Orion snapshot dependency [\#933](https://github.com/PegaSysEng/pantheon/pull/933) -- Use network ID instead of chain ID in MainnetPantheonController. [\#929](https://github.com/PegaSysEng/pantheon/pull/929) +- Use network ID instead of chain ID in MainnetBesuController. [\#929](https://github.com/PegaSysEng/pantheon/pull/929) - Propagate new block messages to other clients in a worker thread [\#928](https://github.com/PegaSysEng/pantheon/pull/928) - Parallel downloader should stop on puts if requested. [\#927](https://github.com/PegaSysEng/pantheon/pull/927) - Permission config file location and option under docker [\#925](https://github.com/PegaSysEng/pantheon/pull/925) @@ -1055,37 +1055,37 @@ Built and compatible with with JDK8. Breaking changes have been made to the command line options in v0.9 to improve usability. Many v0.8 command line options no longer work. -The [documentation](https://docs.pantheon.pegasys.tech/en/latest/) has been updated throughout to use the changed command line options and the [command line reference](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/) documents the changed options. +The [documentation](https://docs.pantheon.pegasys.tech/en/latest/) has been updated throughout to use the changed command line options and the [command line reference](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/) documents the changed options. | Previous Option | New Option | Change | |-------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------| -| `--config` | [`--config-file`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#config-file) | Renamed | -| `--datadir` | [`--data-path`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#data-path) | Renamed | -| `--dev-mode` | [`--network=dev`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#network) | Replaced by `--network` option | -| `--genesis` | [`--genesis-file`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#genesis-file) | Renamed | -| `--goerli` | [`--network=goerli`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#network) | Replaced by `--network` option | -| `--metrics-listen=` | [`--metrics-host=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#metrics-host) and [`--metrics-port=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#metrics-port) | Split into host and port options | -| `--miner-extraData` | [`--miner-extra-data`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#miner-extra-data) | Renamed | -| `--miner-minTransactionGasPriceWei` | [`--min-gas-price`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#min-gas-price) | Renamed | -| `--no-discovery` | [`--discovery-enabled`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#discovery-enabled) | Replaced | -| `--node-private-key` | [`--node-private-key-file`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#node-private-key-file) | Renamed | +| `--config` | [`--config-file`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#config-file) | Renamed | +| `--datadir` | [`--data-path`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#data-path) | Renamed | +| `--dev-mode` | [`--network=dev`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#network) | Replaced by `--network` option | +| `--genesis` | [`--genesis-file`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#genesis-file) | Renamed | +| `--goerli` | [`--network=goerli`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#network) | Replaced by `--network` option | +| `--metrics-listen=` | [`--metrics-host=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#metrics-host) and [`--metrics-port=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#metrics-port) | Split into host and port options | +| `--miner-extraData` | [`--miner-extra-data`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#miner-extra-data) | Renamed | +| `--miner-minTransactionGasPriceWei` | [`--min-gas-price`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#min-gas-price) | Renamed | +| `--no-discovery` | [`--discovery-enabled`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#discovery-enabled) | Replaced | +| `--node-private-key` | [`--node-private-key-file`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#node-private-key-file) | Renamed | | `--ottoman` | N/A | Removed | -| `--p2p-listen=` | [`--p2p-host=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#p2p-host) and [`--p2p-port=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#p2p-port) | Split into host and port options | -| `--rinkeby` | [`--network=rinkeby`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#network) | Replaced by `--network` option | -| `--ropsten` | [`--network=ropsten`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#network) | Replaced by `--network` option | -| `--rpc-enabled` | [` --rpc-http-enabled`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#rpc-http-enabled)| Renamed| -| `--rpc-listen=` | [`--rpc-http-host=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#rpc-http-host) and [`--rpc-http-port=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#rpc-http-port) | Split into host and port options | -| `--rpc-api` | [`--rpc-http-api`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#rpc-http-api)| Renamed | -| `--rpc-cors-origins` | [`--rpc-http-cors-origins`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#rpc-http-cors-origins) | Renamed | -| `--ws-enabled` | [`--rpc-ws-enabled`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#rpc-ws-enabled) | Renamed | -| `--ws-api` | [`--rpc-ws-api`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#rpc-ws-api) | Renamed| -| `--ws-listen=` | [`--rpc-ws-host=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#rpc-ws-host) and [`--rpc-ws-port=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#rpc-ws-port) | Split into host and port options | -| `--ws-refresh-delay` | [`--rpc-ws-refresh-delay`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#rpc-ws-refresh-delay)|Renamed| +| `--p2p-listen=` | [`--p2p-host=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#p2p-host) and [`--p2p-port=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#p2p-port) | Split into host and port options | +| `--rinkeby` | [`--network=rinkeby`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#network) | Replaced by `--network` option | +| `--ropsten` | [`--network=ropsten`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#network) | Replaced by `--network` option | +| `--rpc-enabled` | [` --rpc-http-enabled`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#rpc-http-enabled)| Renamed| +| `--rpc-listen=` | [`--rpc-http-host=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#rpc-http-host) and [`--rpc-http-port=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#rpc-http-port) | Split into host and port options | +| `--rpc-api` | [`--rpc-http-api`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#rpc-http-api)| Renamed | +| `--rpc-cors-origins` | [`--rpc-http-cors-origins`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#rpc-http-cors-origins) | Renamed | +| `--ws-enabled` | [`--rpc-ws-enabled`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#rpc-ws-enabled) | Renamed | +| `--ws-api` | [`--rpc-ws-api`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#rpc-ws-api) | Renamed| +| `--ws-listen=` | [`--rpc-ws-host=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#rpc-ws-host) and [`--rpc-ws-port=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#rpc-ws-port) | Split into host and port options | +| `--ws-refresh-delay` | [`--rpc-ws-refresh-delay`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#rpc-ws-refresh-delay)|Renamed| | Previous Subcommand | New Subcommand | Change | |-------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------| -| `pantheon import ` | [`pantheon blocks import --from=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#blocks) | Renamed | -| `pantheon export-pub-key `| [`pantheon public-key export --to=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Pantheon-CLI-Syntax/#public-key) | Renamed | +| `pantheon import ` | [`pantheon blocks import --from=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#blocks) | Renamed | +| `pantheon export-pub-key `| [`pantheon public-key export --to=`](https://docs.pantheon.pegasys.tech/en/latest/Reference/Besu-CLI-Syntax/#public-key) | Renamed | ### Private Network Quickstart @@ -1115,8 +1115,8 @@ has been updated to use the moved quickstart. to use quickstart in `pantheon-quickstart` repository and indicate that the quickstart is not supported on Windows. - Added IBFT 2.0 [content](https://docs.pantheon.pegasys.tech/en/latest/Consensus-Protocols/IBFT/) and [JSON RPC API methods](https://docs.pantheon.pegasys.tech/en/latest/Reference/JSON-RPC-API-Methods/#ibft-20-methods). - Added [consensus protocols content](https://docs.pantheon.pegasys.tech/en/latest/Consensus-Protocols/Comparing-PoA/). - - Added content on [events and logs](https://docs.pantheon.pegasys.tech/en/latest/Using-Pantheon/Events-and-Logs/), and [using filters](https://docs.pantheon.pegasys.tech/en/latest/Using-Pantheon/Accessing-Logs-Using-JSON-RPC/). - - Added content on integrating with [Prometheus Push Gateway](https://docs.pantheon.pegasys.tech/en/latest/Using-Pantheon/Debugging/#running-prometheus-with-pantheon-in-push-mode) + - Added content on [events and logs](https://docs.pantheon.pegasys.tech/en/latest/Using-Besu/Events-and-Logs/), and [using filters](https://docs.pantheon.pegasys.tech/en/latest/Using-Besu/Accessing-Logs-Using-JSON-RPC/). + - Added content on integrating with [Prometheus Push Gateway](https://docs.pantheon.pegasys.tech/en/latest/Using-Besu/Debugging/#running-prometheus-with-pantheon-in-push-mode) ### Technical Improvements @@ -1142,7 +1142,7 @@ has been updated to use the moved quickstart. - Enabled command line configuration for privacy precompiled contract address [\#653](https://github.com/PegaSysEng/pantheon/pull/653) (thanks to [Puneetha17](https://github.com/Puneetha17)) - IBFT transmitted packets are logged by gossiper [\#652](https://github.com/PegaSysEng/pantheon/pull/652) - `admin_addPeer` acceptance test [\#651](https://github.com/PegaSysEng/pantheon/pull/651) -- Added `p2pEnabled` configuration to `ProcessPantheonNodeRunner` [\#649](https://github.com/PegaSysEng/pantheon/pull/649) +- Added `p2pEnabled` configuration to `ProcessBesuNodeRunner` [\#649](https://github.com/PegaSysEng/pantheon/pull/649) - Added description to automatic benchmarks [\#646](https://github.com/PegaSysEng/pantheon/pull/646) - Added `network` option [\#645](https://github.com/PegaSysEng/pantheon/pull/645) - Remove OrionConfiguration [\#644](https://github.com/PegaSysEng/pantheon/pull/644) (thanks to [Puneetha17](https://github.com/Puneetha17)) @@ -1210,15 +1210,15 @@ To recover the node key and data directory from the Docker container: `docker cp :/opt/pantheon/key ` `docker cp :/opt/pantheon/database ` -Where `container` is the name or ID of the Docker container containing the Pantheon node. +Where `container` is the name or ID of the Docker container containing the Besu node. The container can be running or stopped when you copy the key and data directory. If your node was fully synchronized to MainNet, the data directory will be ~2TB. When restarting your node with the v0.8.4 Docker image: -* Save the node key in the [`key` file](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Pantheon/Node-Keys/#node-private-key) in the data - directory or specify the location using the [`--node-private-key` option](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Pantheon/Node-Keys/#specifying-a-custom-node-private-key-file). +* Save the node key in the [`key` file](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Besu/Node-Keys/#node-private-key) in the data + directory or specify the location using the [`--node-private-key` option](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Besu/Node-Keys/#specifying-a-custom-node-private-key-file). * Specify the ` **Note:** Although not every pattern shown in this style guide is currently followed in Pantheon, it is our intention to revise and build new functionality with these guidelines in mind. +> **Note:** Although not every pattern shown in this style guide is currently followed in Besu, it is our intention to revise and build new functionality with these guidelines in mind. **The primary audience for this document is:** -* Members of the Pantheon team +* Members of the Besu team * Developers contributing pull requests ## Mission Statement -The Pantheon CLI should create a consistent and easy to understand experience for end users. We're focused on creating a great developer experience for both new and expert users of Ethereum clients. +The Besu CLI should create a consistent and easy to understand experience for end users. We're focused on creating a great developer experience for both new and expert users of Ethereum clients. ## General Guidelines -There are four guiding principles for the Pantheon CLI to help us create a good developer experience for both new and expert users: **_(1) be consistent, (2) keep it simple, (3) be proactive, and (4) be informative (to people and machines)._** +There are four guiding principles for the Besu CLI to help us create a good developer experience for both new and expert users: **_(1) be consistent, (2) keep it simple, (3) be proactive, and (4) be informative (to people and machines)._** This section outlines what each of these principles mean and the following sections explain how these principles should be applied in specific scenarios. ### 1. Be Consistent -Consistency is important to help our end users build a mental model of how Pantheon works. By being consistent with our word choices, visual formatting, and style of communication it helps users know what to expect as they interact with Pantheon. +Consistency is important to help our end users build a mental model of how Besu works. By being consistent with our word choices, visual formatting, and style of communication it helps users know what to expect as they interact with Besu. ### 2. Keep it Simple Avoid technical jargon and always assume our end users may have questions. This doesn't mean answering all of those questions in the CLI, but it does mean explaining things in a simple way and when complexity inevitably rises, directing our users to documentation that will help them. @@ -31,7 +31,7 @@ Avoid technical jargon and always assume our end users may have questions. This Being proactive means anticipating user needs and guiding them through a process. This most often takes the form of solution-oriented warning/error messages. Put yourself in the user's shoes and consider what questions you would have every time we are showing feedback or status to them. ### 4. Be Informative (to people and machines) -We seek a balance between providing enough relevant information to help our users develop a solid mental model of how Pantheon works without forcing them to read too much text. In addition, it is important we consider not only the end user of the CLI but to be consistent with formatting and feedback so information is easily interpreted by machines. +We seek a balance between providing enough relevant information to help our users develop a solid mental model of how Besu works without forcing them to read too much text. In addition, it is important we consider not only the end user of the CLI but to be consistent with formatting and feedback so information is easily interpreted by machines. ## User Input & Actions @@ -47,9 +47,9 @@ A subcommand is an action that can be taken on a single object (i.e. import, exp **Examples:** -`pantheon blocks import` +`besu blocks import` -`pantheon public-key export` +`besu public-key export` Although noun-verb formatting seems backwards from a speaking perspective (i.e. blocks import vs. import blocks) it allows us to organize commands the same way users think about completing an action (the topic first, then the action). @@ -58,9 +58,9 @@ Although noun-verb formatting seems backwards from a speaking perspective (i.e. Using required options instead of arguments helps users have a clear understanding of the impact of an action. Inputs are most often verbs (from, to, etc.). Other options avoid the use of verbs to help make this distinction. -**Example:** `pantheon blocks import --from=` +**Example:** `besu blocks import --from=` -Requiring the `--from` option makes it clear where you are importing from. In the case of a single parameter (as shown in the example above) we should also accept this as an argument (`pantheon blocks import `). Although we accept this formatting, it is not encouraged and should be excluded from our documentation. +Requiring the `--from` option makes it clear where you are importing from. In the case of a single parameter (as shown in the example above) we should also accept this as an argument (`besu blocks import `). Although we accept this formatting, it is not encouraged and should be excluded from our documentation. ### Flags @@ -101,7 +101,7 @@ Options are used for settings, like specifying a configuration file or to provid ### General Naming Guidelines -Words matter. Most users will not be interacting with Pantheon on a regular basis so we should name things for ease of understanding. +Words matter. Most users will not be interacting with Besu on a regular basis so we should name things for ease of understanding. * Don't use abbreviations unless they are widely understood. Optimize for understanding, not number of characters. diff --git a/CODING-CONVENTIONS.md b/CODING-CONVENTIONS.md index 5f1ddb5a31..3fb5357701 100644 --- a/CODING-CONVENTIONS.md +++ b/CODING-CONVENTIONS.md @@ -30,13 +30,13 @@ Simple does not mean the fewest lines of code. Simple code is: * Usually the most performant. Without data showing another approach is faster, stick with the simple design * Not simplistic: - - Ethereum is complex and Pantheon must handle this complexity and operate correctly and securely - - Pantheon code should align with well-established Ethereum abstractions and terminology used in Ethereum specifications + - Ethereum is complex and Besu must handle this complexity and operate correctly and securely + - Besu code should align with well-established Ethereum abstractions and terminology used in Ethereum specifications - Aim to make the code as simple as possible but no simpler ## 2.2 Idiomatic Java -Pantheon embraces typical Java idioms including using an Object Oriented approach to design. This includes: +Besu embraces typical Java idioms including using an Object Oriented approach to design. This includes: * Providing alternate behaviours via polymorphism instead of having conditional logic scattered through the codebase. For example, `ProtocolSpec` provides a standard interface to blockchain operations and multiple implementations define the different behaviours for each Ethereum milestone. * Encapsulating behaviour and data together in classes. For example, `BytesValue` encapsulates byte data and methods operating on the byte data. `BytesValue.isZero()` is an instance method instead of accepting a `BytesValue` parameter. @@ -47,11 +47,11 @@ Pantheon embraces typical Java idioms including using an Object Oriented approac - Don't pass lambdas into executors because it makes it harder to identify the threading interactions. The lambda makes the code shorter but not clearer. Instead use a separate class or extract a method. * For good examples, refer to the APIs the JDK itself exposes. ->**Note** If you're not sure what idiomatic Java looks like, start by following the typical patterns and naming used in Pantheon. +>**Note** If you're not sure what idiomatic Java looks like, start by following the typical patterns and naming used in Besu. ## 2.3 You Ain't Gonna Need It (YAGNI) -The Pantheon design prioritizes meeting current requirements in the simplest, clearest way over attempting to anticipate future functionality. As a result, Pantheon’s design: +The Besu design prioritizes meeting current requirements in the simplest, clearest way over attempting to anticipate future functionality. As a result, Besu’s design: * Is not set in stone as a big upfront design. The design is adjusted through constant refactoring as new requirements are added and understood. * Uses abstraction only where it aids understanding of the current code. Abstraction is not used where it only supports future needs. * Avoids over-engineering. @@ -100,7 +100,7 @@ So the code can cope with constant refactoring and evolving design, write code t * Uses dependency injection - Constructors should be simple, with dependencies passed in rather than built in the constructor - - Pantheon does not use a dependency injection framework + - Besu does not use a dependency injection framework * Validates method parameters for public methods using the Guava `Preconditions` class. Avoid validating parameters in private methods @@ -113,7 +113,7 @@ So the code can cope with constant refactoring and evolving design, write code t * Use Optional rather than returning null when not having a value is a normal case -* Consider exception and error handling as part of the overall design. Pantheon avoids checked exceptions +* Consider exception and error handling as part of the overall design. Besu avoids checked exceptions * Give threads meaningful names. For example: `Executors.newFixedThreadPool(1, new ThreadFactoryBuilder().setNameFormat(“Ibft”).build())` @@ -123,7 +123,7 @@ So the code can cope with constant refactoring and evolving design, write code t ## 4.1 Style Guide -Pantheon follows the [Google code style](https://google.github.io/styleguide/javaguide.html) and uses spotless to ensure consistency of formatting. +Besu follows the [Google code style](https://google.github.io/styleguide/javaguide.html) and uses spotless to ensure consistency of formatting. To automatically reformat the code before creating a pull request, run: @@ -182,7 +182,7 @@ Method parameters must be final. Class level and local fields should be final w # 5 Logging -Logging is important for understanding what Pantheon is doing at any given time (for example, progress while synchronizing) and investigating defects. During development, add logging to aid in these cases. +Logging is important for understanding what Besu is doing at any given time (for example, progress while synchronizing) and investigating defects. During development, add logging to aid in these cases. ## 5.1 Log Messages @@ -213,12 +213,12 @@ Make log messages: * _Warn_ - Anything that can potentially cause application oddities but from which Pantheon automatically recovers + Anything that can potentially cause application oddities but from which Besu automatically recovers * _Error_ - Any error which is fatal to the operation, but not Pantheon itself (for example, missing data) + Any error which is fatal to the operation, but not Besu itself (for example, missing data) * _Fatal_ - An error that forces a shutdown of Pantheon + An error that forces a shutdown of Besu diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d4faf34c11..bb7b346ba1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ -# Contributing to Pantheon +# Contributing to Besu :+1::tada: First off, thanks for taking the time to contribute! :tada::+1: -Welcome to the Pantheon repository! The following is a set of guidelines for contributing to this +Welcome to the Besu repository! The following is a set of guidelines for contributing to this repo and its packages. These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request. @@ -26,15 +26,15 @@ and feel free to propose changes to this document in a pull request. ## Code of Conduct -This project and everyone participating in it is governed by the [Pantheon Code of Conduct](CODE-OF-CONDUCT.md). +This project and everyone participating in it is governed by the [Besu Code of Conduct](CODE-OF-CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [private@pegasys.tech]. ## I just have a quick question > **Note:** Please don't file an issue to ask a question. You'll get faster results by using the resources below. -* [Pantheon documentation] -* [Gitter] +* [Besu documentation] +* [Rocketchat] ## How To Contribute ### Reporting Bugs @@ -51,7 +51,7 @@ open a new issue and include a link to the original issue in the body of your ne #### Before Submitting A Bug Report * **Confirm the problem** is reproducible in the latest version of the software -* **Check [Pantheon documentation]**. You might be able to find the cause of the problem and fix things yourself. +* **Check [Besu documentation]**. You might be able to find the cause of the problem and fix things yourself. * **Perform a [cursory search of project issues](https://pegasys1.atlassian.net/browse/PAN-2502?jql=project%20%3D%20PAN)** to see if the problem has already been reported. If it has **and the issue is still open**, add a comment to the existing issue instead of opening a new one. @@ -63,7 +63,7 @@ Explain the problem and include additional details to help maintainers reproduce * **Use a clear and descriptive summary** for the issue to identify the problem. * **Describe the exact steps which reproduce the problem** in as many details as possible. For example, -start by explaining how you started Pantheon, e.g. which command exactly you used in the terminal, +start by explaining how you started Besu, e.g. which command exactly you used in the terminal, or how you started it otherwise. * **Provide specific examples to demonstrate the steps**. Include links to files or GitHub projects, or copy/pasteable snippets, which you use in those examples. If you're providing snippets in the issue, @@ -84,14 +84,14 @@ and under which conditions it normally happens. Include details about your configuration and environment: -* **Which version of the software are you using?** You can get the exact version by running `pantheon -v` in your terminal. +* **Which version of the software are you using?** You can get the exact version by running `besu -v` in your terminal. * **What OS & Version are you running?** * **For Linux - What kernel are you running?** You can get the exact version by running `uname -a` in your terminal. * **Are you running in a virtual machine?** If so, which VM software are you using and which operating systems and versions are used for the host and the guest? * **Are you running in a docker container?** If so, what version of docker? * **Are you running in a a Cloud?** If so, which one, and what type/size of VM is it? -* **What version of Java are you running?** You can get the exact version by looking at the pantheon +* **What version of Java are you running?** You can get the exact version by looking at the besu logfile during startup. ### Suggesting Enhancements @@ -110,7 +110,7 @@ When you are creating an enhancement suggestion, please #### Before Submitting An Enhancement Suggestion -* **Check the [Pantheon documentation].** You might be able to find the cause of the problem and fix things yourself. +* **Check the [Besu documentation].** You might be able to find the cause of the problem and fix things yourself. * **Perform a [cursory search of project issues](https://pegasys1.atlassian.net/browse/PAN-2502?jql=project%20%3D%20PAN)** to see if the problem has already been reported. If it has **and the issue is still open**, add a comment to the existing issue instead of opening a new one. @@ -129,7 +129,7 @@ Provide the following information: * **Explain why this enhancement would be useful** to most users. * **Does this enhancement exist in other clients?** * **Specify which version of the software you're using.** You can get the exact version by running -`pantheon -v` in your terminal. +`besu -v` in your terminal. * **Specify the name and version of the OS you're using.** ## Your First Contribution @@ -138,7 +138,7 @@ Start by looking through the 'good first issue' and 'help wanted' labeled issues and a test or two. * [Help wanted issues][search-label-help-wanted] - issues which are a bit more involved than `good first issue` issues. -When you've identified an issue you'd like to work on, ping us on [Gitter] and we'll assign it to you. +When you've identified an issue you'd like to work on, ping us on [Rocketchat] and we'll assign it to you. ### Contribution Workflow The codebase and documentation are maintained using the same "*contributor workflow*" where everyone @@ -148,7 +148,7 @@ This facilitates social contribution, easy testing, and peer review. To contribute changes, use the following workflow: -1. [**Fork the repository**](https://github.com/PegaSysEng/pantheon/fork). +1. [**Fork the repository**](https://github.com/PegaSysEng/besu/fork). 1. **Clone your fork** to your computer. 1. **Create a topic branch** and name it appropriately. Starting the branch name with the issue number is a good practice and a reminder to fix only one issue in a @@ -161,7 +161,7 @@ For this reason do not mix any formatting fixes or code moves with actual code c another part of the software. Running the `./gradlew clean check test` command locally will help you to be confident that your changes will pass CI tests once pushed as a Pull Request. 1. **Push your changes** to your remote fork (usually labeled as `origin`). -1. **Create a pull-request** (PR) on the Pantheon repository. If the PR addresses an existing Jira issue, +1. **Create a pull-request** (PR) on the Besu repository. If the PR addresses an existing Jira issue, include the issue number in the PR title in square brackets (for example, `[PAN-2374]`). 1. **Add labels** to identify the type of your PR. _For example, if your PR is not ready to validate, add the "work-in-progress" label. If it fixes a bug, add the "bug" label._ @@ -172,7 +172,7 @@ If you don't know who to choose, simply select the reviewers proposed by GitHub 1. **Make any required changes** on your contribution from the reviewers feedback. _Make the changes, commit to your branch, and push to your remote fork._ 1. **When your PR is validated**, all tests passed and your branch has no conflicts with the target branch, -you can **"squash and merge"** your PR and you're done. You contributed to Pantheon! Thanks ! +you can **"squash and merge"** your PR and you're done. You contributed to Besu! Thanks ! ### Architectural Best Practices @@ -240,8 +240,8 @@ These are not strictly enforced during the build, but should be adhered to and c | [`needs engineering approval`][search-label-needs-engineering-approval] | Pull requests which need to be approved from a technical person, mainly documentation PRs. | [private@pegasys.tech]: mailto:private@pegasys.tech -[Gitter]: https://gitter.im/PegaSysEng/pantheon -[Pantheon documentation]: https://docs.pantheon.pegasys.tech/ +[Rocketchat]: https://chat.hyperledger.org/channel/besu +[Besu documentation]: https://besu.hyperledger.org/ [CLA.md]: /CLA.md [Code Reviews]: /docs/community/code-reviews.md [MkDocs]: https://www.mkdocs.org/ diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 653992c1c8..ca6b200bea 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -5,7 +5,7 @@ This project is led by a benevolent dictator (PegaSys) and managed by the commun # Principles The community adheres to the following principles: -* Open: Pantheon is open source. See repository guidelines and CLA, below. +* Open: Besu is open source. See repository guidelines and CLA, below. * Welcoming and respectful: See Code of Conduct, below. * Transparent and accessible: Work and collaboration should be done in public. * Merit: Ideas and contributions are accepted according to their technical merit and alignment with project objectives and design principles. diff --git a/Jenkinsfile b/Jenkinsfile index 12acb98e71..79d346b969 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -184,20 +184,8 @@ try { stage(stage_name + 'Calculate variables') { def gradleProperties = readProperties file: 'gradle.properties' version = gradleProperties.version - def imageRepos = 'pegasyseng' - image = "${imageRepos}/pantheon:${version}" - } - - stage(stage_name + "Test image labels") { - shortCommit = sh(returnStdout: true, script: "git log -n 1 --pretty=format:'%h'").trim() - sh "docker image inspect \ - --format='{{index .Config.Labels \"org.label-schema.vcs-ref\"}}' \ - ${image} \ - | grep ${shortCommit}" - sh "docker image inspect \ - --format='{{index .Config.Labels \"org.label-schema.version\"}}' \ - ${image} \ - | grep ${version}" + def imageRepos = 'hyperledger' + image = "${imageRepos}/besu:${version}" } try { @@ -236,32 +224,32 @@ try { } } } - }, BintrayPublish: { - def stage_name = "Bintray publish node: " - node { - if (shouldPublish()) { - checkout scm - - docker.image(docker_image_dind).withRun('--privileged') { d -> - docker.image(build_image).inside("--link ${d.id}:docker") { - stage(stage_name + 'Prepare') { - sh './gradlew --no-daemon --parallel clean assemble' - } - stage(stage_name + 'Publish') { - withCredentials([ - usernamePassword( - credentialsId: 'pegasys-bintray', - usernameVariable: 'BINTRAY_USER', - passwordVariable: 'BINTRAY_KEY' - ) - ]) { - sh './gradlew --no-daemon --parallel bintrayUpload' - } - } - } - } - } - } +// }, BintrayPublish: { +// def stage_name = "Bintray publish node: " +// node { +// if (shouldPublish()) { +// checkout scm +// +// docker.image(docker_image_dind).withRun('--privileged') { d -> +// docker.image(build_image).inside("--link ${d.id}:docker") { +// stage(stage_name + 'Prepare') { +// sh './gradlew --no-daemon --parallel clean assemble' +// } +// stage(stage_name + 'Publish') { +// withCredentials([ +// usernamePassword( +// credentialsId: 'pegasys-bintray', +// usernameVariable: 'BINTRAY_USER', +// passwordVariable: 'BINTRAY_KEY' +// ) +// ]) { +// sh './gradlew --no-daemon --parallel bintrayUpload' +// } +// } +// } +// } +// } +// } } } } catch (e) { diff --git a/Jenkinsfile.benchmark b/Jenkinsfile.benchmark index f6fe416241..7951e707bb 100644 --- a/Jenkinsfile.benchmark +++ b/Jenkinsfile.benchmark @@ -10,9 +10,9 @@ properties([ // choice(name: 'IMPORT_FILE', choices: ['ropsten-000k-100k.blocks', 'ropsten-0-1M.blocks', '0-999.blocks', '6784590-6785589.blocks'], description: 'The name of the file to import, same ordial position as DATASET', trim: true) // For Network Import - choice(name: 'PANTHEON_SYNC_MODE', choices: ['FULL', 'FAST'], description: 'The mode of network syncing to perform', trim: true), - string(name: 'PANTHEON_MIN_PEERS', defaultValue: '2', description: 'Minimum number of peers to wait for before gathering data', trim: true), - string(name: 'PANTHEON_BENCHMARK_DURATION', defaultValue: '30', description: 'Maximum number of minutes to run the benchmark (full sync ends the benchmark early)', trim: true), + choice(name: 'BESU_SYNC_MODE', choices: ['FULL', 'FAST'], description: 'The mode of network syncing to perform', trim: true), + string(name: 'BESU_MIN_PEERS', defaultValue: '2', description: 'Minimum number of peers to wait for before gathering data', trim: true), + string(name: 'BESU_BENCHMARK_DURATION', defaultValue: '30', description: 'Maximum number of minutes to run the benchmark (full sync ends the benchmark early)', trim: true), ]) ]) @@ -46,7 +46,7 @@ pipeline { withEnv([ "DATA_DIR=/data", "BENCHMARKS_DATA=/benchmarks-data", - "PANTHEON_SRC_DIR=${WORKSPACE}", + "BESU_SRC_DIR=${WORKSPACE}", "DESCRIPTION=automatic" ]) { dir('pantheon-benchmarks') { diff --git a/README.md b/README.md index efa5d23382..059735e666 100644 --- a/README.md +++ b/README.md @@ -1,33 +1,34 @@ -# Pantheon Ethereum Client - [![Build Status](https://jenkins.pegasys.tech/job/Pantheon/job/master/badge/icon)](https://jenkins.pegasys.tech/job/Pantheon/job/master/) - [![Documentation Status](https://readthedocs.org/projects/pantheon/badge/?version=latest)](https://docs.pantheon.pegasys.tech/en/latest/?badge=latest) - [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/PegasysEng/pantheon/blob/master/LICENSE) - [ ![Download](https://api.bintray.com/packages/consensys/pegasys-repo/pantheon/images/download.svg) ](https://bintray.com/consensys/pegasys-repo/pantheon/_latestVersion) - [![Gitter chat](https://badges.gitter.im/PegaSysEng/pantheon.png)](https://gitter.im/PegaSysEng/pantheon) +# Besu Ethereum Client + [![Build Status](https://jenkins.pegasys.tech/job/Besu/job/master/badge/icon)](https://jenkins.pegasys.tech/job/Besu/job/master/) + [![Documentation Status](https://readthedocs.org/projects/hyperledger-besu/badge/?version=latest)](https://docs.besu.pegasys.tech/en/latest/?badge=latest) + [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/PegasysEng/besu/blob/master/LICENSE) + [ ![Download](https://api.bintray.com/packages/hyperledger/besu-repo/besu/images/download.svg) ](https://bintray.com/hyperledger/besu-repo/besu/_latestVersion) + [![RocketChat chat](https://open.rocket.chat/images/join-chat.svg)](https://chat.hyperledger.org/channel/besu) -Pantheon is an Apache 2.0 licensed, MainNet compatible, Ethereum client written in Java. + +Besu is an Apache 2.0 licensed, MainNet compatible, Ethereum client written in Java. ## Issues -Pantheon issues are tracked in [Jira](https://pegasys1.atlassian.net/secure/Dashboard.jspa?selectPageId=10117) not GitHub. +Besu issues are tracked in [Jira](https://pegasys1.atlassian.net/secure/Dashboard.jspa?selectPageId=10117) not GitHub. See our [contribution guidelines](CONTRIBUTING.md) for more detail on searching and creating issues. -If you've commented on existing issue and have been waiting for a reply, feel free to ping us on [Gitter]. +If you've commented on existing issue and have been waiting for a reply, feel free to ping us on [RocketChat]. -## Pantheon Users +## Besu Users -The process for installing and running Pantheon as a user is different to when developing. Some processes in our [user documentation](https://docs.pantheon.pegasys.tech/en/latest/) are different to those described in this Readme. +The process for installing and running Besu as a user is different to when developing. Some processes in our [user documentation](https://docs.besu.pegasys.tech/en/latest/) are different to those described in this Readme. -## Pantheon Developers +## Besu Developers * [Contribution Guidelines](CONTRIBUTING.md) * [Coding Conventions](CODING-CONVENTIONS.md) * [Command Line Interface (CLI) Style Guide](CLI-STYLE-GUIDE.md) -* [User Documentation] for running and using Pantheon +* [User Documentation] for running and using Besu ### Development -Instructions for how to get started with developing on the Pantheon codebase. Please also read the +Instructions for how to get started with developing on the Besu codebase. Please also read the [contribution guidelines](CONTRIBUTING.md) for more detail on how to submit a pull request (PR). * [Checking Out and Building](docs/development/building.md) @@ -35,8 +36,8 @@ Instructions for how to get started with developing on the Pantheon codebase. Pl * [Code Coverage](docs/development/code-coverage.md) * [Logging](docs/development/logging.md) -[User Documentation]: https://docs.pantheon.pegasys.tech/en/stable/ -[Gitter]: https://gitter.im/PegaSysEng/pantheon +[User Documentation]: https://besu.hyperledger.org/ +[RocketChat]: https://chat.hyperledger.org/channel/besu ## Release Notes diff --git a/ROADMAP.md b/ROADMAP.md index 63e70b2cc0..cc92d49e38 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1,5 +1,5 @@ # Roadmap -This document represents the current working roadmap for Pantheon. It is a living document, which will +This document represents the current working roadmap for Besu. It is a living document, which will evolve and change over time. In particular the features in later versions are likely to be refined and change. We use the approach of `#now`, `#next`, `#later` [used by foursquare](https://medium.com/@noah_weiss/now-next-later-roadmaps-without-the-drudgery-1cfe65656645), with a slightly different time horizon. @@ -7,26 +7,26 @@ Our `#now` scale is about 3 months, `#next` about 6 months, and `+later` is 12+ ## Now (up to v1.3) Our key areas for now are: -* Making Pantheon a First Class Client +* Making Besu a First Class Client * Istanbul Support * State Pruning * Tracing APIs * Disaster recovery -### Making Pantheon a First Class Client +### Making Besu a First Class Client -First and foremost, we want Pantheon to be a first class client for usage on both mainnet and permissioned networks. -This entails maintaining compatibility with mainnet, providing permissioning features and constantly improving Pantheon's performance. -Some recent additions to the client have been [UPnP Support](https://docs.pantheon.pegasys.tech/en/latest/Configuring-Pantheon/Networking/Using-UPnP/) -and a [GraphQL interface](https://docs.pantheon.pegasys.tech/en/latest/Pantheon-API/GraphQL/). +First and foremost, we want Besu to be a first class client for usage on both mainnet and permissioned networks. +This entails maintaining compatibility with mainnet, providing permissioning features and constantly improving Besu's performance. +Some recent additions to the client have been [UPnP Support](https://docs.besu.pegasys.tech/en/latest/Configuring-Besu/Networking/Using-UPnP/) +and a [GraphQL interface](https://docs.besu.pegasys.tech/en/latest/Besu-API/GraphQL/). ### Istanbul Support -Pantheon will support the upcoming Istanbul network upgrade and implement all required EIPs as per the [Hardfork Meta: Istanbul EIP](https://eips.ethereum.org/EIPS/eip-1679). +Besu will support the upcoming Istanbul network upgrade and implement all required EIPs as per the [Hardfork Meta: Istanbul EIP](https://eips.ethereum.org/EIPS/eip-1679). ### State Pruning -State pruning will be implemented. State pruning reduces the disk space required for the Pantheon database by discarding outdated world state data. +State pruning will be implemented. State pruning reduces the disk space required for the Besu database by discarding outdated world state data. ### Tracing APIs @@ -57,7 +57,7 @@ Adding tools to enable migration across consensus algorithms. ### Ethereum 1.x -The Pantheon team will help spearhead the Ethereum 1.x initiative by contributing to EIPs, community discussions, roadmap specificaton and eventually implementing the resulting features from the initiative. More information on the 1.x initiative can be found [here](https://docs.ethhub.io/ethereum-roadmap/ethereum-1.x/). +The Besu team will help spearhead the Ethereum 1.x initiative by contributing to EIPs, community discussions, roadmap specificaton and eventually implementing the resulting features from the initiative. More information on the 1.x initiative can be found [here](https://docs.ethhub.io/ethereum-roadmap/ethereum-1.x/). ## Future (v1.5+) In addition to making incremental improvements to the above features, there will be some bigger pieces of work. diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle index 5d9de52c00..1c1f088a78 100644 --- a/acceptance-tests/build.gradle +++ b/acceptance-tests/build.gradle @@ -30,7 +30,7 @@ dependencies { testSupportImplementation project(':ethereum:permissioning') testSupportImplementation project(':ethereum:rlp') testSupportImplementation project(':metrics:core') - testSupportImplementation project(':pantheon') + testSupportImplementation project(':besu') testSupportImplementation project(':plugin-api') testSupportImplementation project(':plugins:rocksdb') testSupportImplementation project(':services:kvstore') @@ -68,7 +68,7 @@ dependencies { testImplementation project(':ethereum:permissioning') testImplementation project(':util') testImplementation project(':plugin-api') - testImplementation project(':pantheon') + testImplementation project(':besu') testImplementation project(':ethereum:core') testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') testImplementation project(':testutil') @@ -79,15 +79,15 @@ dependencies { test.enabled = false sourceSets { - test { resources { srcDirs "${rootDir}/pantheon/build/libs" } } + test { resources { srcDirs "${rootDir}/besu/build/libs" } } } -processTestResources.dependsOn(':pantheon:testJar') +processTestResources.dependsOn(':besu:testJar') task acceptanceTest(type: Test) { dependsOn(rootProject.installDist) - systemProperty 'acctests.runPantheonAsProcess', 'true' + systemProperty 'acctests.runBesuAsProcess', 'true' mustRunAfter rootProject.subprojects*.test - description = 'Runs Pantheon acceptance tests.' + description = 'Runs Besu acceptance tests.' group = 'verification' } diff --git a/acceptance-tests/simple-permissioning-smart-contract/README.md b/acceptance-tests/simple-permissioning-smart-contract/README.md index f2d0162896..5258c4f1fc 100644 --- a/acceptance-tests/simple-permissioning-smart-contract/README.md +++ b/acceptance-tests/simple-permissioning-smart-contract/README.md @@ -17,9 +17,9 @@ cd acceptance-tests/simple-permissioning-smart-contract * Note you need Ganache running if you want to run the tests against it (see below) * Also this truffle.js uses address and private key generated by Ganache with default mnemonic "candy maple cake sugar pudding cream honey rich smooth crumble sweet treat" -* To run the Truffle example with Pantheon, you need Pantheon running - * [check out and build Pantheon](../../README.md) - * run Pantheon (either in IDE or via command line), with mining and RPC enabled. +* To run the Truffle example with Besu, you need Besu running + * [check out and build Besu](../../README.md) + * run Besu (either in IDE or via command line), with mining and RPC enabled. * Run Truffle migrate against Ganache ``` diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/AcceptanceTestBase.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java similarity index 57% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/AcceptanceTestBase.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java index 30b6c814e3..a27ccb12fd 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/AcceptanceTestBase.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java @@ -10,32 +10,32 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl; +package org.hyperledger.besu.tests.acceptance.dsl; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Accounts; -import tech.pegasys.pantheon.tests.acceptance.dsl.blockchain.Blockchain; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.admin.AdminConditions; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.clique.CliqueConditions; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.eth.EthConditions; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.ibft2.Ibft2Conditions; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.login.LoginConditions; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.net.NetConditions; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.perm.PermissioningConditions; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.web3.Web3Conditions; -import tech.pegasys.pantheon.tests.acceptance.dsl.contract.ContractVerifier; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.Cluster; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.PantheonNodeFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.permissioning.PermissionedNodeBuilder; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.account.AccountTransactions; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.admin.AdminTransactions; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueTransactions; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.contract.ContractTransactions; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthTransactions; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.miner.MinerTransactions; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.NetTransactions; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.PermissioningTransactions; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.web3.Web3Transactions; +import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts; +import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Blockchain; +import org.hyperledger.besu.tests.acceptance.dsl.condition.admin.AdminConditions; +import org.hyperledger.besu.tests.acceptance.dsl.condition.clique.CliqueConditions; +import org.hyperledger.besu.tests.acceptance.dsl.condition.eth.EthConditions; +import org.hyperledger.besu.tests.acceptance.dsl.condition.ibft2.Ibft2Conditions; +import org.hyperledger.besu.tests.acceptance.dsl.condition.login.LoginConditions; +import org.hyperledger.besu.tests.acceptance.dsl.condition.net.NetConditions; +import org.hyperledger.besu.tests.acceptance.dsl.condition.perm.PermissioningConditions; +import org.hyperledger.besu.tests.acceptance.dsl.condition.web3.Web3Conditions; +import org.hyperledger.besu.tests.acceptance.dsl.contract.ContractVerifier; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeFactory; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.permissioning.PermissionedNodeBuilder; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.account.AccountTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.admin.AdminTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.contract.ContractTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.miner.MinerTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.NetTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermissioningTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.web3.Web3Transactions; import org.junit.After; @@ -57,7 +57,7 @@ public class AcceptanceTestBase { protected final Ibft2Conditions ibftTwo; protected final LoginConditions login; protected final NetConditions net; - protected final PantheonNodeFactory pantheon; + protected final BesuNodeFactory besu; protected final PermissioningConditions perm; protected final PermissionedNodeBuilder permissionedNodeBuilder; protected final PermissioningTransactions permissioningTransactions; @@ -85,7 +85,7 @@ public class AcceptanceTestBase { perm = new PermissioningConditions(permissioningTransactions); admin = new AdminConditions(adminTransactions); web3 = new Web3Conditions(new Web3Transactions()); - pantheon = new PantheonNodeFactory(); + besu = new BesuNodeFactory(); contractVerifier = new ContractVerifier(accounts.getPrimaryBenefactor()); permissionedNodeBuilder = new PermissionedNodeBuilder(); } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/BlockUtils.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java similarity index 77% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/BlockUtils.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java index b25c009d10..e605aa43db 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/BlockUtils.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl; +package org.hyperledger.besu.tests.acceptance.dsl; -import static tech.pegasys.pantheon.ethereum.core.Hash.fromHexString; +import static org.hyperledger.besu.ethereum.core.Hash.fromHexString; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogsBloomFilter; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.LogsBloomFilter; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import org.web3j.protocol.core.methods.response.EthBlock.Block; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/StaticNodesUtils.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/StaticNodesUtils.java similarity index 96% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/StaticNodesUtils.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/StaticNodesUtils.java index 0a45aa5374..a4b1a6016c 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/StaticNodesUtils.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/StaticNodesUtils.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl; +package org.hyperledger.besu.tests.acceptance.dsl; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/WaitUtils.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/WaitUtils.java similarity index 95% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/WaitUtils.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/WaitUtils.java index a02701d0a8..439b08f479 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/WaitUtils.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/WaitUtils.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl; +package org.hyperledger.besu.tests.acceptance.dsl; import java.util.concurrent.TimeUnit; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Account.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/account/Account.java similarity index 79% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Account.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/account/Account.java index 9678541101..e7d8dc159d 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Account.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/account/Account.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.account; - -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.PrivateKey; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.tests.acceptance.dsl.blockchain.Amount; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.account.ExpectAccountBalance; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.account.ExpectAccountBalanceNotChanging; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthTransactions; -import tech.pegasys.pantheon.util.bytes.Bytes32; +package org.hyperledger.besu.tests.acceptance.dsl.account; + +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.PrivateKey; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.condition.account.ExpectAccountBalance; +import org.hyperledger.besu.tests.acceptance.dsl.condition.account.ExpectAccountBalanceNotChanging; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions; +import org.hyperledger.besu.util.bytes.Bytes32; import java.math.BigInteger; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Accounts.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/account/Accounts.java similarity index 91% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Accounts.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/account/Accounts.java index 1a98b59b09..fb851f2899 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Accounts.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/account/Accounts.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.account; +package org.hyperledger.besu.tests.acceptance.dsl.account; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions; public class Accounts { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/blockchain/Amount.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Amount.java similarity index 96% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/blockchain/Amount.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Amount.java index d46330b8f1..34c0d781fe 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/blockchain/Amount.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Amount.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.blockchain; +package org.hyperledger.besu.tests.acceptance.dsl.blockchain; import static org.web3j.utils.Convert.Unit.ETHER; import static org.web3j.utils.Convert.Unit.WEI; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/blockchain/Blockchain.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Blockchain.java similarity index 64% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/blockchain/Blockchain.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Blockchain.java index d5a1e3bf8a..488bb9a7f4 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/blockchain/Blockchain.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Blockchain.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.blockchain; +package org.hyperledger.besu.tests.acceptance.dsl.blockchain; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.blockchain.ExpectBeneficiary; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.blockchain.ExpectBlockNumberAbove; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.blockchain.ExpectMinimumBlockNumber; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.condition.blockchain.ExpectBeneficiary; +import org.hyperledger.besu.tests.acceptance.dsl.condition.blockchain.ExpectBlockNumberAbove; +import org.hyperledger.besu.tests.acceptance.dsl.condition.blockchain.ExpectMinimumBlockNumber; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions; import java.math.BigInteger; @@ -34,7 +34,7 @@ public class Blockchain { return new ExpectMinimumBlockNumber(eth, currentHeight(node)); } - public Condition beneficiaryEquals(final PantheonNode node) { + public Condition beneficiaryEquals(final BesuNode node) { return new ExpectBeneficiary(eth, node); } @@ -42,12 +42,12 @@ public class Blockchain { return new ExpectBlockNumberAbove(eth, BigInteger.valueOf(blockNumber)); } - public Condition reachesHeight(final PantheonNode node, final int blocksAheadOfLatest) { + public Condition reachesHeight(final BesuNode node, final int blocksAheadOfLatest) { return new ExpectBlockNumberAbove(eth, futureHeight(node, blocksAheadOfLatest)); } public Condition reachesHeight( - final PantheonNode node, final int blocksAheadOfLatest, final int timeout) { + final BesuNode node, final int blocksAheadOfLatest, final int timeout) { return new ExpectBlockNumberAbove(eth, futureHeight(node, blocksAheadOfLatest), timeout); } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/Condition.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/Condition.java similarity index 84% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/Condition.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/Condition.java index 31baa2a967..caad706a68 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/Condition.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/Condition.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition; +package org.hyperledger.besu.tests.acceptance.dsl.condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; @FunctionalInterface public interface Condition { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/account/ExpectAccountBalance.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalance.java similarity index 76% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/account/ExpectAccountBalance.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalance.java index 0311b1ae97..73759df28a 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/account/ExpectAccountBalance.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalance.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.account; +package org.hyperledger.besu.tests.acceptance.dsl.condition.account; import static org.assertj.core.api.Assertions.assertThat; import static org.web3j.utils.Convert.toWei; -import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions; import org.web3j.utils.Convert.Unit; @@ -43,7 +43,7 @@ public class ExpectAccountBalance implements Condition { @Override public void verify(final Node node) { - waitFor( + WaitUtils.waitFor( () -> assertThat(node.execute(eth.getBalance((account)))) .isEqualTo(toWei(expectedBalance, balanceUnit).toBigIntegerExact())); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/account/ExpectAccountBalanceNotChanging.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalanceNotChanging.java similarity index 82% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/account/ExpectAccountBalanceNotChanging.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalanceNotChanging.java index 70e40028eb..f0e5008cbd 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/account/ExpectAccountBalanceNotChanging.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalanceNotChanging.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.account; +package org.hyperledger.besu.tests.acceptance.dsl.condition.account; import static org.assertj.core.api.Assertions.assertThat; import static org.web3j.utils.Convert.toWei; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions; import java.util.concurrent.TimeUnit; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/admin/AdminConditions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/AdminConditions.java similarity index 76% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/admin/AdminConditions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/AdminConditions.java index ad748a1dce..4fa31f913a 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/admin/AdminConditions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/AdminConditions.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.admin; +package org.hyperledger.besu.tests.acceptance.dsl.condition.admin; import static org.assertj.core.api.Assertions.fail; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.RunnableNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.admin.AdminTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.admin.AdminTransactions; import java.net.URI; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/admin/ExpectPeerAdded.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/ExpectPeerAdded.java similarity index 77% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/admin/ExpectPeerAdded.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/ExpectPeerAdded.java index 1f22c1c959..76c0ed4336 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/admin/ExpectPeerAdded.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/ExpectPeerAdded.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.admin; +package org.hyperledger.besu.tests.acceptance.dsl.condition.admin; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.admin.AddPeerTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.admin.AddPeerTransaction; public class ExpectPeerAdded implements Condition { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBeneficiary.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBeneficiary.java similarity index 60% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBeneficiary.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBeneficiary.java index 15a125f126..cbeb431142 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBeneficiary.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBeneficiary.java @@ -10,27 +10,28 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.blockchain; +package org.hyperledger.besu.tests.acceptance.dsl.condition.blockchain; import static org.assertj.core.api.Java6Assertions.assertThat; -import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions; public class ExpectBeneficiary implements Condition { private final EthTransactions eth; private final String beneficiary; - public ExpectBeneficiary(final EthTransactions eth, final PantheonNode node) { + public ExpectBeneficiary(final EthTransactions eth, final BesuNode node) { this.eth = eth; this.beneficiary = node.getAddress().toString(); } @Override public void verify(final Node node) { - waitFor(() -> assertThat(node.execute(eth.block()).getMiner()).isEqualTo(beneficiary)); + WaitUtils.waitFor( + () -> assertThat(node.execute(eth.block()).getMiner()).isEqualTo(beneficiary)); } } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBlockNotCreated.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBlockNotCreated.java similarity index 89% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBlockNotCreated.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBlockNotCreated.java index 8ba76c3427..7b5f089c8a 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBlockNotCreated.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBlockNotCreated.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.blockchain; +package org.hyperledger.besu.tests.acceptance.dsl.condition.blockchain; import static junit.framework.TestCase.fail; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions; import java.math.BigInteger; import java.util.concurrent.TimeUnit; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBlockNumberAbove.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBlockNumberAbove.java similarity index 78% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBlockNumberAbove.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBlockNumberAbove.java index 471d3024c0..b309e928d5 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBlockNumberAbove.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectBlockNumberAbove.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.blockchain; +package org.hyperledger.besu.tests.acceptance.dsl.condition.blockchain; import static org.assertj.core.api.Java6Assertions.assertThat; -import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions; import java.math.BigInteger; @@ -39,7 +39,7 @@ public class ExpectBlockNumberAbove implements Condition { @Override public void verify(final Node node) { - waitFor( + WaitUtils.waitFor( timeout, () -> assertThat(node.execute(eth.blockNumber())).isGreaterThanOrEqualTo(blockNumber)); } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectMinimumBlockNumber.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectMinimumBlockNumber.java similarity index 79% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectMinimumBlockNumber.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectMinimumBlockNumber.java index cde6da8b03..243454542a 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectMinimumBlockNumber.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/blockchain/ExpectMinimumBlockNumber.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.blockchain; +package org.hyperledger.besu.tests.acceptance.dsl.condition.blockchain; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions; import java.math.BigInteger; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java similarity index 68% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java index 259a0d4610..e91723a18c 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.clique; +package org.hyperledger.besu.tests.acceptance.dsl.condition.clique; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import static tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST; +import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueTransactions; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions; import java.util.List; @@ -35,7 +35,7 @@ public class AwaitSignerSetChange implements Condition { @Override public void verify(final Node node) { - waitFor( + WaitUtils.waitFor( 60, () -> assertThat(node.execute(clique.createGetSigners(LATEST))).isNotEqualTo(initialSigners)); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/CliqueConditions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/CliqueConditions.java similarity index 65% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/CliqueConditions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/CliqueConditions.java index da0bb993f8..656926217a 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/CliqueConditions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/CliqueConditions.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.clique; +package org.hyperledger.besu.tests.acceptance.dsl.condition.clique; import static java.util.Collections.emptyList; -import static tech.pegasys.pantheon.ethereum.core.Hash.fromHexString; -import static tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST; - -import tech.pegasys.pantheon.config.CliqueConfigOptions; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.blockchain.ExpectBlockNotCreated; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.clique.ExpectNonceVote.CLIQUE_NONCE_VOTE; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueTransactions; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthTransactions; +import static org.hyperledger.besu.ethereum.core.Hash.fromHexString; +import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST; + +import org.hyperledger.besu.config.CliqueConfigOptions; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.condition.blockchain.ExpectBlockNotCreated; +import org.hyperledger.besu.tests.acceptance.dsl.condition.clique.ExpectNonceVote.CLIQUE_NONCE_VOTE; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions; import java.math.BigInteger; import java.util.Arrays; @@ -47,17 +47,16 @@ public class CliqueConditions { this.clique = clique; } - public Condition validatorsEqual(final PantheonNode... validators) { + public Condition validatorsEqual(final BesuNode... validators) { return new ExpectValidators(clique, validatorAddresses(validators)); } - public Condition validatorsAtBlockEqual( - final String blockNumber, final PantheonNode... validators) { + public Condition validatorsAtBlockEqual(final String blockNumber, final BesuNode... validators) { return new ExpectValidatorsAtBlock(clique, blockNumber, validatorAddresses(validators)); } public Condition validatorsAtBlockHashFromBlockNumberEqual( - final Node node, final long blockNumber, final PantheonNode... validators) { + final Node node, final long blockNumber, final BesuNode... validators) { final DefaultBlockParameter blockParameter = DefaultBlockParameter.valueOf(BigInteger.valueOf(blockNumber)); final String blockHash = node.execute(eth.block(blockParameter)).getHash(); @@ -77,7 +76,7 @@ public class CliqueConditions { return new ExpectNonceVote(eth, clique_nonce_vote); } - public Condition noNewBlockCreated(final PantheonNode node) { + public Condition noNewBlockCreated(final BesuNode node) { final int blockPeriodSeconds = cliqueBlockPeriod(node); final int blockPeriodWait = blockPeriodSeconds * 1000; return new ExpectBlockNotCreated(eth, blockPeriodWait, blockPeriodWait); @@ -87,7 +86,7 @@ public class CliqueConditions { return new AwaitSignerSetChange(node.execute(clique.createGetSigners(LATEST)), clique); } - private int cliqueBlockPeriod(final PantheonNode node) { + private int cliqueBlockPeriod(final BesuNode node) { final String config = node.getGenesisConfigProvider().create(emptyList()).get(); final GenesisConfigFile genesisConfigFile = GenesisConfigFile.fromConfig(config); final CliqueConfigOptions cliqueConfigOptions = @@ -95,29 +94,29 @@ public class CliqueConditions { return cliqueConfigOptions.getBlockPeriodSeconds(); } - private Address[] validatorAddresses(final PantheonNode[] validators) { - return Arrays.stream(validators).map(PantheonNode::getAddress).sorted().toArray(Address[]::new); + private Address[] validatorAddresses(final BesuNode[] validators) { + return Arrays.stream(validators).map(BesuNode::getAddress).sorted().toArray(Address[]::new); } - public Condition blockIsCreatedByProposer(final PantheonNode proposer) { + public Condition blockIsCreatedByProposer(final BesuNode proposer) { return new ExpectedBlockHasProposer(eth, proposer.getAddress()); } public static class ProposalsConfig { - private final Map proposals = new HashMap<>(); + private final Map proposals = new HashMap<>(); private final CliqueTransactions clique; public ProposalsConfig(final CliqueTransactions clique) { this.clique = clique; } - public ProposalsConfig addProposal(final PantheonNode node) { + public ProposalsConfig addProposal(final BesuNode node) { proposals.put(node, true); return this; } - public ProposalsConfig removeProposal(final PantheonNode node) { + public ProposalsConfig removeProposal(final BesuNode node) { proposals.put(node, false); return this; } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java similarity index 67% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java index 03757f3e0d..1dccee7211 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.clique; +package org.hyperledger.besu.tests.acceptance.dsl.condition.clique; import static org.assertj.core.api.Java6Assertions.assertThat; -import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import static tech.pegasys.pantheon.tests.acceptance.dsl.condition.clique.ExpectNonceVote.CLIQUE_NONCE_VOTE.AUTH; +import static org.hyperledger.besu.tests.acceptance.dsl.condition.clique.ExpectNonceVote.CLIQUE_NONCE_VOTE.AUTH; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions; public class ExpectNonceVote implements Condition { private static final String NONCE_AUTH = "0xffffffffffffffff"; @@ -38,6 +38,7 @@ public class ExpectNonceVote implements Condition { @Override public void verify(final Node node) { - waitFor(() -> assertThat(node.execute(eth.block()).getNonceRaw()).isEqualTo(expectedNonce)); + WaitUtils.waitFor( + () -> assertThat(node.execute(eth.block()).getNonceRaw()).isEqualTo(expectedNonce)); } } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectProposals.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectProposals.java similarity index 66% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectProposals.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectProposals.java index d9ef87ab43..045f71ae11 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectProposals.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectProposals.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.clique; +package org.hyperledger.besu.tests.acceptance.dsl.condition.clique; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueTransactions; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions; import java.util.Map; @@ -33,6 +33,7 @@ public class ExpectProposals implements Condition { @Override public void verify(final Node node) { - waitFor(() -> assertThat(node.execute(clique.createProposals())).isEqualTo(proposers)); + WaitUtils.waitFor( + () -> assertThat(node.execute(clique.createProposals())).isEqualTo(proposers)); } } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidators.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidators.java similarity index 67% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidators.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidators.java index 22fd223430..7d5a17e54e 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidators.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidators.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.clique; +package org.hyperledger.besu.tests.acceptance.dsl.condition.clique; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import static tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST; +import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueTransactions; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions; public class ExpectValidators implements Condition { private final CliqueTransactions clique; @@ -32,7 +32,7 @@ public class ExpectValidators implements Condition { @Override public void verify(final Node node) { - waitFor( + WaitUtils.waitFor( () -> assertThat(node.execute(clique.createGetSigners(LATEST))).containsExactly(validators)); } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java similarity index 74% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java index ec281fb1fa..58075bf192 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.clique; +package org.hyperledger.besu.tests.acceptance.dsl.condition.clique; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueTransactions; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions; public class ExpectValidatorsAtBlock implements Condition { private final CliqueTransactions clique; @@ -34,7 +34,7 @@ public class ExpectValidatorsAtBlock implements Condition { @Override public void verify(final Node node) { - waitFor( + WaitUtils.waitFor( () -> assertThat(node.execute(clique.createGetSigners(blockParameter))) .containsExactly(validators)); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java similarity index 72% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java index ef95fb0131..238b871632 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.clique; +package org.hyperledger.besu.tests.acceptance.dsl.condition.clique; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueTransactions; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions; public class ExpectValidatorsAtBlockHash implements Condition { private final CliqueTransactions clique; @@ -35,7 +35,7 @@ public class ExpectValidatorsAtBlockHash implements Condition { @Override public void verify(final Node node) { - waitFor( + WaitUtils.waitFor( () -> assertThat(node.execute(clique.createGetSignersAtHash(blockHash))) .containsExactly(validators)); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java similarity index 59% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java index e424fc2084..553d272612 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.clique; +package org.hyperledger.besu.tests.acceptance.dsl.condition.clique; import static org.assertj.core.api.Java6Assertions.assertThat; -import static tech.pegasys.pantheon.tests.acceptance.dsl.BlockUtils.createBlockHeader; -import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import tech.pegasys.pantheon.consensus.clique.CliqueBlockHeaderFunctions; -import tech.pegasys.pantheon.consensus.clique.CliqueExtraData; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthTransactions; +import org.hyperledger.besu.consensus.clique.CliqueBlockHeaderFunctions; +import org.hyperledger.besu.consensus.clique.CliqueExtraData; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.tests.acceptance.dsl.BlockUtils; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions; import org.web3j.protocol.core.methods.response.EthBlock.Block; @@ -37,12 +37,13 @@ public class ExpectedBlockHasProposer implements Condition { @Override public void verify(final Node node) { - waitFor(() -> assertThat(proposerAddress(node)).isEqualTo(proposer)); + WaitUtils.waitFor(() -> assertThat(proposerAddress(node)).isEqualTo(proposer)); } private Address proposerAddress(final Node node) { final Block block = node.execute(eth.block()); - final BlockHeader blockHeader = createBlockHeader(block, new CliqueBlockHeaderFunctions()); + final BlockHeader blockHeader = + BlockUtils.createBlockHeader(block, new CliqueBlockHeaderFunctions()); final CliqueExtraData cliqueExtraData = CliqueExtraData.decode(blockHeader); return cliqueExtraData.getProposerAddress(); } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/EthConditions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/EthConditions.java similarity index 89% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/EthConditions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/EthConditions.java index 742c0d1537..f1e47774da 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/EthConditions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/EthConditions.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.eth; +package org.hyperledger.besu.tests.acceptance.dsl.condition.eth; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.miner.MiningStatusCondition; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.condition.miner.MiningStatusCondition; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions; public class EthConditions { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthAccountsException.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthAccountsException.java similarity index 82% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthAccountsException.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthAccountsException.java index fd24898d9f..b9a6fcc46d 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthAccountsException.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthAccountsException.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.eth; +package org.hyperledger.besu.tests.acceptance.dsl.condition.eth; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthAccountsTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthAccountsTransaction; import org.web3j.protocol.exceptions.ClientConnectionException; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthGetTransactionReceiptIsAbsent.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthGetTransactionReceiptIsAbsent.java similarity index 80% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthGetTransactionReceiptIsAbsent.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthGetTransactionReceiptIsAbsent.java index 6ea5ffca35..79aed6b304 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthGetTransactionReceiptIsAbsent.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthGetTransactionReceiptIsAbsent.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.eth; +package org.hyperledger.besu.tests.acceptance.dsl.condition.eth; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthGetTransactionReceiptTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthGetTransactionReceiptTransaction; import java.util.Optional; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthGetWorkException.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthGetWorkException.java similarity index 82% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthGetWorkException.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthGetWorkException.java index c877b2d85a..0592a6ae89 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthGetWorkException.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthGetWorkException.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.eth; +package org.hyperledger.besu.tests.acceptance.dsl.condition.eth; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthGetWorkTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthGetWorkTransaction; import org.web3j.protocol.exceptions.ClientConnectionException; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthSendRawTransactionException.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthSendRawTransactionException.java similarity index 82% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthSendRawTransactionException.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthSendRawTransactionException.java index 7cb5a0df5f..a36416ce59 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthSendRawTransactionException.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectEthSendRawTransactionException.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.eth; +package org.hyperledger.besu.tests.acceptance.dsl.condition.eth; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthSendRawTransactionTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthSendRawTransactionTransaction; import org.web3j.protocol.exceptions.ClientConnectionException; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceipt.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceipt.java similarity index 74% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceipt.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceipt.java index 81fccdb03c..e50a411d8f 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceipt.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceipt.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.eth; +package org.hyperledger.besu.tests.acceptance.dsl.condition.eth; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthGetTransactionReceiptTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthGetTransactionReceiptTransaction; public class ExpectSuccessfulEthGetTransactionReceipt implements Condition { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithReason.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithReason.java similarity index 83% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithReason.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithReason.java index 2a19c901d7..7c1bf614fd 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithReason.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithReason.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.eth; +package org.hyperledger.besu.tests.acceptance.dsl.condition.eth; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthGetTransactionReceiptWithRevertReason; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthGetTransactionReceiptWithRevertReason; import java.nio.charset.StandardCharsets; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithoutReason.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithoutReason.java similarity index 73% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithoutReason.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithoutReason.java index 9a11ef897e..8bd34f4868 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithoutReason.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithoutReason.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.eth; +package org.hyperledger.besu.tests.acceptance.dsl.condition.eth; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthGetTransactionReceiptWithRevertReason; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.CustomRequestFactory.TransactionReceiptWithRevertReason; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthGetTransactionReceiptWithRevertReason; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.CustomRequestFactory.TransactionReceiptWithRevertReason; public class ExpectSuccessfulEthGetTransactionReceiptWithoutReason implements Condition { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/SanityCheckEthGetWorkValues.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/SanityCheckEthGetWorkValues.java similarity index 79% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/SanityCheckEthGetWorkValues.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/SanityCheckEthGetWorkValues.java index 7333a983f3..9d9c70e87e 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/SanityCheckEthGetWorkValues.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/SanityCheckEthGetWorkValues.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.eth; +package org.hyperledger.besu.tests.acceptance.dsl.condition.eth; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthGetWorkTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthGetWorkTransaction; public class SanityCheckEthGetWorkValues implements Condition { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java similarity index 69% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java index 5d96c3c623..113c1d21d6 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.ibft2; +package org.hyperledger.besu.tests.acceptance.dsl.condition.ibft2; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import static tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST; +import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions; import java.util.List; @@ -35,7 +35,7 @@ public class AwaitValidatorSetChange implements Condition { @Override public void verify(final Node node) { - waitFor( + WaitUtils.waitFor( 60, () -> assertThat(node.execute(ibft.createGetValidators(LATEST))) diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java similarity index 67% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java index d90051c8b6..9c405cb653 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.ibft2; +package org.hyperledger.besu.tests.acceptance.dsl.condition.ibft2; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions; import java.util.Map; @@ -33,6 +33,7 @@ public class ExpectProposals implements Condition { @Override public void verify(final Node node) { - waitFor(() -> assertThat(node.execute(ibftTwo.createProposals())).isEqualTo(proposers)); + WaitUtils.waitFor( + () -> assertThat(node.execute(ibftTwo.createProposals())).isEqualTo(proposers)); } } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java similarity index 67% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java index 8b77522872..2ef06c0d6c 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.ibft2; +package org.hyperledger.besu.tests.acceptance.dsl.condition.ibft2; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import static tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions.LATEST; +import static org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions.LATEST; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions; public class ExpectValidators implements Condition { private final Ibft2Transactions ibft; @@ -32,7 +32,7 @@ public class ExpectValidators implements Condition { @Override public void verify(final Node node) { - waitFor( + WaitUtils.waitFor( () -> assertThat(node.execute(ibft.createGetValidators(LATEST))).containsExactly(validators)); } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java similarity index 58% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java index ad625f327f..662858d9ad 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.ibft2; +package org.hyperledger.besu.tests.acceptance.dsl.condition.ibft2; -import static tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST; +import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions; import java.util.Arrays; import java.util.Comparator; @@ -38,20 +38,19 @@ public class Ibft2Conditions { this.ibftTwo = ibftTwo; } - public List validators(final PantheonNode[] nodes) { - final Comparator compareByAddress = - Comparator.comparing(PantheonNode::getAddress); - List pantheonNodes = Arrays.asList(nodes); - pantheonNodes.sort(compareByAddress); - return pantheonNodes; + public List validators(final BesuNode[] nodes) { + final Comparator compareByAddress = Comparator.comparing(BesuNode::getAddress); + List besuNodes = Arrays.asList(nodes); + besuNodes.sort(compareByAddress); + return besuNodes; } - public ExpectValidators validatorsEqual(final PantheonNode... validators) { + public ExpectValidators validatorsEqual(final BesuNode... validators) { return new ExpectValidators(ibftTwo, validatorAddresses(validators)); } - private Address[] validatorAddresses(final PantheonNode[] validators) { - return Arrays.stream(validators).map(PantheonNode::getAddress).sorted().toArray(Address[]::new); + private Address[] validatorAddresses(final BesuNode[] validators) { + return Arrays.stream(validators).map(BesuNode::getAddress).sorted().toArray(Address[]::new); } public Condition awaitValidatorSetChange(final Node node) { @@ -67,19 +66,19 @@ public class Ibft2Conditions { } public static class PendingVotesConfig { - private final Map proposals = new HashMap<>(); + private final Map proposals = new HashMap<>(); private final Ibft2Transactions ibft; private PendingVotesConfig(final Ibft2Transactions ibft) { this.ibft = ibft; } - public PendingVotesConfig addProposal(final PantheonNode node) { + public PendingVotesConfig addProposal(final BesuNode node) { proposals.put(node, true); return this; } - public PendingVotesConfig removeProposal(final PantheonNode node) { + public PendingVotesConfig removeProposal(final BesuNode node) { proposals.put(node, false); return this; } @@ -88,8 +87,7 @@ public class Ibft2Conditions { final Map proposalsAsAddress = this.proposals.entrySet().stream() .collect(Collectors.toMap(p -> p.getKey().getAddress(), Entry::getValue)); - return new tech.pegasys.pantheon.tests.acceptance.dsl.condition.ibft2.ExpectProposals( - ibft, proposalsAsAddress); + return new ExpectProposals(ibft, proposalsAsAddress); } } } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/AwaitLoginResponse.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/AwaitLoginResponse.java similarity index 64% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/AwaitLoginResponse.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/AwaitLoginResponse.java index 85f7c5e580..d2f1d05ffa 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/AwaitLoginResponse.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/AwaitLoginResponse.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.login; +package org.hyperledger.besu.tests.acceptance.dsl.condition.login; -import static org.assertj.core.api.Assertions.assertThat; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.assertj.core.api.Assertions; public class AwaitLoginResponse implements Condition { @@ -29,6 +29,6 @@ public class AwaitLoginResponse implements Condition { @Override public void verify(final Node node) { - WaitUtils.waitFor(() -> assertThat(node.execute(transaction)).isNotNull()); + WaitUtils.waitFor(() -> Assertions.assertThat(node.execute(transaction)).isNotNull()); } } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/ExpectLoginSuccess.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/ExpectLoginSuccess.java similarity index 78% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/ExpectLoginSuccess.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/ExpectLoginSuccess.java index e0eca8abfb..e65a1563a4 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/ExpectLoginSuccess.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/ExpectLoginSuccess.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.login; +package org.hyperledger.besu.tests.acceptance.dsl.condition.login; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.login.LoginSuccessfulTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.login.LoginSuccessfulTransaction; public class ExpectLoginSuccess implements Condition { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/ExpectLoginUnauthorized.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/ExpectLoginUnauthorized.java similarity index 76% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/ExpectLoginUnauthorized.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/ExpectLoginUnauthorized.java index 8ad95e18f7..c6f233ac0e 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/ExpectLoginUnauthorized.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/ExpectLoginUnauthorized.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.login; +package org.hyperledger.besu.tests.acceptance.dsl.condition.login; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.login.LoginUnauthorizedTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.login.LoginUnauthorizedTransaction; public class ExpectLoginUnauthorized implements Condition { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/LoginConditions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/LoginConditions.java similarity index 82% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/LoginConditions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/LoginConditions.java index f984c2da0f..dee4c177b6 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/LoginConditions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/login/LoginConditions.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.login; +package org.hyperledger.besu.tests.acceptance.dsl.condition.login; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.login.LoginTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.login.LoginTransaction; public class LoginConditions { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/miner/MiningStatusCondition.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/miner/MiningStatusCondition.java similarity index 69% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/miner/MiningStatusCondition.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/miner/MiningStatusCondition.java index 797fa1a17b..6433727e30 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/miner/MiningStatusCondition.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/miner/MiningStatusCondition.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.miner; +package org.hyperledger.besu.tests.acceptance.dsl.condition.miner; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthMiningTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthMiningTransaction; public class MiningStatusCondition implements Condition { @@ -31,6 +31,7 @@ public class MiningStatusCondition implements Condition { @Override public void verify(final Node node) { - waitFor(10, () -> assertThat(node.execute(transaction)).isEqualTo(expectedMiningStatus)); + WaitUtils.waitFor( + 10, () -> assertThat(node.execute(transaction)).isEqualTo(expectedMiningStatus)); } } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/AwaitNetPeerCount.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/AwaitNetPeerCount.java similarity index 77% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/AwaitNetPeerCount.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/AwaitNetPeerCount.java index d6ffadb807..8f6ce3265a 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/AwaitNetPeerCount.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/AwaitNetPeerCount.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.net; +package org.hyperledger.besu.tests.acceptance.dsl.condition.net; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.NetPeerCountTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.NetPeerCountTransaction; import java.math.BigInteger; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/AwaitNetPeerCountException.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/AwaitNetPeerCountException.java similarity index 80% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/AwaitNetPeerCountException.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/AwaitNetPeerCountException.java index 05097e7462..9d544a8a80 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/AwaitNetPeerCountException.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/AwaitNetPeerCountException.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.net; +package org.hyperledger.besu.tests.acceptance.dsl.condition.net; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.NetPeerCountTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.NetPeerCountTransaction; public class AwaitNetPeerCountException implements Condition { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java similarity index 85% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java index 32033bb640..32e7ed62db 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.net; +package org.hyperledger.besu.tests.acceptance.dsl.condition.net; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.NetServicesTransaction; -import tech.pegasys.pantheon.util.NetworkUtility; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.NetServicesTransaction; +import org.hyperledger.besu.util.NetworkUtility; import java.util.Arrays; import java.util.Map; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java similarity index 81% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java index 4bac13f3dd..c37b850038 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.net; +package org.hyperledger.besu.tests.acceptance.dsl.condition.net; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.NetServicesTransaction; -import tech.pegasys.pantheon.util.NetworkUtility; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.NetServicesTransaction; +import org.hyperledger.besu.util.NetworkUtility; import java.util.Collections; import java.util.Map; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionException.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionException.java similarity index 83% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionException.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionException.java index 2d69789183..afbf431de1 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionException.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionException.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.net; +package org.hyperledger.besu.tests.acceptance.dsl.condition.net; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.NetVersionTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.NetVersionTransaction; import java.net.ConnectException; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionExceptionWithCause.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionExceptionWithCause.java similarity index 81% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionExceptionWithCause.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionExceptionWithCause.java index d47540bb6a..c47d7d77f5 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionExceptionWithCause.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionExceptionWithCause.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.net; +package org.hyperledger.besu.tests.acceptance.dsl.condition.net; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.NetVersionTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.NetVersionTransaction; public class ExpectNetVersionConnectionExceptionWithCause implements Condition { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionIsNotBlank.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionIsNotBlank.java similarity index 77% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionIsNotBlank.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionIsNotBlank.java index e582d3ddc0..8bf596b89e 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionIsNotBlank.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionIsNotBlank.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.net; +package org.hyperledger.besu.tests.acceptance.dsl.condition.net; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.NetVersionTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.NetVersionTransaction; public class ExpectNetVersionIsNotBlank implements Condition { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionException.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionException.java similarity index 84% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionException.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionException.java index 0be49e8635..35525aad40 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionException.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionException.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.net; +package org.hyperledger.besu.tests.acceptance.dsl.condition.net; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.NetVersionTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.NetVersionTransaction; import org.web3j.protocol.exceptions.ClientConnectionException; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionJsonRpcUnauthorizedResponse.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionJsonRpcUnauthorizedResponse.java similarity index 77% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionJsonRpcUnauthorizedResponse.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionJsonRpcUnauthorizedResponse.java index faa62f403e..b59801e96e 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionJsonRpcUnauthorizedResponse.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionJsonRpcUnauthorizedResponse.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.net; +package org.hyperledger.besu.tests.acceptance.dsl.condition.net; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.NetVersionTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.NetVersionTransaction; public class ExpectNetVersionPermissionJsonRpcUnauthorizedResponse implements Condition { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/NetConditions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/NetConditions.java similarity index 90% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/NetConditions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/NetConditions.java index 3ae2f2fe5e..44b0fdc80a 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/NetConditions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/NetConditions.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.net; +package org.hyperledger.besu.tests.acceptance.dsl.condition.net; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.NetTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.NetTransactions; import java.math.BigInteger; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AccountSmartContractPermissioningConditions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AccountSmartContractPermissioningConditions.java similarity index 79% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AccountSmartContractPermissioningConditions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AccountSmartContractPermissioningConditions.java index 9670828cb0..8f43f9c230 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AccountSmartContractPermissioningConditions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AccountSmartContractPermissioningConditions.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.perm; +package org.hyperledger.besu.tests.acceptance.dsl.condition.perm; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.AccountSmartContractPermissioningTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.AccountSmartContractPermissioningTransactions; public class AccountSmartContractPermissioningConditions { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AddAccountsToWhitelistSuccessfully.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AddAccountsToWhitelistSuccessfully.java similarity index 78% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AddAccountsToWhitelistSuccessfully.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AddAccountsToWhitelistSuccessfully.java index 793b60fddd..36bc34234e 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AddAccountsToWhitelistSuccessfully.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AddAccountsToWhitelistSuccessfully.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.perm; +package org.hyperledger.besu.tests.acceptance.dsl.condition.perm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.PermAddAccountsToWhitelistTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermAddAccountsToWhitelistTransaction; public class AddAccountsToWhitelistSuccessfully implements Condition { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AddNodeSuccess.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AddNodeSuccess.java similarity index 77% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AddNodeSuccess.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AddNodeSuccess.java index b270c9cc9f..5df817d3d4 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AddNodeSuccess.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AddNodeSuccess.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.perm; +package org.hyperledger.besu.tests.acceptance.dsl.condition.perm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.PermAddNodeTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermAddNodeTransaction; public class AddNodeSuccess implements Condition { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/GetExpectedAccountsWhitelist.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/GetExpectedAccountsWhitelist.java similarity index 80% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/GetExpectedAccountsWhitelist.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/GetExpectedAccountsWhitelist.java index aaa5e2e7c1..7060643e8c 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/GetExpectedAccountsWhitelist.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/GetExpectedAccountsWhitelist.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.perm; +package org.hyperledger.besu.tests.acceptance.dsl.condition.perm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.PermGetAccountsWhitelistTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermGetAccountsWhitelistTransaction; import java.util.List; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java similarity index 80% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java index 0270f1b84c..93fb7e3451 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.perm; +package org.hyperledger.besu.tests.acceptance.dsl.condition.perm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.PermGetNodesWhitelistTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermGetNodesWhitelistTransaction; import java.util.List; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningConditions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningConditions.java similarity index 83% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningConditions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningConditions.java index 2b6e304181..637b340957 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningConditions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningConditions.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.perm; +package org.hyperledger.besu.tests.acceptance.dsl.condition.perm; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.NodeSmartContractPermissioningTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.NodeSmartContractPermissioningTransactions; public class NodeSmartContractPermissioningConditions { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/PermissioningConditions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/PermissioningConditions.java similarity index 87% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/PermissioningConditions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/PermissioningConditions.java index 0a8d6705d7..2c638c0811 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/PermissioningConditions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/PermissioningConditions.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.perm; +package org.hyperledger.besu.tests.acceptance.dsl.condition.perm; import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; -import tech.pegasys.pantheon.ethereum.permissioning.WhitelistPersistor.WHITELIST_TYPE; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.RunnableNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.PermissioningTransactions; +import org.hyperledger.besu.ethereum.permissioning.WhitelistPersistor.WHITELIST_TYPE; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermissioningTransactions; import java.net.URI; import java.nio.file.Path; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/RemoveAccountsFromWhitelistSuccessfully.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/RemoveAccountsFromWhitelistSuccessfully.java similarity index 78% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/RemoveAccountsFromWhitelistSuccessfully.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/RemoveAccountsFromWhitelistSuccessfully.java index 145edb804d..f2152c6a5d 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/RemoveAccountsFromWhitelistSuccessfully.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/RemoveAccountsFromWhitelistSuccessfully.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.perm; +package org.hyperledger.besu.tests.acceptance.dsl.condition.perm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.PermRemoveAccountsFromWhitelistTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermRemoveAccountsFromWhitelistTransaction; public class RemoveAccountsFromWhitelistSuccessfully implements Condition { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/RemoveNodeSuccess.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/RemoveNodeSuccess.java similarity index 77% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/RemoveNodeSuccess.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/RemoveNodeSuccess.java index 3038611066..da51ebb3da 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/RemoveNodeSuccess.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/RemoveNodeSuccess.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.perm; +package org.hyperledger.besu.tests.acceptance.dsl.condition.perm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.PermRemoveNodeTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermRemoveNodeTransaction; public class RemoveNodeSuccess implements Condition { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WaitForFalseResponse.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WaitForFalseResponse.java similarity index 64% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WaitForFalseResponse.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WaitForFalseResponse.java index ad6c7257c5..be9069dd12 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WaitForFalseResponse.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WaitForFalseResponse.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.perm; +package org.hyperledger.besu.tests.acceptance.dsl.condition.perm; -import static org.assertj.core.api.Assertions.assertThat; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.assertj.core.api.Assertions; public class WaitForFalseResponse implements Condition { @@ -29,6 +29,6 @@ public class WaitForFalseResponse implements Condition { @Override public void verify(final Node node) { - WaitUtils.waitFor(() -> assertThat(node.execute(transaction)).isFalse()); + WaitUtils.waitFor(() -> Assertions.assertThat(node.execute(transaction)).isFalse()); } } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WaitForTrueResponse.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WaitForTrueResponse.java similarity index 64% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WaitForTrueResponse.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WaitForTrueResponse.java index 2c3e7f0187..4db998cc69 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WaitForTrueResponse.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WaitForTrueResponse.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.perm; +package org.hyperledger.besu.tests.acceptance.dsl.condition.perm; -import static org.assertj.core.api.Assertions.assertThat; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.assertj.core.api.Assertions; public class WaitForTrueResponse implements Condition { @@ -29,6 +29,6 @@ public class WaitForTrueResponse implements Condition { @Override public void verify(final Node node) { - WaitUtils.waitFor(() -> assertThat(node.execute(transaction)).isTrue()); + WaitUtils.waitFor(() -> Assertions.assertThat(node.execute(transaction)).isTrue()); } } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WhiteListContainsKeyAndValue.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WhiteListContainsKeyAndValue.java similarity index 85% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WhiteListContainsKeyAndValue.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WhiteListContainsKeyAndValue.java index 0527ffb097..d5f897d28c 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WhiteListContainsKeyAndValue.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/WhiteListContainsKeyAndValue.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.perm; +package org.hyperledger.besu.tests.acceptance.dsl.condition.perm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.permissioning.WhitelistPersistor; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.ethereum.permissioning.WhitelistPersistor; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; import java.nio.file.Path; import java.util.Collection; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/web3/ExpectWeb3Sha3Equals.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/web3/ExpectWeb3Sha3Equals.java similarity index 78% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/web3/ExpectWeb3Sha3Equals.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/web3/ExpectWeb3Sha3Equals.java index 2a88c3cf16..14b5ddb189 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/web3/ExpectWeb3Sha3Equals.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/web3/ExpectWeb3Sha3Equals.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.web3; +package org.hyperledger.besu.tests.acceptance.dsl.condition.web3; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.web3.Web3Sha3Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.web3.Web3Sha3Transaction; public class ExpectWeb3Sha3Equals implements Condition { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/web3/Web3Conditions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/web3/Web3Conditions.java similarity index 80% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/web3/Web3Conditions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/web3/Web3Conditions.java index fd9d5d2f59..f80cdb24b5 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/web3/Web3Conditions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/condition/web3/Web3Conditions.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.condition.web3; +package org.hyperledger.besu.tests.acceptance.dsl.condition.web3; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.web3.Web3Transactions; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.web3.Web3Transactions; public class Web3Conditions { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/contract/ContractVerifier.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/contract/ContractVerifier.java similarity index 87% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/contract/ContractVerifier.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/contract/ContractVerifier.java index 4b6b20845f..069f7d4be5 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/contract/ContractVerifier.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/contract/ContractVerifier.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.contract; +package org.hyperledger.besu.tests.acceptance.dsl.contract; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; public class ContractVerifier { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/contract/ExpectValidTransactionReceipt.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/contract/ExpectValidTransactionReceipt.java similarity index 96% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/contract/ExpectValidTransactionReceipt.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/contract/ExpectValidTransactionReceipt.java index e6dc1ad7b5..68df9e1f2c 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/contract/ExpectValidTransactionReceipt.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/contract/ExpectValidTransactionReceipt.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.contract; +package org.hyperledger.besu.tests.acceptance.dsl.contract; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; import java.math.BigInteger; import java.util.Optional; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/EthSignerClient.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClient.java similarity index 98% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/EthSignerClient.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClient.java index 620d95baf2..0562f95c06 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/EthSignerClient.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClient.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.ethsigner; +package org.hyperledger.besu.tests.acceptance.dsl.ethsigner; import java.io.IOException; import java.math.BigInteger; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java similarity index 93% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java index f68ab066fc..2a6eeb335b 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.ethsigner; +package org.hyperledger.besu.tests.acceptance.dsl.ethsigner; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.post; @@ -18,8 +18,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.ethsigner.testutil.EthSignerTestHarness; -import tech.pegasys.pantheon.tests.acceptance.dsl.ethsigner.testutil.EthSignerTestHarnessFactory; +import org.hyperledger.besu.tests.acceptance.dsl.ethsigner.testutil.EthSignerTestHarness; +import org.hyperledger.besu.tests.acceptance.dsl.ethsigner.testutil.EthSignerTestHarnessFactory; import java.io.IOException; import java.math.BigInteger; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java similarity index 98% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java index fee56e895e..e8d650e425 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.ethsigner; +package org.hyperledger.besu.tests.acceptance.dsl.ethsigner; import java.math.BigInteger; import java.util.List; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java similarity index 97% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java index 34c89cae36..d96b85b459 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java @@ -10,16 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.ethsigner.testutil; - -import tech.pegasys.ethsigner.core.Config; -import tech.pegasys.ethsigner.core.signing.ChainIdProvider; +package org.hyperledger.besu.tests.acceptance.dsl.ethsigner.testutil; import java.net.InetAddress; import java.nio.file.Path; import java.time.Duration; import org.apache.logging.log4j.Level; +import tech.pegasys.ethsigner.core.Config; +import tech.pegasys.ethsigner.core.signing.ChainIdProvider; public class EthSignerConfig implements Config { private final Level logLevel; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java similarity index 94% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java index 9dff284d29..6b0e1afe9c 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.ethsigner.testutil; +package org.hyperledger.besu.tests.acceptance.dsl.ethsigner.testutil; import java.net.URI; import java.util.Properties; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java similarity index 94% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java index 0b716faa77..cc8e6b2ffa 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java @@ -10,14 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.ethsigner.testutil; +package org.hyperledger.besu.tests.acceptance.dsl.ethsigner.testutil; import static net.consensys.cava.io.file.Files.copyResource; -import tech.pegasys.ethsigner.core.EthSigner; -import tech.pegasys.ethsigner.core.signing.ConfigurationChainId; -import tech.pegasys.ethsigner.signer.filebased.CredentialTransactionSigner; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -35,6 +31,9 @@ import org.apache.logging.log4j.Logger; import org.awaitility.Awaitility; import org.web3j.crypto.CipherException; import org.web3j.crypto.WalletUtils; +import tech.pegasys.ethsigner.core.EthSigner; +import tech.pegasys.ethsigner.core.signing.ConfigurationChainId; +import tech.pegasys.ethsigner.signer.filebased.CredentialTransactionSigner; public class EthSignerTestHarnessFactory { @@ -42,7 +41,7 @@ public class EthSignerTestHarnessFactory { private static final String HOST = "127.0.0.1"; public static EthSignerTestHarness create( - final Path tempDir, final String keyPath, final Integer pantheonPort, final long chainId) + final Path tempDir, final String keyPath, final Integer besuPort, final long chainId) throws IOException, CipherException { final Path keyFilePath = copyResource(keyPath, tempDir.resolve(keyPath)); @@ -51,7 +50,7 @@ public class EthSignerTestHarnessFactory { new EthSignerConfig( Level.DEBUG, InetAddress.getByName(HOST), - pantheonPort, + besuPort, Duration.ofSeconds(10), InetAddress.getByName(HOST), 0, diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNode.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java similarity index 88% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNode.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java index f1ab3beb2c..790044dd92 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNode.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java @@ -10,36 +10,36 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node; +package org.hyperledger.besu.tests.acceptance.dsl.node; import static java.util.Collections.unmodifiableList; import static net.consensys.cava.io.file.Files.copyResource; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.controller.KeyPairUtil; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfiguration; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.NodeConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.admin.AdminRequestFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueRequestFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2.Ibft2RequestFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.login.LoginRequestFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.miner.MinerRequestFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.CustomRequestFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory; +import org.hyperledger.besu.controller.KeyPairUtil; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; +import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.NodeConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.admin.AdminRequestFactory; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueRequestFactory; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2.Ibft2RequestFactory; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.login.LoginRequestFactory; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.miner.MinerRequestFactory; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.CustomRequestFactory; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory; import java.io.File; import java.io.FileInputStream; @@ -71,7 +71,7 @@ import org.web3j.protocol.websocket.WebSocketListener; import org.web3j.protocol.websocket.WebSocketService; import org.web3j.utils.Async; -public class PantheonNode implements NodeConfiguration, RunnableNode, AutoCloseable { +public class BesuNode implements NodeConfiguration, RunnableNode, AutoCloseable { private static final String LOCALHOST = "127.0.0.1"; private static final Logger LOG = getLogger(); @@ -104,7 +104,7 @@ public class PantheonNode implements NodeConfiguration, RunnableNode, AutoClosea private final List extraCLIOptions; private final List staticNodes; - public PantheonNode( + public BesuNode( final String name, final MiningParameters miningParameters, final JsonRpcConfiguration jsonRpcConfiguration, @@ -152,14 +152,14 @@ public class PantheonNode implements NodeConfiguration, RunnableNode, AutoClosea homeDirectory.resolve("plugins").toFile().mkdirs(); copyResource( pluginName + ".jar", homeDirectory.resolve("plugins/" + pluginName + ".jar")); - PantheonNode.this.plugins.add(pluginName); + BesuNode.this.plugins.add(pluginName); } catch (final IOException e) { LOG.error("Could not find plugin \"{}\" in resources", pluginName); } }); this.extraCLIOptions = extraCLIOptions; this.staticNodes = staticNodes; - LOG.info("Created PantheonNode {}", this.toString()); + LOG.info("Created BesuNode {}", this.toString()); } @Override @@ -411,7 +411,7 @@ public class PantheonNode implements NodeConfiguration, RunnableNode, AutoClosea } @Override - public void start(final PantheonNodeRunner runner) { + public void start(final BesuNodeRunner runner) { runner.startNode(this); loadPortsFile(); } @@ -430,11 +430,11 @@ public class PantheonNode implements NodeConfiguration, RunnableNode, AutoClosea private void loadPortsFile() { try (final FileInputStream fis = - new FileInputStream(new File(homeDirectory.toFile(), "pantheon.ports"))) { + new FileInputStream(new File(homeDirectory.toFile(), "besu.ports"))) { portsProperties.load(fis); LOG.info("Ports for node {}: {}", name, portsProperties); } catch (final IOException e) { - throw new RuntimeException("Error reading Pantheon ports file", e); + throw new RuntimeException("Error reading Besu ports file", e); } } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNodeRunner.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNodeRunner.java similarity index 74% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNodeRunner.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNodeRunner.java index 3196053dd7..f76f8a565b 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNodeRunner.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNodeRunner.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node; +package org.hyperledger.besu.tests.acceptance.dsl.node; import java.io.File; import java.nio.file.Files; @@ -20,26 +20,26 @@ import java.util.stream.Stream; import org.awaitility.Awaitility; -public interface PantheonNodeRunner { +public interface BesuNodeRunner { - static PantheonNodeRunner instance() { - if (Boolean.getBoolean("acctests.runPantheonAsProcess")) { - return new ProcessPantheonNodeRunner(); + static BesuNodeRunner instance() { + if (Boolean.getBoolean("acctests.runBesuAsProcess")) { + return new ProcessBesuNodeRunner(); } else { - return new ThreadPantheonNodeRunner(); + return new ThreadBesuNodeRunner(); } } - void startNode(PantheonNode node); + void startNode(BesuNode node); - void stopNode(PantheonNode node); + void stopNode(BesuNode node); void shutdown(); boolean isActive(String nodeName); default void waitForPortsFile(final Path dataDir) { - final File file = new File(dataDir.toFile(), "pantheon.ports"); + final File file = new File(dataDir.toFile(), "besu.ports"); Awaitility.waitAtMost(30, TimeUnit.SECONDS) .until( () -> { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Node.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/Node.java similarity index 77% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Node.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/Node.java index aa26313279..72120cb160 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Node.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/Node.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node; +package org.hyperledger.besu.tests.acceptance.dsl.node; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; public interface Node { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java similarity index 84% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java index 0a5484ea50..cd301be02c 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node; +package org.hyperledger.besu.tests.acceptance.dsl.node; import static java.nio.charset.StandardCharsets.UTF_8; -import tech.pegasys.pantheon.cli.options.NetworkingOptions; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApi; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApis; -import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfiguration; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; -import tech.pegasys.pantheon.plugin.services.metrics.MetricCategory; -import tech.pegasys.pantheon.tests.acceptance.dsl.StaticNodesUtils; +import org.hyperledger.besu.cli.options.NetworkingOptions; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis; +import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.plugin.services.metrics.MetricCategory; +import org.hyperledger.besu.tests.acceptance.dsl.StaticNodesUtils; import java.io.BufferedReader; import java.io.File; @@ -44,24 +44,24 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.awaitility.Awaitility; -public class ProcessPantheonNodeRunner implements PantheonNodeRunner { +public class ProcessBesuNodeRunner implements BesuNodeRunner { private final Logger LOG = LogManager.getLogger(); - private final Logger PROCESS_LOG = LogManager.getLogger("tech.pegasys.pantheon.SubProcessLog"); + private final Logger PROCESS_LOG = LogManager.getLogger("org.hyperledger.besu.SubProcessLog"); - private final Map pantheonProcesses = new HashMap<>(); + private final Map besuProcesses = new HashMap<>(); private final ExecutorService outputProcessorExecutor = Executors.newCachedThreadPool(); - ProcessPantheonNodeRunner() { + ProcessBesuNodeRunner() { Runtime.getRuntime().addShutdownHook(new Thread(this::shutdown)); } @Override - public void startNode(final PantheonNode node) { + public void startNode(final BesuNode node) { final Path dataDir = node.homeDirectory(); final List params = new ArrayList<>(); - params.add("build/install/pantheon/bin/pantheon"); + params.add("build/install/besu/bin/besu"); params.add("--data-path"); params.add(dataDir.toAbsolutePath().toString()); @@ -231,7 +231,7 @@ public class ProcessPantheonNodeRunner implements PantheonNodeRunner { params.add("--key-value-storage"); params.add("rocksdb"); - LOG.info("Creating pantheon process with params {}", params); + LOG.info("Creating besu process with params {}", params); final ProcessBuilder processBuilder = new ProcessBuilder(params) .directory(new File(System.getProperty("user.dir")).getParentFile()) @@ -241,22 +241,22 @@ public class ProcessPantheonNodeRunner implements PantheonNodeRunner { processBuilder .environment() .put( - "PANTHEON_OPTS", - "-Dpantheon.plugins.dir=" + dataDir.resolve("plugins").toAbsolutePath().toString()); + "BESU_OPTS", + "-Dbesu.plugins.dir=" + dataDir.resolve("plugins").toAbsolutePath().toString()); } try { final Process process = processBuilder.start(); outputProcessorExecutor.execute(() -> printOutput(node, process)); - pantheonProcesses.put(node.getName(), process); + besuProcesses.put(node.getName(), process); } catch (final IOException e) { - LOG.error("Error starting PantheonNode process", e); + LOG.error("Error starting BesuNode process", e); } waitForPortsFile(dataDir); } - private void printOutput(final PantheonNode node, final Process process) { + private void printOutput(final BesuNode node, final Process process) { try (final BufferedReader in = new BufferedReader(new InputStreamReader(process.getInputStream(), UTF_8))) { String line = in.readLine(); @@ -269,7 +269,7 @@ public class ProcessPantheonNodeRunner implements PantheonNodeRunner { } } - private Path createGenesisFile(final PantheonNode node, final String genesisConfig) { + private Path createGenesisFile(final BesuNode node, final String genesisConfig) { try { final Path genesisFile = Files.createTempFile(node.homeDirectory(), "genesis", ""); genesisFile.toFile().deleteOnExit(); @@ -280,7 +280,7 @@ public class ProcessPantheonNodeRunner implements PantheonNodeRunner { } } - private void createStaticNodes(final PantheonNode node) { + private void createStaticNodes(final BesuNode node) { StaticNodesUtils.createStaticNodesFile(node.homeDirectory(), node.getStaticNodes()); } @@ -289,18 +289,18 @@ public class ProcessPantheonNodeRunner implements PantheonNodeRunner { } @Override - public void stopNode(final PantheonNode node) { + public void stopNode(final BesuNode node) { node.stop(); - if (pantheonProcesses.containsKey(node.getName())) { - final Process process = pantheonProcesses.get(node.getName()); - killPantheonProcess(node.getName(), process); + if (besuProcesses.containsKey(node.getName())) { + final Process process = besuProcesses.get(node.getName()); + killBesuProcess(node.getName(), process); } } @Override public synchronized void shutdown() { - final HashMap localMap = new HashMap<>(pantheonProcesses); - localMap.forEach(this::killPantheonProcess); + final HashMap localMap = new HashMap<>(besuProcesses); + localMap.forEach(this::killBesuProcess); outputProcessorExecutor.shutdown(); try { if (!outputProcessorExecutor.awaitTermination(5, TimeUnit.SECONDS)) { @@ -314,11 +314,11 @@ public class ProcessPantheonNodeRunner implements PantheonNodeRunner { @Override public boolean isActive(final String nodeName) { - final Process process = pantheonProcesses.get(nodeName); + final Process process = besuProcesses.get(nodeName); return process != null && process.isAlive(); } - private void killPantheonProcess(final String name, final Process process) { + private void killBesuProcess(final String name, final Process process) { LOG.info("Killing " + name + " process"); Awaitility.waitAtMost(30, TimeUnit.SECONDS) @@ -326,10 +326,10 @@ public class ProcessPantheonNodeRunner implements PantheonNodeRunner { () -> { if (process.isAlive()) { process.destroy(); - pantheonProcesses.remove(name); + besuProcesses.remove(name); return false; } else { - pantheonProcesses.remove(name); + besuProcesses.remove(name); return true; } }); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/RunnableNode.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/RunnableNode.java similarity index 73% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/RunnableNode.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/RunnableNode.java index 85b1cb0dc3..78a985b547 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/RunnableNode.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/RunnableNode.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node; +package org.hyperledger.besu.tests.acceptance.dsl.node; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.NodeConfiguration; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.NodeConfiguration; import java.net.URI; @@ -24,7 +24,7 @@ public interface RunnableNode extends Node { void close(); - void start(PantheonNodeRunner runner); + void start(BesuNodeRunner runner); NodeConfiguration getConfiguration(); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java similarity index 57% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java index 85e29828ea..f3a4265ab8 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java @@ -10,36 +10,36 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node; - -import static tech.pegasys.pantheon.cli.config.NetworkName.DEV; - -import tech.pegasys.pantheon.Runner; -import tech.pegasys.pantheon.RunnerBuilder; -import tech.pegasys.pantheon.cli.config.EthNetworkConfig; -import tech.pegasys.pantheon.controller.KeyPairUtil; -import tech.pegasys.pantheon.controller.PantheonController; -import tech.pegasys.pantheon.controller.PantheonControllerBuilder; -import tech.pegasys.pantheon.ethereum.api.graphql.GraphQLConfiguration; -import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueStorageProvider; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder; -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; -import tech.pegasys.pantheon.metrics.prometheus.PrometheusMetricsSystem; -import tech.pegasys.pantheon.plugin.services.PantheonConfiguration; -import tech.pegasys.pantheon.plugin.services.PantheonEvents; -import tech.pegasys.pantheon.plugin.services.PicoCLIOptions; -import tech.pegasys.pantheon.plugin.services.StorageService; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.RocksDBPlugin; -import tech.pegasys.pantheon.services.PantheonConfigurationImpl; -import tech.pegasys.pantheon.services.PantheonEventsImpl; -import tech.pegasys.pantheon.services.PantheonPluginContextImpl; -import tech.pegasys.pantheon.services.PicoCLIOptionsImpl; -import tech.pegasys.pantheon.services.StorageServiceImpl; +package org.hyperledger.besu.tests.acceptance.dsl.node; + +import static org.hyperledger.besu.cli.config.NetworkName.DEV; + +import org.hyperledger.besu.Runner; +import org.hyperledger.besu.RunnerBuilder; +import org.hyperledger.besu.cli.config.EthNetworkConfig; +import org.hyperledger.besu.controller.BesuController; +import org.hyperledger.besu.controller.BesuControllerBuilder; +import org.hyperledger.besu.controller.KeyPairUtil; +import org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration; +import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProvider; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder; +import org.hyperledger.besu.metrics.ObservableMetricsSystem; +import org.hyperledger.besu.metrics.prometheus.PrometheusMetricsSystem; +import org.hyperledger.besu.plugin.services.BesuConfiguration; +import org.hyperledger.besu.plugin.services.BesuEvents; +import org.hyperledger.besu.plugin.services.PicoCLIOptions; +import org.hyperledger.besu.plugin.services.StorageService; +import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBPlugin; +import org.hyperledger.besu.services.BesuConfigurationImpl; +import org.hyperledger.besu.services.BesuEventsImpl; +import org.hyperledger.besu.services.BesuPluginContextImpl; +import org.hyperledger.besu.services.PicoCLIOptionsImpl; +import org.hyperledger.besu.services.StorageServiceImpl; import java.io.File; import java.io.IOException; @@ -61,22 +61,22 @@ import org.apache.logging.log4j.Logger; import picocli.CommandLine; import picocli.CommandLine.Model.CommandSpec; -public class ThreadPantheonNodeRunner implements PantheonNodeRunner { +public class ThreadBesuNodeRunner implements BesuNodeRunner { private final Logger LOG = LogManager.getLogger(); - private final Map pantheonRunners = new HashMap<>(); + private final Map besuRunners = new HashMap<>(); private ExecutorService nodeExecutor = Executors.newCachedThreadPool(); - private final Map pantheonPluginContextMap = new HashMap<>(); + private final Map besuPluginContextMap = new HashMap<>(); - private PantheonPluginContextImpl buildPluginContext( - final PantheonNode node, + private BesuPluginContextImpl buildPluginContext( + final BesuNode node, final StorageServiceImpl storageService, - final PantheonConfiguration commonPluginConfiguration) { + final BesuConfiguration commonPluginConfiguration) { final CommandLine commandLine = new CommandLine(CommandSpec.create()); - final PantheonPluginContextImpl pantheonPluginContext = new PantheonPluginContextImpl(); - pantheonPluginContext.addService(StorageService.class, storageService); - pantheonPluginContext.addService(PicoCLIOptions.class, new PicoCLIOptionsImpl(commandLine)); + final BesuPluginContextImpl besuPluginContext = new BesuPluginContextImpl(); + besuPluginContext.addService(StorageService.class, storageService); + besuPluginContext.addService(PicoCLIOptions.class, new PicoCLIOptionsImpl(commandLine)); final Path pluginsPath = node.homeDirectory().resolve("plugins"); final File pluginsDirFile = pluginsPath.toFile(); @@ -84,30 +84,30 @@ public class ThreadPantheonNodeRunner implements PantheonNodeRunner { pluginsDirFile.mkdirs(); pluginsDirFile.deleteOnExit(); } - System.setProperty("pantheon.plugins.dir", pluginsPath.toString()); - pantheonPluginContext.registerPlugins(pluginsPath); + System.setProperty("besu.plugins.dir", pluginsPath.toString()); + besuPluginContext.registerPlugins(pluginsPath); commandLine.parseArgs(node.getConfiguration().getExtraCLIOptions().toArray(new String[0])); - pantheonPluginContext.addService(PantheonConfiguration.class, commonPluginConfiguration); + besuPluginContext.addService(BesuConfiguration.class, commonPluginConfiguration); // register built-in plugins - new RocksDBPlugin().register(pantheonPluginContext); + new RocksDBPlugin().register(besuPluginContext); - return pantheonPluginContext; + return besuPluginContext; } @Override - public void startNode(final PantheonNode node) { + public void startNode(final BesuNode node) { if (nodeExecutor == null || nodeExecutor.isShutdown()) { nodeExecutor = Executors.newCachedThreadPool(); } final StorageServiceImpl storageService = new StorageServiceImpl(); - final PantheonConfiguration commonPluginConfiguration = - new PantheonConfigurationImpl(Files.createTempDir().toPath()); - final PantheonPluginContextImpl pantheonPluginContext = - pantheonPluginContextMap.computeIfAbsent( + final BesuConfiguration commonPluginConfiguration = + new BesuConfigurationImpl(Files.createTempDir().toPath()); + final BesuPluginContextImpl besuPluginContext = + besuPluginContextMap.computeIfAbsent( node, n -> buildPluginContext(node, storageService, commonPluginConfiguration)); final ObservableMetricsSystem metricsSystem = @@ -121,8 +121,8 @@ public class ThreadPantheonNodeRunner implements PantheonNodeRunner { .setBootNodes(bootnodes); node.getConfiguration().getGenesisConfig().ifPresent(networkConfigBuilder::setGenesisConfig); final EthNetworkConfig ethNetworkConfig = networkConfigBuilder.build(); - final PantheonControllerBuilder builder = - new PantheonController.Builder().fromEthNetworkConfig(ethNetworkConfig); + final BesuControllerBuilder builder = + new BesuController.Builder().fromEthNetworkConfig(ethNetworkConfig); final KeyValueStorageProvider storageProvider = new KeyValueStorageProviderBuilder() @@ -131,9 +131,9 @@ public class ThreadPantheonNodeRunner implements PantheonNodeRunner { .withMetricsSystem(metricsSystem) .build(); - final PantheonController pantheonController; + final BesuController besuController; try { - pantheonController = + besuController = builder .synchronizerConfiguration(new SynchronizerConfiguration.Builder().build()) .dataDirectory(node.homeDirectory()) @@ -148,7 +148,7 @@ public class ThreadPantheonNodeRunner implements PantheonNodeRunner { .storageProvider(storageProvider) .build(); } catch (final IOException e) { - throw new RuntimeException("Error building PantheonController", e); + throw new RuntimeException("Error building BesuController", e); } final RunnerBuilder runnerBuilder = new RunnerBuilder(); @@ -159,18 +159,18 @@ public class ThreadPantheonNodeRunner implements PantheonNodeRunner { runnerBuilder.permissioningConfiguration(permissioningConfiguration); } - pantheonPluginContext.addService( - PantheonEvents.class, - new PantheonEventsImpl( - pantheonController.getProtocolManager().getBlockBroadcaster(), - pantheonController.getTransactionPool(), - pantheonController.getSyncState())); - pantheonPluginContext.startPlugins(); + besuPluginContext.addService( + BesuEvents.class, + new BesuEventsImpl( + besuController.getProtocolManager().getBlockBroadcaster(), + besuController.getTransactionPool(), + besuController.getSyncState())); + besuPluginContext.startPlugins(); final Runner runner = runnerBuilder .vertx(Vertx.vertx()) - .pantheonController(pantheonController) + .besuController(besuController) .ethNetworkConfig(ethNetworkConfig) .discovery(node.isDiscoveryEnabled()) .p2pAdvertisedHost(node.getHostName()) @@ -192,12 +192,12 @@ public class ThreadPantheonNodeRunner implements PantheonNodeRunner { runner.start(); - pantheonRunners.put(node.getName(), runner); + besuRunners.put(node.getName(), runner); } @Override - public void stopNode(final PantheonNode node) { - final PantheonPluginContextImpl pluginContext = pantheonPluginContextMap.remove(node); + public void stopNode(final BesuNode node) { + final BesuPluginContextImpl pluginContext = besuPluginContextMap.remove(node); if (pluginContext != null) { pluginContext.stopPlugins(); } @@ -208,11 +208,11 @@ public class ThreadPantheonNodeRunner implements PantheonNodeRunner { @Override public void shutdown() { // stop all plugins from pluginContext - pantheonPluginContextMap.values().forEach(PantheonPluginContextImpl::stopPlugins); - pantheonPluginContextMap.clear(); + besuPluginContextMap.values().forEach(BesuPluginContextImpl::stopPlugins); + besuPluginContextMap.clear(); - // iterate over a copy of the set so that pantheonRunner can be updated when a runner is killed - new HashSet<>(pantheonRunners.keySet()).forEach(this::killRunner); + // iterate over a copy of the set so that besuRunner can be updated when a runner is killed + new HashSet<>(besuRunners.keySet()).forEach(this::killRunner); try { nodeExecutor.shutdownNow(); if (!nodeExecutor.awaitTermination(5, TimeUnit.SECONDS)) { @@ -225,16 +225,16 @@ public class ThreadPantheonNodeRunner implements PantheonNodeRunner { @Override public boolean isActive(final String nodeName) { - return pantheonRunners.containsKey(nodeName); + return besuRunners.containsKey(nodeName); } private void killRunner(final String name) { LOG.info("Killing " + name + " runner"); - if (pantheonRunners.containsKey(name)) { + if (besuRunners.containsKey(name)) { try { - pantheonRunners.get(name).close(); - pantheonRunners.remove(name); + besuRunners.get(name).close(); + besuRunners.remove(name); } catch (final Exception e) { throw new RuntimeException("Error shutting down node " + name, e); } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/Cluster.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/Cluster.java similarity index 79% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/Cluster.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/Cluster.java index cd5911fd9d..a9f9211ded 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/Cluster.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/Cluster.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster; +package org.hyperledger.besu.tests.acceptance.dsl.node.cluster; import static java.util.Collections.emptyList; import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.net.NetConditions; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNodeRunner; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.RunnableNode; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.condition.net.NetConditions; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNodeRunner; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode; import java.net.URI; import java.util.ArrayList; @@ -38,27 +38,27 @@ public class Cluster implements AutoCloseable { private static final Logger LOG = LogManager.getLogger(); private final Map nodes = new HashMap<>(); - private final PantheonNodeRunner pantheonNodeRunner; + private final BesuNodeRunner besuNodeRunner; private final NetConditions net; private final ClusterConfiguration clusterConfiguration; private List originalNodes = emptyList(); private List bootnodes = new ArrayList<>(); public Cluster(final NetConditions net) { - this(new ClusterConfigurationBuilder().build(), net, PantheonNodeRunner.instance()); + this(new ClusterConfigurationBuilder().build(), net, BesuNodeRunner.instance()); } public Cluster(final ClusterConfiguration clusterConfiguration, final NetConditions net) { - this(clusterConfiguration, net, PantheonNodeRunner.instance()); + this(clusterConfiguration, net, BesuNodeRunner.instance()); } public Cluster( final ClusterConfiguration clusterConfiguration, final NetConditions net, - final PantheonNodeRunner pantheonNodeRunner) { + final BesuNodeRunner besuNodeRunner) { this.clusterConfiguration = clusterConfiguration; this.net = net; - this.pantheonNodeRunner = pantheonNodeRunner; + this.besuNodeRunner = besuNodeRunner; } public void start(final Node... nodes) { @@ -142,23 +142,22 @@ public class Cluster implements AutoCloseable { node.getName(), node.getNodeId().substring(0, 4), node.getNodeId().substring(124)); - node.start(pantheonNodeRunner); + node.start(besuNodeRunner); } public void stop() { - // stops nodes but do not shutdown pantheonNodeRunner + // stops nodes but do not shutdown besuNodeRunner for (final RunnableNode node : nodes.values()) { - if (node instanceof PantheonNode) { - pantheonNodeRunner.stopNode( - (PantheonNode) node); // pantheonNodeRunner.stopNode also calls node.stop + if (node instanceof BesuNode) { + besuNodeRunner.stopNode((BesuNode) node); // besuNodeRunner.stopNode also calls node.stop } else { node.stop(); } } } - public void stopNode(final PantheonNode node) { - pantheonNodeRunner.stopNode(node); + public void stopNode(final BesuNode node) { + besuNodeRunner.stopNode(node); } @Override @@ -167,7 +166,7 @@ public class Cluster implements AutoCloseable { for (final RunnableNode node : nodes.values()) { node.close(); } - pantheonNodeRunner.shutdown(); + besuNodeRunner.shutdown(); } public void verify(final Condition expected) { @@ -178,7 +177,7 @@ public class Cluster implements AutoCloseable { public void verifyOnActiveNodes(final Condition condition) { nodes.values().stream() - .filter(node -> pantheonNodeRunner.isActive(node.getName())) + .filter(node -> besuNodeRunner.isActive(node.getName())) .forEach(condition::verify); } } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/ClusterConfiguration.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/ClusterConfiguration.java similarity index 92% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/ClusterConfiguration.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/ClusterConfiguration.java index ad5f19c788..90a661568f 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/ClusterConfiguration.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/ClusterConfiguration.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster; +package org.hyperledger.besu.tests.acceptance.dsl.node.cluster; public class ClusterConfiguration { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java similarity index 93% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java index b553422e79..47c472cd32 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster; +package org.hyperledger.besu.tests.acceptance.dsl.node.cluster; public class ClusterConfigurationBuilder { private boolean awaitPeerDiscovery = true; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeConfiguration.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfiguration.java similarity index 86% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeConfiguration.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfiguration.java index 311da9150d..348609fda2 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeConfiguration.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfiguration.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration; +package org.hyperledger.besu.tests.acceptance.dsl.node.configuration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfiguration; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; +import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider; import java.util.List; import java.util.Optional; -public class PantheonNodeConfiguration { +public class BesuNodeConfiguration { private final String name; private final MiningParameters miningParameters; @@ -43,7 +43,7 @@ public class PantheonNodeConfiguration { private final List extraCLIOptions; private final List staticNodes; - public PantheonNodeConfiguration( + public BesuNodeConfiguration( final String name, final MiningParameters miningParameters, final JsonRpcConfiguration jsonRpcConfiguration, diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeConfigurationBuilder.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java similarity index 68% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeConfigurationBuilder.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java index 0f32a6408d..b5fe00a2bf 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeConfigurationBuilder.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration; +package org.hyperledger.besu.tests.acceptance.dsl.node.configuration; import static java.util.Collections.singletonList; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApis; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.core.MiningParametersTestBuilder; -import tech.pegasys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfiguration; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.core.MiningParametersTestBuilder; +import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; +import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider; import java.net.URISyntaxException; import java.nio.file.Paths; @@ -31,7 +31,7 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -public class PantheonNodeConfigurationBuilder { +public class BesuNodeConfigurationBuilder { private String name; private MiningParameters miningParameters = @@ -52,30 +52,30 @@ public class PantheonNodeConfigurationBuilder { private List extraCLIOptions = new ArrayList<>(); private List staticNodes = new ArrayList<>(); - public PantheonNodeConfigurationBuilder() { + public BesuNodeConfigurationBuilder() { // Check connections more frequently during acceptance tests to cut down on // intermittent failures due to the fact that we're running over a real network networkingConfiguration.setInitiateConnectionsFrequency(5); } - public PantheonNodeConfigurationBuilder name(final String name) { + public BesuNodeConfigurationBuilder name(final String name) { this.name = name; return this; } - public PantheonNodeConfigurationBuilder miningEnabled() { + public BesuNodeConfigurationBuilder miningEnabled() { this.miningParameters = new MiningParametersTestBuilder().enabled(true).build(); this.jsonRpcConfiguration.addRpcApi(RpcApis.MINER); return this; } - public PantheonNodeConfigurationBuilder jsonRpcConfiguration( + public BesuNodeConfigurationBuilder jsonRpcConfiguration( final JsonRpcConfiguration jsonRpcConfiguration) { this.jsonRpcConfiguration = jsonRpcConfiguration; return this; } - public PantheonNodeConfigurationBuilder jsonRpcEnabled() { + public BesuNodeConfigurationBuilder jsonRpcEnabled() { this.jsonRpcConfiguration.setEnabled(true); this.jsonRpcConfiguration.setPort(0); this.jsonRpcConfiguration.setHostsWhitelist(singletonList("*")); @@ -83,7 +83,7 @@ public class PantheonNodeConfigurationBuilder { return this; } - public PantheonNodeConfigurationBuilder metricsEnabled() { + public BesuNodeConfigurationBuilder metricsEnabled() { this.metricsConfiguration = MetricsConfiguration.builder() .enabled(true) @@ -94,13 +94,13 @@ public class PantheonNodeConfigurationBuilder { return this; } - public PantheonNodeConfigurationBuilder enablePrivateTransactions() { + public BesuNodeConfigurationBuilder enablePrivateTransactions() { this.jsonRpcConfiguration.addRpcApi(RpcApis.EEA); this.jsonRpcConfiguration.addRpcApi(RpcApis.PRIV); return this; } - public PantheonNodeConfigurationBuilder jsonRpcAuthenticationEnabled() throws URISyntaxException { + public BesuNodeConfigurationBuilder jsonRpcAuthenticationEnabled() throws URISyntaxException { final String authTomlPath = Paths.get(ClassLoader.getSystemResource("authentication/auth.toml").toURI()) .toAbsolutePath() @@ -112,19 +112,19 @@ public class PantheonNodeConfigurationBuilder { return this; } - public PantheonNodeConfigurationBuilder webSocketConfiguration( + public BesuNodeConfigurationBuilder webSocketConfiguration( final WebSocketConfiguration webSocketConfiguration) { this.webSocketConfiguration = webSocketConfiguration; return this; } - public PantheonNodeConfigurationBuilder metricsConfiguration( + public BesuNodeConfigurationBuilder metricsConfiguration( final MetricsConfiguration metricsConfiguration) { this.metricsConfiguration = metricsConfiguration; return this; } - public PantheonNodeConfigurationBuilder webSocketEnabled() { + public BesuNodeConfigurationBuilder webSocketEnabled() { final WebSocketConfiguration config = WebSocketConfiguration.createDefault(); config.setEnabled(true); config.setPort(0); @@ -134,13 +134,12 @@ public class PantheonNodeConfigurationBuilder { return this; } - public PantheonNodeConfigurationBuilder bootnodeEligible(final boolean bootnodeEligible) { + public BesuNodeConfigurationBuilder bootnodeEligible(final boolean bootnodeEligible) { this.bootnodeEligible = bootnodeEligible; return this; } - public PantheonNodeConfigurationBuilder webSocketAuthenticationEnabled() - throws URISyntaxException { + public BesuNodeConfigurationBuilder webSocketAuthenticationEnabled() throws URISyntaxException { final String authTomlPath = Paths.get(ClassLoader.getSystemResource("authentication/auth.toml").toURI()) .toAbsolutePath() @@ -152,62 +151,62 @@ public class PantheonNodeConfigurationBuilder { return this; } - public PantheonNodeConfigurationBuilder permissioningConfiguration( + public BesuNodeConfigurationBuilder permissioningConfiguration( final PermissioningConfiguration permissioningConfiguration) { this.permissioningConfiguration = Optional.of(permissioningConfiguration); return this; } - public PantheonNodeConfigurationBuilder keyFilePath(final String keyFilePath) { + public BesuNodeConfigurationBuilder keyFilePath(final String keyFilePath) { this.keyFilePath = Optional.of(keyFilePath); return this; } - public PantheonNodeConfigurationBuilder devMode(final boolean devMode) { + public BesuNodeConfigurationBuilder devMode(final boolean devMode) { this.devMode = devMode; return this; } - public PantheonNodeConfigurationBuilder genesisConfigProvider( + public BesuNodeConfigurationBuilder genesisConfigProvider( final GenesisConfigurationProvider genesisConfigProvider) { this.genesisConfigProvider = genesisConfigProvider; return this; } - public PantheonNodeConfigurationBuilder p2pEnabled(final Boolean p2pEnabled) { + public BesuNodeConfigurationBuilder p2pEnabled(final Boolean p2pEnabled) { this.p2pEnabled = p2pEnabled; return this; } - public PantheonNodeConfigurationBuilder discoveryEnabled(final boolean discoveryEnabled) { + public BesuNodeConfigurationBuilder discoveryEnabled(final boolean discoveryEnabled) { this.discoveryEnabled = discoveryEnabled; return this; } - public PantheonNodeConfigurationBuilder plugins(final List plugins) { + public BesuNodeConfigurationBuilder plugins(final List plugins) { this.plugins.clear(); this.plugins.addAll(plugins); return this; } - public PantheonNodeConfigurationBuilder extraCLIOptions(final List extraCLIOptions) { + public BesuNodeConfigurationBuilder extraCLIOptions(final List extraCLIOptions) { this.extraCLIOptions.clear(); this.extraCLIOptions.addAll(extraCLIOptions); return this; } - public PantheonNodeConfigurationBuilder revertReasonEnabled() { + public BesuNodeConfigurationBuilder revertReasonEnabled() { this.revertReasonEnabled = true; return this; } - public PantheonNodeConfigurationBuilder staticNodes(final List staticNodes) { + public BesuNodeConfigurationBuilder staticNodes(final List staticNodes) { this.staticNodes = staticNodes; return this; } - public PantheonNodeConfiguration build() { - return new PantheonNodeConfiguration( + public BesuNodeConfiguration build() { + return new BesuNodeConfiguration( name, miningParameters, jsonRpcConfiguration, diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeFactory.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java similarity index 67% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeFactory.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java index dca15be92d..e83e5036ba 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeFactory.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration; +package org.hyperledger.besu.tests.acceptance.dsl.node.configuration; import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApi; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.RunnableNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationFactory; import java.io.IOException; import java.net.URI; @@ -29,13 +29,13 @@ import java.net.URISyntaxException; import java.util.List; import java.util.Optional; -public class PantheonNodeFactory { +public class BesuNodeFactory { private final GenesisConfigurationFactory genesis = new GenesisConfigurationFactory(); private final NodeConfigurationFactory node = new NodeConfigurationFactory(); - public PantheonNode create(final PantheonNodeConfiguration config) throws IOException { - return new PantheonNode( + public BesuNode create(final BesuNodeConfiguration config) throws IOException { + return new BesuNode( config.getName(), config.getMiningParameters(), config.getJsonRpcConfiguration(), @@ -55,9 +55,9 @@ public class PantheonNodeFactory { config.getStaticNodes()); } - public PantheonNode createMinerNode(final String name) throws IOException { + public BesuNode createMinerNode(final String name) throws IOException { return create( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .miningEnabled() .jsonRpcEnabled() @@ -65,9 +65,9 @@ public class PantheonNodeFactory { .build()); } - public PantheonNode createMinerNodeWithRevertReasonEnabled(final String name) throws IOException { + public BesuNode createMinerNodeWithRevertReasonEnabled(final String name) throws IOException { return create( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .miningEnabled() .jsonRpcEnabled() @@ -76,18 +76,14 @@ public class PantheonNodeFactory { .build()); } - public PantheonNode createArchiveNode(final String name) throws IOException { + public BesuNode createArchiveNode(final String name) throws IOException { return create( - new PantheonNodeConfigurationBuilder() - .name(name) - .jsonRpcEnabled() - .webSocketEnabled() - .build()); + new BesuNodeConfigurationBuilder().name(name).jsonRpcEnabled().webSocketEnabled().build()); } public Node createArchiveNodeThatMustNotBeTheBootnode(final String name) throws IOException { return create( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .jsonRpcEnabled() .webSocketEnabled() @@ -95,10 +91,10 @@ public class PantheonNodeFactory { .build()); } - public PantheonNode createArchiveNodeWithDiscoveryDisabledAndAdmin(final String name) + public BesuNode createArchiveNodeWithDiscoveryDisabledAndAdmin(final String name) throws IOException { return create( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .jsonRpcConfiguration(node.jsonRpcConfigWithAdmin()) .webSocketEnabled() @@ -106,13 +102,13 @@ public class PantheonNodeFactory { .build()); } - public PantheonNode createArchiveNodeNetServicesEnabled(final String name) throws IOException { + public BesuNode createArchiveNodeNetServicesEnabled(final String name) throws IOException { // TODO: Enable metrics coverage in the acceptance tests. See PIE-1606 // final MetricsConfiguration metricsConfiguration = MetricsConfiguration.createDefault(); // metricsConfiguration.setEnabled(true); // metricsConfiguration.setPort(0); return create( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) // .setMetricsConfiguration(metricsConfiguration) .jsonRpcConfiguration(node.jsonRpcConfigWithAdmin()) @@ -121,19 +117,19 @@ public class PantheonNodeFactory { .build()); } - public PantheonNode createArchiveNodeNetServicesDisabled(final String name) throws IOException { + public BesuNode createArchiveNodeNetServicesDisabled(final String name) throws IOException { return create( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .jsonRpcConfiguration(node.jsonRpcConfigWithAdmin()) .p2pEnabled(false) .build()); } - public PantheonNode createArchiveNodeWithAuthentication(final String name) + public BesuNode createArchiveNodeWithAuthentication(final String name) throws IOException, URISyntaxException { return create( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .jsonRpcEnabled() .jsonRpcAuthenticationEnabled() @@ -141,63 +137,62 @@ public class PantheonNodeFactory { .build()); } - public PantheonNode createArchiveNodeWithAuthenticationOverWebSocket(final String name) + public BesuNode createArchiveNodeWithAuthenticationOverWebSocket(final String name) throws IOException, URISyntaxException { return create( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .webSocketEnabled() .webSocketAuthenticationEnabled() .build()); } - public PantheonNode createNodeWithP2pDisabled(final String name) throws IOException { + public BesuNode createNodeWithP2pDisabled(final String name) throws IOException { return create( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .p2pEnabled(false) .jsonRpcConfiguration(node.createJsonRpcEnabledConfig()) .build()); } - public PantheonNode createArchiveNodeWithRpcDisabled(final String name) throws IOException { - return create(new PantheonNodeConfigurationBuilder().name(name).build()); + public BesuNode createArchiveNodeWithRpcDisabled(final String name) throws IOException { + return create(new BesuNodeConfigurationBuilder().name(name).build()); } - public PantheonNode createPluginsNode( + public BesuNode createPluginsNode( final String name, final List plugins, final List extraCLIOptions) throws IOException { return create( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .plugins(plugins) .extraCLIOptions(extraCLIOptions) .build()); } - public PantheonNode createArchiveNodeWithRpcApis( - final String name, final RpcApi... enabledRpcApis) throws IOException { + public BesuNode createArchiveNodeWithRpcApis(final String name, final RpcApi... enabledRpcApis) + throws IOException { final JsonRpcConfiguration jsonRpcConfig = node.createJsonRpcEnabledConfig(); jsonRpcConfig.setRpcApis(asList(enabledRpcApis)); final WebSocketConfiguration webSocketConfig = node.createWebSocketEnabledConfig(); webSocketConfig.setRpcApis(asList(enabledRpcApis)); return create( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .jsonRpcConfiguration(jsonRpcConfig) .webSocketConfiguration(webSocketConfig) .build()); } - public PantheonNode createNodeWithNoDiscovery(final String name) throws IOException { - return create( - new PantheonNodeConfigurationBuilder().name(name).discoveryEnabled(false).build()); + public BesuNode createNodeWithNoDiscovery(final String name) throws IOException { + return create(new BesuNodeConfigurationBuilder().name(name).discoveryEnabled(false).build()); } - public PantheonNode createCliqueNode(final String name) throws IOException { + public BesuNode createCliqueNode(final String name) throws IOException { return create( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .miningEnabled() .jsonRpcConfiguration(node.createJsonRpcWithCliqueEnabledConfig()) @@ -207,9 +202,9 @@ public class PantheonNodeFactory { .build()); } - public PantheonNode createIbft2Node(final String name) throws IOException { + public BesuNode createIbft2Node(final String name) throws IOException { return create( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .miningEnabled() .jsonRpcConfiguration(node.createJsonRpcWithIbft2EnabledConfig()) @@ -219,20 +214,20 @@ public class PantheonNodeFactory { .build()); } - public PantheonNode createCustomGenesisNode( + public BesuNode createCustomGenesisNode( final String name, final String genesisPath, final boolean canBeBootnode) throws IOException { return createCustomGenesisNode(name, genesisPath, canBeBootnode, false); } - public PantheonNode createCustomGenesisNode( + public BesuNode createCustomGenesisNode( final String name, final String genesisPath, final boolean canBeBootnode, final boolean mining) throws IOException { final String genesisFile = genesis.readGenesisFile(genesisPath); - final PantheonNodeConfigurationBuilder builder = - new PantheonNodeConfigurationBuilder() + final BesuNodeConfigurationBuilder builder = + new BesuNodeConfigurationBuilder() .name(name) .jsonRpcEnabled() .webSocketEnabled() @@ -247,11 +242,11 @@ public class PantheonNodeFactory { return create(builder.build()); } - public PantheonNode createCliqueNodeWithValidators(final String name, final String... validators) + public BesuNode createCliqueNodeWithValidators(final String name, final String... validators) throws IOException { return create( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .miningEnabled() .jsonRpcConfiguration(node.createJsonRpcWithCliqueEnabledConfig()) @@ -264,11 +259,11 @@ public class PantheonNodeFactory { .build()); } - public PantheonNode createIbft2NodeWithValidators(final String name, final String... validators) + public BesuNode createIbft2NodeWithValidators(final String name, final String... validators) throws IOException { return create( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .miningEnabled() .jsonRpcConfiguration(node.createJsonRpcWithIbft2EnabledConfig()) @@ -281,7 +276,7 @@ public class PantheonNodeFactory { .build()); } - public PantheonNode createNodeWithStaticNodes(final String name, final List staticNodes) + public BesuNode createNodeWithStaticNodes(final String name, final List staticNodes) throws IOException { final List staticNodesUrls = @@ -292,7 +287,7 @@ public class PantheonNodeFactory { .collect(toList()); return create( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .jsonRpcEnabled() .webSocketEnabled() diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/NodeConfiguration.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfiguration.java similarity index 88% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/NodeConfiguration.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfiguration.java index f2d306f075..68e3ce61b0 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/NodeConfiguration.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfiguration.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration; +package org.hyperledger.besu.tests.acceptance.dsl.node.configuration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider; import java.net.URI; import java.util.List; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java similarity index 74% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java index b84b0388e6..aada824be2 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration; +package org.hyperledger.besu.tests.acceptance.dsl.node.configuration; import static java.util.Collections.singletonList; import static java.util.stream.Collectors.toList; -import static tech.pegasys.pantheon.consensus.clique.jsonrpc.CliqueRpcApis.CLIQUE; -import static tech.pegasys.pantheon.consensus.ibft.jsonrpc.IbftRpcApis.IBFT; +import static org.hyperledger.besu.consensus.clique.jsonrpc.CliqueRpcApis.CLIQUE; +import static org.hyperledger.besu.consensus.ibft.jsonrpc.IbftRpcApis.IBFT; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApi; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApis; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.RunnableNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider; import java.util.ArrayList; import java.util.Arrays; @@ -34,10 +34,10 @@ public class NodeConfigurationFactory { public Optional createGenesisConfigForValidators( final Collection validators, - final Collection pantheonNodes, + final Collection besuNodes, final GenesisConfigurationProvider genesisConfigProvider) { final List nodes = - pantheonNodes.stream().filter(n -> validators.contains(n.getName())).collect(toList()); + besuNodes.stream().filter(n -> validators.contains(n.getName())).collect(toList()); return genesisConfigProvider.create(nodes); } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java similarity index 89% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java index 2474704021..ba798df5aa 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.genesis; +package org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis; import static java.util.stream.Collectors.toList; -import tech.pegasys.pantheon.consensus.clique.CliqueExtraData; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.RunnableNode; +import org.hyperledger.besu.consensus.clique.CliqueExtraData; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode; import java.io.IOException; import java.net.URI; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationProvider.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationProvider.java similarity index 84% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationProvider.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationProvider.java index c27bd1d5f2..83ed6e6c62 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationProvider.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationProvider.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.genesis; +package org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.RunnableNode; +import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode; import java.util.Collection; import java.util.Optional; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java similarity index 87% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java index 3cc8119439..8c76c71bdd 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java @@ -10,25 +10,25 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.permissioning; +package org.hyperledger.besu.tests.acceptance.dsl.node.configuration.permissioning; import static java.util.Collections.singletonList; import static java.util.stream.Collectors.toList; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApi; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApis; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.permissioning.LocalPermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.SmartContractPermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.WhitelistPersistor; -import tech.pegasys.pantheon.ethereum.permissioning.WhitelistPersistor.WHITELIST_TYPE; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.RunnableNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.PantheonNodeConfigurationBuilder; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.PantheonNodeFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.WhitelistPersistor; +import org.hyperledger.besu.ethereum.permissioning.WhitelistPersistor.WHITELIST_TYPE; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeConfigurationBuilder; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeFactory; import java.io.File; import java.io.IOException; @@ -153,7 +153,7 @@ public class PermissionedNodeBuilder { return this; } - public PantheonNode build() { + public BesuNode build() { if (name == null) { name = "perm_node_" + UUID.randomUUID().toString().substring(0, 8); } @@ -171,7 +171,7 @@ public class PermissionedNodeBuilder { final PermissioningConfiguration permissioningConfiguration = new PermissioningConfiguration(localPermConfig, smartContractPermConfig); - final PantheonNodeConfigurationBuilder builder = new PantheonNodeConfigurationBuilder(); + final BesuNodeConfigurationBuilder builder = new BesuNodeConfigurationBuilder(); builder .name(name) .jsonRpcConfiguration(jsonRpcConfigWithPermApiEnabled()) @@ -192,9 +192,9 @@ public class PermissionedNodeBuilder { } try { - return new PantheonNodeFactory().create(builder.build()); + return new BesuNodeFactory().create(builder.build()); } catch (IOException e) { - throw new RuntimeException("Error creating PantheonNode", e); + throw new RuntimeException("Error creating BesuNode", e); } } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java similarity index 61% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java index b5b200b717..ea3e482bc7 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.privacy; +package org.hyperledger.besu.tests.acceptance.dsl.node.configuration.privacy; -import tech.pegasys.orion.testutil.OrionKeyConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.PantheonNodeConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeConfiguration; +import org.hyperledger.orion.testutil.OrionKeyConfiguration; public class PrivacyNodeConfiguration { - private final PantheonNodeConfiguration pantheonConfig; + private final BesuNodeConfiguration besuConfig; private final OrionKeyConfiguration orionConfig; PrivacyNodeConfiguration( - final PantheonNodeConfiguration pantheonConfig, final OrionKeyConfiguration orionConfig) { - this.pantheonConfig = pantheonConfig; + final BesuNodeConfiguration besuConfig, final OrionKeyConfiguration orionConfig) { + this.besuConfig = besuConfig; this.orionConfig = orionConfig; } - public PantheonNodeConfiguration getPantheonConfig() { - return pantheonConfig; + public BesuNodeConfiguration getBesuConfig() { + return besuConfig; } public OrionKeyConfiguration getOrionKeyConfig() { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java similarity index 79% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java index 90974430e3..60e8551289 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.privacy; +package org.hyperledger.besu.tests.acceptance.dsl.node.configuration.privacy; -import tech.pegasys.orion.testutil.OrionKeyConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.NodeConfigurationFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.PantheonNodeConfigurationBuilder; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.account.PrivacyAccount; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeConfigurationBuilder; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.NodeConfigurationFactory; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationFactory; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccount; +import org.hyperledger.orion.testutil.OrionKeyConfiguration; import java.io.IOException; @@ -34,7 +34,7 @@ public class PrivacyNodeFactory { final String name, final PrivacyAccount privacyAccount) throws IOException { return create( new PrivacyNodeConfiguration( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .miningEnabled() .jsonRpcEnabled() @@ -50,7 +50,7 @@ public class PrivacyNodeFactory { final String name, final PrivacyAccount privacyAccount) throws IOException { return create( new PrivacyNodeConfiguration( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .jsonRpcEnabled() .keyFilePath(privacyAccount.getPrivateKeyPath()) @@ -65,7 +65,7 @@ public class PrivacyNodeFactory { final String name, final PrivacyAccount privacyAccount) throws IOException { return create( new PrivacyNodeConfiguration( - new PantheonNodeConfigurationBuilder() + new BesuNodeConfigurationBuilder() .name(name) .miningEnabled() .jsonRpcConfiguration(node.createJsonRpcWithIbft2EnabledConfig()) diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java similarity index 66% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java index efd1c3a24e..c8d613daa5 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.privacy; +package org.hyperledger.besu.tests.acceptance.dsl.privacy; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.net.NetConditions; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.privacy.PrivacyNodeFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.condition.PrivateContractVerifier; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.condition.PrivateTransactionVerifier; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.contract.PrivateContractTransactions; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.transaction.PrivacyTransactions; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.NetTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.condition.net.NetConditions; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.privacy.PrivacyNodeFactory; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.condition.PrivateContractVerifier; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.condition.PrivateTransactionVerifier; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.contract.PrivateContractTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction.PrivacyTransactions; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.NetTransactions; import org.junit.After; import org.junit.ClassRule; @@ -31,7 +31,7 @@ public class PrivacyAcceptanceTestBase { protected final PrivacyTransactions privacyTransactions; protected final PrivateContractVerifier privateContractVerifier; protected final PrivateTransactionVerifier privateTransactionVerifier; - protected final PrivacyNodeFactory privacyPantheon; + protected final PrivacyNodeFactory privacyBesu; protected final PrivateContractTransactions privateContractTransactions; protected final PrivacyCluster privacyCluster; protected final PrivacyAccountResolver privacyAccountResolver; @@ -43,7 +43,7 @@ public class PrivacyAcceptanceTestBase { privacyTransactions = new PrivacyTransactions(); privateContractVerifier = new PrivateContractVerifier(); privateTransactionVerifier = new PrivateTransactionVerifier(privacyTransactions); - privacyPantheon = new PrivacyNodeFactory(); + privacyBesu = new PrivacyNodeFactory(); privateContractTransactions = new PrivateContractTransactions(); privacyCluster = new PrivacyCluster(net); privacyAccountResolver = new PrivacyAccountResolver(); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyCluster.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyCluster.java similarity index 85% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyCluster.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyCluster.java index e873e0beb0..600ee0f624 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyCluster.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyCluster.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.privacy; +package org.hyperledger.besu.tests.acceptance.dsl.privacy; import static java.util.Collections.emptyList; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.net.NetConditions; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNodeRunner; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.RunnableNode; +import org.hyperledger.besu.tests.acceptance.dsl.condition.net.NetConditions; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNodeRunner; +import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode; import java.util.Arrays; import java.util.Collections; @@ -30,7 +30,7 @@ import org.apache.logging.log4j.Logger; public class PrivacyCluster { private static final Logger LOG = LogManager.getLogger(); private final NetConditions net; - private final PantheonNodeRunner pantheonNodeRunner; + private final BesuNodeRunner besuNodeRunner; private List nodes = emptyList(); private List runnableNodes = emptyList(); @@ -38,7 +38,7 @@ public class PrivacyCluster { public PrivacyCluster(final NetConditions net) { this.net = net; - this.pantheonNodeRunner = PantheonNodeRunner.instance(); + this.besuNodeRunner = BesuNodeRunner.instance(); } public void start(final PrivacyNode... nodes) { @@ -50,7 +50,7 @@ public class PrivacyCluster { throw new IllegalArgumentException("Can't start a cluster with no nodes"); } this.nodes = nodes; - this.runnableNodes = nodes.stream().map(n -> n.getPantheon()).collect(Collectors.toList()); + this.runnableNodes = nodes.stream().map(n -> n.getBesu()).collect(Collectors.toList()); final Optional bootNode = selectAndStartBootnode(nodes); @@ -79,13 +79,13 @@ public class PrivacyCluster { public void stop() { for (final PrivacyNode node : nodes) { - pantheonNodeRunner.stopNode(node.getPantheon()); + besuNodeRunner.stopNode(node.getBesu()); } } public void stopNode(final PrivacyNode node) { node.getOrion().stop(); - pantheonNodeRunner.stopNode(node.getPantheon()); + besuNodeRunner.stopNode(node.getBesu()); } public void close() { @@ -93,7 +93,7 @@ public class PrivacyCluster { for (final PrivacyNode node : nodes) { node.close(); } - pantheonNodeRunner.shutdown(); + besuNodeRunner.shutdown(); } private Optional selectAndStartBootnode(final List nodes) { @@ -136,6 +136,6 @@ public class PrivacyCluster { node.getName(), node.getNodeId().substring(0, 4), node.getNodeId().substring(124)); - node.start(pantheonNodeRunner); + node.start(besuNodeRunner); } } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyNode.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java similarity index 56% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyNode.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java index 03907d9f08..e844b7fbdc 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyNode.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java @@ -10,32 +10,32 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.privacy; - -import tech.pegasys.orion.testutil.OrionTestHarness; -import tech.pegasys.orion.testutil.OrionTestHarnessFactory; -import tech.pegasys.pantheon.controller.KeyPairUtil; -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.EnclaveException; -import tech.pegasys.pantheon.enclave.types.SendRequest; -import tech.pegasys.pantheon.enclave.types.SendRequestLegacy; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.storage.StorageProvider; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueSegmentIdentifier; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.RocksDBKeyValuePrivacyStorageFactory; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; -import tech.pegasys.pantheon.services.PantheonConfigurationImpl; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNodeRunner; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.NodeConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.PantheonNodeConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.privacy.PrivacyNodeConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.condition.PrivateCondition; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +package org.hyperledger.besu.tests.acceptance.dsl.privacy; + +import org.hyperledger.besu.controller.KeyPairUtil; +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.EnclaveException; +import org.hyperledger.besu.enclave.types.SendRequest; +import org.hyperledger.besu.enclave.types.SendRequestLegacy; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.storage.StorageProvider; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBKeyValuePrivacyStorageFactory; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; +import org.hyperledger.besu.services.BesuConfigurationImpl; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNodeRunner; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.NodeConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.privacy.PrivacyNodeConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.condition.PrivateCondition; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.orion.testutil.OrionTestHarness; +import org.hyperledger.orion.testutil.OrionTestHarnessFactory; import java.io.IOException; import java.net.URI; @@ -59,32 +59,32 @@ public class PrivacyNode implements AutoCloseable { private static final int BACKGROUND_THREAD_COUNT = 4; private final OrionTestHarness orion; - private final PantheonNode pantheon; + private final BesuNode besu; public PrivacyNode(final PrivacyNodeConfiguration privacyConfiguration) throws IOException { final Path orionDir = Files.createTempDirectory("acctest-orion"); this.orion = OrionTestHarnessFactory.create(orionDir, privacyConfiguration.getOrionKeyConfig()); - final PantheonNodeConfiguration pantheonConfig = privacyConfiguration.getPantheonConfig(); - - this.pantheon = - new PantheonNode( - pantheonConfig.getName(), - pantheonConfig.getMiningParameters(), - pantheonConfig.getJsonRpcConfiguration(), - pantheonConfig.getWebSocketConfiguration(), - pantheonConfig.getMetricsConfiguration(), - pantheonConfig.getPermissioningConfiguration(), - pantheonConfig.getKeyFilePath(), - pantheonConfig.isDevMode(), - pantheonConfig.getGenesisConfigProvider(), - pantheonConfig.isP2pEnabled(), - pantheonConfig.getNetworkingConfiguration(), - pantheonConfig.isDiscoveryEnabled(), - pantheonConfig.isBootnodeEligible(), - pantheonConfig.isRevertReasonEnabled(), - pantheonConfig.getPlugins(), - pantheonConfig.getExtraCLIOptions(), + final BesuNodeConfiguration besuConfig = privacyConfiguration.getBesuConfig(); + + this.besu = + new BesuNode( + besuConfig.getName(), + besuConfig.getMiningParameters(), + besuConfig.getJsonRpcConfiguration(), + besuConfig.getWebSocketConfiguration(), + besuConfig.getMetricsConfiguration(), + besuConfig.getPermissioningConfiguration(), + besuConfig.getKeyFilePath(), + besuConfig.isDevMode(), + besuConfig.getGenesisConfigProvider(), + besuConfig.isP2pEnabled(), + besuConfig.getNetworkingConfiguration(), + besuConfig.isDiscoveryEnabled(), + besuConfig.isBootnodeEligible(), + besuConfig.isRevertReasonEnabled(), + besuConfig.getPlugins(), + besuConfig.getExtraCLIOptions(), new ArrayList<>()); } @@ -92,9 +92,9 @@ public class PrivacyNode implements AutoCloseable { LOG.info( String.format( "Testing Enclave connectivity between %s (%s) and %s (%s)", - pantheon.getName(), + besu.getName(), orion.nodeUrl(), - Arrays.toString(otherNodes.stream().map(node -> node.pantheon.getName()).toArray()), + Arrays.toString(otherNodes.stream().map(node -> node.besu.getName()).toArray()), Arrays.toString(otherNodes.stream().map(node -> node.orion.nodeUrl()).toArray()))); Enclave enclaveClient = new Enclave(orion.clientUrl()); SendRequest sendRequest1 = @@ -122,22 +122,22 @@ public class PrivacyNode implements AutoCloseable { return orion; } - public PantheonNode getPantheon() { - return pantheon; + public BesuNode getBesu() { + return besu; } public void stop() { - pantheon.stop(); + besu.stop(); orion.stop(); } @Override public void close() { - pantheon.close(); + besu.close(); orion.close(); } - public void start(final PantheonNodeRunner runner) { + public void start(final BesuNodeRunner runner) { orion.start(); final PrivacyParameters privacyParameters; @@ -151,37 +151,37 @@ public class PrivacyNode implements AutoCloseable { .setEnclaveUrl(orion.clientUrl()) .setEnclavePublicKeyUsingFile(orion.getConfig().publicKeys().get(0).toFile()) .setStorageProvider(createKeyValueStorageProvider(dataDir)) - .setPrivateKeyPath(KeyPairUtil.getDefaultKeyFile(pantheon.homeDirectory()).toPath()) + .setPrivateKeyPath(KeyPairUtil.getDefaultKeyFile(besu.homeDirectory()).toPath()) .build(); } catch (IOException e) { throw new RuntimeException(); } - pantheon.setPrivacyParameters(privacyParameters); - pantheon.start(runner); + besu.setPrivacyParameters(privacyParameters); + besu.start(runner); } public void awaitPeerDiscovery(final Condition condition) { - pantheon.awaitPeerDiscovery(condition); + besu.awaitPeerDiscovery(condition); } public String getName() { - return pantheon.getName(); + return besu.getName(); } public Address getAddress() { - return pantheon.getAddress(); + return besu.getAddress(); } public URI enodeUrl() { - return pantheon.enodeUrl(); + return besu.enodeUrl(); } public String getNodeId() { - return pantheon.getNodeId(); + return besu.getNodeId(); } public T execute(final Transaction transaction) { - return pantheon.execute(transaction); + return besu.execute(transaction); } public void verify(final PrivateCondition expected) { @@ -193,7 +193,7 @@ public class PrivacyNode implements AutoCloseable { } public String getTransactionSigningKey() { - return pantheon.keyPair().getPrivateKey().toString(); + return besu.keyPair().getPrivateKey().toString(); } public void addOtherEnclaveNode(final URI otherNode) { @@ -201,7 +201,7 @@ public class PrivacyNode implements AutoCloseable { } public NodeConfiguration getConfiguration() { - return pantheon.getConfiguration(); + return besu.getConfiguration(); } private StorageProvider createKeyValueStorageProvider(final Path dbLocation) { @@ -215,7 +215,7 @@ public class PrivacyNode implements AutoCloseable { BACKGROUND_THREAD_COUNT, CACHE_CAPACITY), Arrays.asList(KeyValueSegmentIdentifier.values()))) - .withCommonConfiguration(new PantheonConfigurationImpl(dbLocation)) + .withCommonConfiguration(new BesuConfigurationImpl(dbLocation)) .withMetricsSystem(new NoOpMetricsSystem()) .build(); } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/account/PrivacyAccount.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccount.java similarity index 96% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/account/PrivacyAccount.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccount.java index 5d507e43c8..51bd7ba97f 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/account/PrivacyAccount.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccount.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.privacy.account; +package org.hyperledger.besu.tests.acceptance.dsl.privacy.account; import java.io.File; import java.net.URL; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java similarity index 96% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java index 213fb60b09..bfa02a6ae9 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.privacy.account; +package org.hyperledger.besu.tests.acceptance.dsl.privacy.account; import java.net.URL; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java similarity index 81% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java index 5ea5beff75..f7644ce1b7 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.privacy.condition; +package org.hyperledger.besu.tests.acceptance.dsl.privacy.condition; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; @@ -34,9 +34,9 @@ public class EeaGetTransactionReceiptTransaction implements Transaction { @Override public String execute(final NodeRequests node) { - final Pantheon pantheon = node.privacy().getPantheonClient(); + final Pantheon besu = node.privacy().getBesuClient(); final PrivateTransactionManager privateTransactionManager = new LegacyPrivateTransactionManager( - pantheon, GAS_PROVIDER, senderCredentials, chainId, privateFrom, privateFor); + besu, GAS_PROVIDER, senderCredentials, chainId, privateFrom, privateFor); try { return privateTransactionManager diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java similarity index 90% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java index 1ce454b0a5..16eb5e2d06 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.privacy.contract; +package org.hyperledger.besu.tests.acceptance.dsl.privacy.contract; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.lang.reflect.Method; import java.math.BigInteger; @@ -59,7 +59,7 @@ public class DeployPrivateSmartContractTransaction implement public T execute(final NodeRequests node) { final PrivateTransactionManager privateTransactionManager = new LegacyPrivateTransactionManager( - node.privacy().getPantheonClient(), + node.privacy().getBesuClient(), GAS_PROVIDER, senderCredentials, chainId, @@ -73,7 +73,7 @@ public class DeployPrivateSmartContractTransaction implement final Object invoked = method.invoke( METHOD_IS_STATIC, - node.privacy().getPantheonClient(), + node.privacy().getBesuClient(), privateTransactionManager, GAS_PROVIDER); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java similarity index 90% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java index d62e333747..cc7749e9f9 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.privacy.contract; +package org.hyperledger.besu.tests.acceptance.dsl.privacy.contract; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.lang.reflect.Method; import java.math.BigInteger; @@ -59,7 +59,7 @@ public class DeployPrivateSmartContractWithPrivacyGroupIdTransaction implements public T execute(final NodeRequests node) { final PrivateTransactionManager privateTransactionManager = new LegacyPrivateTransactionManager( - node.privacy().getPantheonClient(), + node.privacy().getBesuClient(), GAS_PROVIDER, senderCredentials, chainId, @@ -81,7 +81,7 @@ public class LoadPrivateSmartContractTransaction implements method.invoke( METHOD_IS_STATIC, contractAddress, - node.privacy().getPantheonClient(), + node.privacy().getBesuClient(), privateTransactionManager, GAS_PROVIDER); } catch (final Exception e) { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java similarity index 98% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java index 2792b1cbce..086dadb107 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.privacy.contract; +package org.hyperledger.besu.tests.acceptance.dsl.privacy.contract; import java.util.Arrays; import java.util.List; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java similarity index 77% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java index 36cb3876bc..7ac3241113 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.privacy.transaction; +package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.util.Arrays; @@ -41,10 +41,9 @@ public class CreatePrivacyGroupTransaction implements Transaction { @Override public String execute(final NodeRequests node) { - final Pantheon pantheon = node.privacy().getPantheonClient(); + final Pantheon besu = node.privacy().getBesuClient(); try { - return pantheon - .privCreatePrivacyGroup(addresses, name, description) + return besu.privCreatePrivacyGroup(addresses, name, description) .send() .getPrivacyGroupId() .toString(); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/FindPrivacyGroupTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/FindPrivacyGroupTransaction.java similarity index 78% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/FindPrivacyGroupTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/FindPrivacyGroupTransaction.java index 5e5445cf86..ef8c681ec7 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/FindPrivacyGroupTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/FindPrivacyGroupTransaction.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.privacy.transaction; +package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.util.List; @@ -33,9 +33,9 @@ public class FindPrivacyGroupTransaction implements Transaction execute(final NodeRequests node) { - final Pantheon pantheon = node.privacy().getPantheonClient(); + final Pantheon besu = node.privacy().getBesuClient(); try { - return pantheon.privFindPrivacyGroup(nodes).send().getGroups(); + return besu.privFindPrivacyGroup(nodes).send().getGroups(); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java similarity index 75% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java index 9ad4af7538..74032b235f 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.privacy.transaction; +package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.math.BigInteger; @@ -28,14 +28,12 @@ import org.web3j.protocol.pantheon.Pantheon; public class GetAllPrivacyMarkerTransactionHashes implements Transaction> { @Override public List execute(final NodeRequests node) { - final Pantheon pantheon = node.privacy().getPantheonClient(); + final Pantheon besu = node.privacy().getBesuClient(); final List toReturn = new ArrayList<>(); try { - final long blockchainHeight = - pantheon.ethBlockNumber().send().getBlockNumber().longValueExact(); + final long blockchainHeight = besu.ethBlockNumber().send().getBlockNumber().longValueExact(); for (int i = 0; i <= blockchainHeight; i++) { - pantheon - .ethGetBlockByNumber(DefaultBlockParameter.valueOf(BigInteger.valueOf(i)), true) + besu.ethGetBlockByNumber(DefaultBlockParameter.valueOf(BigInteger.valueOf(i)), true) .send() .getBlock() .getTransactions() diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java similarity index 82% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java index 6823873da4..e47545a52b 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.privacy.transaction; +package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.condition.EeaGetTransactionReceiptTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.condition.EeaGetTransactionReceiptTransaction; import java.util.List; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java similarity index 95% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java index dd90edcc7f..621242a4e6 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.pubsub; +package org.hyperledger.besu.tests.acceptance.dsl.pubsub; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/Subscription.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/Subscription.java similarity index 94% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/Subscription.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/Subscription.java index 338669d553..e0ec8720a6 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/Subscription.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/Subscription.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.pubsub; +package org.hyperledger.besu.tests.acceptance.dsl.pubsub; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; import java.util.List; import java.util.Map; @@ -45,7 +45,7 @@ public class Subscription { } public void verifyEventReceived(final Hash expectedTransaction, final int expectedOccurrences) { - waitFor( + WaitUtils.waitFor( () -> { assertThat(connection.getSubscriptionEvents()).isNotEmpty(); final List events = connection.getSubscriptionEvents(); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/SubscriptionEvent.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/SubscriptionEvent.java similarity index 95% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/SubscriptionEvent.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/SubscriptionEvent.java index 4673a0b4fe..676e60071d 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/SubscriptionEvent.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/SubscriptionEvent.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.pubsub; +package org.hyperledger.besu.tests.acceptance.dsl.pubsub; import java.util.Map; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocket.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocket.java similarity index 84% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocket.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocket.java index 04ac59dfe7..6196114a08 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocket.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocket.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.pubsub; +package org.hyperledger.besu.tests.acceptance.dsl.pubsub; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.NodeConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.NodeConfiguration; import io.vertx.core.Vertx; @@ -50,6 +50,7 @@ public class WebSocket { } public void verifyTotalEventsReceived(final int expectedTotalEventCount) { - waitFor(() -> assertThat(connection.getSubscriptionEvents()).hasSize(expectedTotalEventCount)); + WaitUtils.waitFor( + () -> assertThat(connection.getSubscriptionEvents()).hasSize(expectedTotalEventCount)); } } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketConnection.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketConnection.java similarity index 95% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketConnection.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketConnection.java index 01ae6457da..6197e22196 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketConnection.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketConnection.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.pubsub; +package org.hyperledger.besu.tests.acceptance.dsl.pubsub; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.NodeConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.NodeConfiguration; import java.util.ArrayList; import java.util.List; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketEvent.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketEvent.java similarity index 95% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketEvent.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketEvent.java index 1cc5dae178..be46c6a1fb 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketEvent.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketEvent.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.pubsub; +package org.hyperledger.besu.tests.acceptance.dsl.pubsub; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/CallSmartContractFunction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/CallSmartContractFunction.java similarity index 93% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/CallSmartContractFunction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/CallSmartContractFunction.java index ea692bfc0d..cbf8febb3f 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/CallSmartContractFunction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/CallSmartContractFunction.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction; +package org.hyperledger.besu.tests.acceptance.dsl.transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Accounts; +import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts; import java.io.IOException; import java.math.BigInteger; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/DeploySmartContractTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/DeploySmartContractTransaction.java similarity index 93% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/DeploySmartContractTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/DeploySmartContractTransaction.java index deda2c07ea..071ab4404f 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/DeploySmartContractTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/DeploySmartContractTransaction.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction; +package org.hyperledger.besu.tests.acceptance.dsl.transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Accounts; +import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts; import java.lang.reflect.Method; import java.math.BigInteger; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/NodeRequests.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/NodeRequests.java similarity index 76% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/NodeRequests.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/NodeRequests.java index d4fd8b6e45..bf7fb86405 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/NodeRequests.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/NodeRequests.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction; - -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.admin.AdminRequestFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueRequestFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2.Ibft2RequestFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.login.LoginRequestFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.miner.MinerRequestFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.CustomRequestFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory; +package org.hyperledger.besu.tests.acceptance.dsl.transaction; + +import org.hyperledger.besu.tests.acceptance.dsl.transaction.admin.AdminRequestFactory; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueRequestFactory; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2.Ibft2RequestFactory; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.login.LoginRequestFactory; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.miner.MinerRequestFactory; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.CustomRequestFactory; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory; import java.util.Optional; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/Transaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/Transaction.java similarity index 91% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/Transaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/Transaction.java index c600eae425..14f588bacc 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/Transaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/Transaction.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction; +package org.hyperledger.besu.tests.acceptance.dsl.transaction; @FunctionalInterface public interface Transaction { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/AccountTransactions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/AccountTransactions.java similarity index 90% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/AccountTransactions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/AccountTransactions.java index 5499cef64c..d59ee9b5b7 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/AccountTransactions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/AccountTransactions.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.account; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.account; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Accounts; -import tech.pegasys.pantheon.tests.acceptance.dsl.blockchain.Amount; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts; +import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount; import java.math.BigInteger; import java.util.ArrayList; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransaction.java similarity index 89% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransaction.java index 4b6ae97da9..c5fdd62ed4 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransaction.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.account; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.account; import static org.web3j.utils.Numeric.toHexString; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.blockchain.Amount; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.math.BigInteger; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java similarity index 90% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java index 2c2984554a..2a3d676a62 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.account; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.account; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.blockchain.Amount; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount; import java.math.BigInteger; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java similarity index 80% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java index 2daee8916d..896f960528 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.account; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.account; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.util.ArrayList; import java.util.List; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AddPeerTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AddPeerTransaction.java similarity index 84% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AddPeerTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AddPeerTransaction.java index 58a7f50c0a..6bb2397ae4 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AddPeerTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AddPeerTransaction.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.admin; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.admin; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.net.URI; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AdminRequestFactory.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminRequestFactory.java similarity index 94% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AdminRequestFactory.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminRequestFactory.java index b56f5e40e1..33108ca866 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AdminRequestFactory.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminRequestFactory.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.admin; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.admin; import java.net.URI; import java.util.Collections; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AdminTransactions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminTransactions.java similarity index 91% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AdminTransactions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminTransactions.java index e5e3a4cbd2..15b79f0b2b 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AdminTransactions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminTransactions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.admin; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.admin; import java.net.URI; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueDiscard.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueDiscard.java similarity index 84% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueDiscard.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueDiscard.java index b9ebc3d85c..425657b40b 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueDiscard.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueDiscard.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.clique; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java similarity index 71% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java index 96d6f583c7..a1edebe361 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java @@ -10,14 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.clique; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueRequestFactory.SignersBlockResponse; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.util.List; @@ -32,7 +31,8 @@ public class CliqueGetSigners implements Transaction> { @Override public List
execute(final NodeRequests node) { try { - final SignersBlockResponse result = node.clique().cliqueGetSigners(blockNumber).send(); + final CliqueRequestFactory.SignersBlockResponse result = + node.clique().cliqueGetSigners(blockNumber).send(); assertThat(result).isNotNull(); assertThat(result.hasError()).isFalse(); return result.getResult(); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java similarity index 68% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java index de729fb7e5..d335820516 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java @@ -10,15 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.clique; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueRequestFactory.SignersBlockResponse; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.util.List; @@ -33,7 +32,8 @@ public class CliqueGetSignersAtHash implements Transaction> { @Override public List
execute(final NodeRequests node) { try { - final SignersBlockResponse result = node.clique().cliqueGetSignersAtHash(hash).send(); + final CliqueRequestFactory.SignersBlockResponse result = + node.clique().cliqueGetSignersAtHash(hash).send(); assertThat(result).isNotNull(); assertThat(result.hasError()).isFalse(); return result.getResult(); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueProposals.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueProposals.java similarity index 69% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueProposals.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueProposals.java index cf995badc1..93d7d0b0ba 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueProposals.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueProposals.java @@ -10,14 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.clique; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueRequestFactory.ProposalsResponse; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.util.Map; @@ -27,7 +26,7 @@ public class CliqueProposals implements Transaction> { @Override public Map execute(final NodeRequests node) { try { - final ProposalsResponse result = node.clique().cliqueProposals().send(); + final CliqueRequestFactory.ProposalsResponse result = node.clique().cliqueProposals().send(); assertThat(result).isNotNull(); assertThat(result.hasError()).isFalse(); return result.getResult(); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliquePropose.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliquePropose.java similarity index 74% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliquePropose.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliquePropose.java index 544f545068..4da58490c8 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliquePropose.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliquePropose.java @@ -10,13 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.clique; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueRequestFactory.ProposeResponse; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; @@ -32,7 +31,8 @@ public class CliquePropose implements Transaction { @Override public Boolean execute(final NodeRequests node) { try { - final ProposeResponse result = node.clique().cliquePropose(address, auth).send(); + final CliqueRequestFactory.ProposeResponse result = + node.clique().cliquePropose(address, auth).send(); assertThat(result).isNotNull(); assertThat(result.hasError()).isFalse(); return result.getResult(); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java similarity index 93% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java index a57179f1fd..6b58d709f3 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.clique; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.Arrays; import java.util.List; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java similarity index 77% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java index f9a500b098..342c875b7a 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.clique; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; public class CliqueTransactions { public static final String LATEST = "latest"; - public CliquePropose createRemoveProposal(final PantheonNode node) { + public CliquePropose createRemoveProposal(final BesuNode node) { return propose(node.getAddress().toString(), false); } - public CliquePropose createAddProposal(final PantheonNode node) { + public CliquePropose createAddProposal(final BesuNode node) { return propose(node.getAddress().toString(), true); } @@ -42,7 +42,7 @@ public class CliqueTransactions { return new CliqueGetSignersAtHash(blockHash); } - public CliqueDiscard createDiscardProposal(final PantheonNode node) { + public CliqueDiscard createDiscardProposal(final BesuNode node) { return new CliqueDiscard(node.getAddress().toString()); } } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/contract/ContractTransactions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/contract/ContractTransactions.java similarity index 80% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/contract/ContractTransactions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/contract/ContractTransactions.java index 2b36437b73..213b7b44dd 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/contract/ContractTransactions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/contract/ContractTransactions.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.contract; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.contract; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.CallSmartContractFunction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.DeploySmartContractTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.CallSmartContractFunction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.DeploySmartContractTransaction; import org.web3j.tx.Contract; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthAccountsTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthAccountsTransaction.java similarity index 84% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthAccountsTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthAccountsTransaction.java index 79f2f73e24..800da173a0 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthAccountsTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthAccountsTransaction.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.eth; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.util.List; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthBlockNumberTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthBlockNumberTransaction.java similarity index 84% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthBlockNumberTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthBlockNumberTransaction.java index f5af008755..958ce738d7 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthBlockNumberTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthBlockNumberTransaction.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.eth; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.math.BigInteger; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetBalanceTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetBalanceTransaction.java similarity index 83% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetBalanceTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetBalanceTransaction.java index 7834421e07..5ec47172d5 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetBalanceTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetBalanceTransaction.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.eth; import static org.assertj.core.api.Assertions.assertThat; import static org.web3j.protocol.core.DefaultBlockParameterName.LATEST; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.math.BigInteger; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetBlockTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetBlockTransaction.java similarity index 88% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetBlockTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetBlockTransaction.java index e4e952efee..558faa4e40 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetBlockTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetBlockTransaction.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.eth; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionCountTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionCountTransaction.java similarity index 87% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionCountTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionCountTransaction.java index 9c402ee6cb..f8244ca249 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionCountTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionCountTransaction.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.eth; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.math.BigInteger; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptTransaction.java similarity index 86% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptTransaction.java index e3b2388860..7e7fc3466b 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptTransaction.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.eth; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.util.Optional; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithRevertReason.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithRevertReason.java similarity index 75% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithRevertReason.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithRevertReason.java index 748ae145ee..0ac77038c3 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithRevertReason.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithRevertReason.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.eth; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.CustomRequestFactory.EthGetTransactionReceiptWithRevertReasonResponse; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.CustomRequestFactory.TransactionReceiptWithRevertReason; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.CustomRequestFactory.EthGetTransactionReceiptWithRevertReasonResponse; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.CustomRequestFactory.TransactionReceiptWithRevertReason; import java.io.IOException; import java.util.Optional; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetWorkTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetWorkTransaction.java similarity index 85% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetWorkTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetWorkTransaction.java index 34793c758d..33b05b63a2 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetWorkTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetWorkTransaction.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.eth; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthMiningTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthMiningTransaction.java similarity index 83% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthMiningTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthMiningTransaction.java index bc9dc5e833..4fada0daca 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthMiningTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthMiningTransaction.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.eth; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthSendRawTransactionTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthSendRawTransactionTransaction.java similarity index 85% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthSendRawTransactionTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthSendRawTransactionTransaction.java index ad9ad67c8d..428c756425 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthSendRawTransactionTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthSendRawTransactionTransaction.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.eth; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthTransactions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthTransactions.java similarity index 94% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthTransactions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthTransactions.java index 1e9d696c4b..fe0151d878 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthTransactions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthTransactions.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.eth; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; import org.web3j.protocol.core.DefaultBlockParameter; import org.web3j.protocol.core.DefaultBlockParameterName; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java similarity index 73% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java index d4a32dbd15..7f623d8b26 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java @@ -10,13 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2.Ibft2RequestFactory.DiscardResponse; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; @@ -30,7 +29,7 @@ public class Ibft2Discard implements Transaction { @Override public Boolean execute(final NodeRequests node) { try { - final DiscardResponse result = node.ibft().discard(address).send(); + final Ibft2RequestFactory.DiscardResponse result = node.ibft().discard(address).send(); assertThat(result).isNotNull(); assertThat(result.hasError()).isFalse(); return result.getResult(); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java similarity index 71% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java index 497e35f76e..78436b2243 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java @@ -10,14 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2.Ibft2RequestFactory.SignersBlockResponse; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.util.List; @@ -32,7 +31,8 @@ public class Ibft2GetValidators implements Transaction> { @Override public List
execute(final NodeRequests node) { try { - final SignersBlockResponse result = node.ibft().validatorsAtBlock(blockNumber).send(); + final Ibft2RequestFactory.SignersBlockResponse result = + node.ibft().validatorsAtBlock(blockNumber).send(); assertThat(result).isNotNull(); assertThat(result.hasError()).isFalse(); return result.getResult(); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java similarity index 69% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java index 20eca9384d..d7bf8b2cba 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java @@ -10,15 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2.Ibft2RequestFactory.SignersBlockResponse; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.util.List; @@ -34,7 +33,8 @@ public class Ibft2GetValidatorsAtHash implements Transaction> { @Override public List
execute(final NodeRequests node) { try { - final SignersBlockResponse result = node.ibft().signersAtHash(hash).send(); + final Ibft2RequestFactory.SignersBlockResponse result = + node.ibft().signersAtHash(hash).send(); assertThat(result).isNotNull(); assertThat(result.hasError()).isFalse(); return result.getResult(); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java similarity index 70% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java index 08f4cead49..f6a72f7dbb 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java @@ -10,14 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2.Ibft2RequestFactory.ProposalsResponse; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.util.Map; @@ -27,7 +26,7 @@ public class Ibft2Proposals implements Transaction> { @Override public Map execute(final NodeRequests node) { try { - final ProposalsResponse result = node.ibft().proposals().send(); + final Ibft2RequestFactory.ProposalsResponse result = node.ibft().proposals().send(); assertThat(result).isNotNull(); assertThat(result.hasError()).isFalse(); return result.getResult(); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java similarity index 74% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java index 6e8f21bea0..eed13dbda0 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java @@ -10,13 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2.Ibft2RequestFactory.ProposeResponse; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; @@ -32,7 +31,7 @@ public class Ibft2Propose implements Transaction { @Override public Boolean execute(final NodeRequests node) { try { - final ProposeResponse result = node.ibft().propose(address, auth).send(); + final Ibft2RequestFactory.ProposeResponse result = node.ibft().propose(address, auth).send(); assertThat(result).isNotNull(); assertThat(result.hasError()).isFalse(); return result.getResult(); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java similarity index 93% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java index 253918bf67..471594e39f 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.Arrays; import java.util.List; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java similarity index 77% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java index 694b8695f3..d9ecb47e53 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; public class Ibft2Transactions { public static final String LATEST = "latest"; - public Ibft2Propose createRemoveProposal(final PantheonNode node) { + public Ibft2Propose createRemoveProposal(final BesuNode node) { return propose(node.getAddress().toString(), false); } - public Ibft2Propose createAddProposal(final PantheonNode node) { + public Ibft2Propose createAddProposal(final BesuNode node) { return propose(node.getAddress().toString(), true); } @@ -38,7 +38,7 @@ public class Ibft2Transactions { return new Ibft2GetValidatorsAtHash(blockHash); } - public Ibft2Discard createDiscardProposal(final PantheonNode node) { + public Ibft2Discard createDiscardProposal(final BesuNode node) { return new Ibft2Discard(node.getAddress().toString()); } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java similarity index 97% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java index 3ef4df1cb3..a27bb257f2 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.login; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.login; import static org.assertj.core.api.Assertions.assertThat; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginSuccessfulTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginSuccessfulTransaction.java similarity index 85% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginSuccessfulTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginSuccessfulTransaction.java index 5c04a61852..6f2c0862bb 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginSuccessfulTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginSuccessfulTransaction.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.login; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.login; import static org.assertj.core.api.Fail.fail; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginTransaction.java similarity index 84% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginTransaction.java index 4f7bfbe566..f2cd514326 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginTransaction.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.login; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.login; import static org.assertj.core.api.Fail.fail; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginUnauthorizedTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginUnauthorizedTransaction.java similarity index 76% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginUnauthorizedTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginUnauthorizedTransaction.java index 44568d0e2b..398d44eeb1 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginUnauthorizedTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginUnauthorizedTransaction.java @@ -10,16 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.login; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.login; -import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; +import org.assertj.core.api.Assertions; + public class LoginUnauthorizedTransaction implements Transaction { private final String username; @@ -33,7 +34,7 @@ public class LoginUnauthorizedTransaction implements Transaction { @Override public Void execute(final NodeRequests node) { try { - assertThat(node.login().send(username, password)).isEqualTo("Unauthorized"); + Assertions.assertThat(node.login().send(username, password)).isEqualTo("Unauthorized"); return null; } catch (final IOException e) { fail("Login request failed with exception: %s", e); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerRequestFactory.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerRequestFactory.java similarity index 95% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerRequestFactory.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerRequestFactory.java index 13c596994e..6ddef9b152 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerRequestFactory.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerRequestFactory.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.miner; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.miner; import org.web3j.protocol.Web3jService; import org.web3j.protocol.core.Request; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerStartTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerStartTransaction.java similarity index 79% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerStartTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerStartTransaction.java index 2a7420d9e7..8361c076c8 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerStartTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerStartTransaction.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.miner; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.miner; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; public class MinerStartTransaction implements Transaction { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerStopTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerStopTransaction.java similarity index 79% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerStopTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerStopTransaction.java index d505f398af..8fb82a18e5 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerStopTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerStopTransaction.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.miner; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.miner; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; public class MinerStopTransaction implements Transaction { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerTransactions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerTransactions.java similarity index 91% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerTransactions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerTransactions.java index 54deb95c18..a871bec260 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerTransactions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/miner/MinerTransactions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.miner; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.miner; public class MinerTransactions { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/CustomRequestFactory.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/CustomRequestFactory.java similarity index 96% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/CustomRequestFactory.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/CustomRequestFactory.java index 8cb5ed9055..a111713bf3 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/CustomRequestFactory.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/CustomRequestFactory.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.net; import java.util.Collections; import java.util.Map; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetPeerCountTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetPeerCountTransaction.java similarity index 84% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetPeerCountTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetPeerCountTransaction.java index 8fce981721..785aeb1b1d 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetPeerCountTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetPeerCountTransaction.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.net; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.math.BigInteger; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetServicesTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetServicesTransaction.java similarity index 86% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetServicesTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetServicesTransaction.java index 1503aa3772..47c4bf46bb 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetServicesTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetServicesTransaction.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.net; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.util.Map; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetTransactions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetTransactions.java similarity index 92% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetTransactions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetTransactions.java index 535f9d5679..87862b181a 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetTransactions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetTransactions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.net; public class NetTransactions { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetVersionTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetVersionTransaction.java similarity index 83% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetVersionTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetVersionTransaction.java index 57f966d9a8..c4a10d2f01 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetVersionTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/net/NetVersionTransaction.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.net; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import org.web3j.protocol.core.methods.response.NetVersion; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java similarity index 81% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java index 339b0042ce..b372d5871a 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; import static java.nio.charset.StandardCharsets.UTF_8; import static org.web3j.utils.Numeric.toHexString; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.io.IOException; import java.math.BigInteger; @@ -32,7 +32,7 @@ import org.web3j.crypto.TransactionEncoder; public class AccountSmartContractPermissioningAllowAccountTransaction implements Transaction { private static final BytesValue ADD_ACCOUNT_SIGNATURE = - tech.pegasys.pantheon.crypto.Hash.keccak256( + org.hyperledger.besu.crypto.Hash.keccak256( BytesValue.of("addAccount(address)".getBytes(UTF_8))) .slice(0, 4); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java similarity index 81% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java index 399d2d3d07..3b565db627 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; import static java.nio.charset.StandardCharsets.UTF_8; import static org.web3j.utils.Numeric.toHexString; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.io.IOException; import java.math.BigInteger; @@ -33,7 +33,7 @@ public class AccountSmartContractPermissioningForbidAccountTransaction implements Transaction { private static final BytesValue REMOVE_ACCOUNT_SIGNATURE = - tech.pegasys.pantheon.crypto.Hash.keccak256( + org.hyperledger.besu.crypto.Hash.keccak256( BytesValue.of("removeAccount(address)".getBytes(UTF_8))) .slice(0, 4); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java similarity index 84% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java index 068b53d5a7..54aaabec41 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java @@ -10,15 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; import static java.nio.charset.StandardCharsets.UTF_8; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.io.IOException; @@ -27,9 +28,7 @@ import org.web3j.protocol.core.DefaultBlockParameterName; public class AccountSmartContractPermissioningIsAllowedTransaction implements Transaction { private static final BytesValue IS_ACCOUNT_ALLOWED_SIGNATURE = - tech.pegasys.pantheon.crypto.Hash.keccak256( - BytesValue.of("whitelistContains(address)".getBytes(UTF_8))) - .slice(0, 4); + Hash.keccak256(BytesValue.of("whitelistContains(address)".getBytes(UTF_8))).slice(0, 4); private final Address contractAddress; private final Address account; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java similarity index 81% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java index 22aaab3546..65f091af25 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Accounts; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; public class AccountSmartContractPermissioningTransactions { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java similarity index 76% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java index bef2d8578f..29a1a4a570 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; import static java.nio.charset.StandardCharsets.UTF_8; import static org.web3j.utils.Numeric.toHexString; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.permissioning.NodeSmartContractPermissioningController; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.RunnableNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.permissioning.NodeSmartContractPermissioningController; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.math.BigInteger; @@ -35,7 +35,7 @@ import org.web3j.crypto.TransactionEncoder; public class NodeSmartContractPermissioningAllowNodeTransaction implements Transaction { private static final BytesValue ADD_ENODE_SIGNATURE = - tech.pegasys.pantheon.crypto.Hash.keccak256( + org.hyperledger.besu.crypto.Hash.keccak256( BytesValue.of("addEnode(bytes32,bytes32,bytes16,uint16)".getBytes(UTF_8))) .slice(0, 4); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java similarity index 75% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java index f59e76de76..81c7b10ff5 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java @@ -10,19 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; import static java.nio.charset.StandardCharsets.UTF_8; -import static tech.pegasys.pantheon.ethereum.permissioning.NodeSmartContractPermissioningController.checkTransactionResult; +import static org.hyperledger.besu.ethereum.permissioning.NodeSmartContractPermissioningController.checkTransactionResult; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.permissioning.NodeSmartContractPermissioningController; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.RunnableNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.permissioning.NodeSmartContractPermissioningController; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; @@ -32,7 +33,7 @@ public class NodeSmartContractPermissioningConnectionIsAllowedTransaction implements Transaction { private static final BytesValue IS_CONNECTION_ALLOWED_SIGNATURE = - tech.pegasys.pantheon.crypto.Hash.keccak256( + Hash.keccak256( BytesValue.of( "connectionAllowed(bytes32,bytes32,bytes16,uint16,bytes32,bytes32,bytes16,uint16)" .getBytes(UTF_8))) diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java similarity index 76% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java index adb23696d2..bd1fa707e4 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; import static java.nio.charset.StandardCharsets.UTF_8; import static org.web3j.utils.Numeric.toHexString; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.permissioning.NodeSmartContractPermissioningController; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.RunnableNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.permissioning.NodeSmartContractPermissioningController; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.math.BigInteger; @@ -35,7 +35,7 @@ import org.web3j.crypto.TransactionEncoder; public class NodeSmartContractPermissioningForbidNodeTransaction implements Transaction { private static final BytesValue REMOVE_ENODE_SIGNATURE = - tech.pegasys.pantheon.crypto.Hash.keccak256( + org.hyperledger.besu.crypto.Hash.keccak256( BytesValue.of("removeEnode(bytes32,bytes32,bytes16,uint16)".getBytes(UTF_8))) .slice(0, 4); diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java similarity index 79% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java index e5f2ae6c93..25f2d90aed 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java @@ -10,18 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; import static java.nio.charset.StandardCharsets.UTF_8; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.permissioning.NodeSmartContractPermissioningController; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.RunnableNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.permissioning.NodeSmartContractPermissioningController; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; @@ -30,8 +31,7 @@ import org.web3j.protocol.core.DefaultBlockParameterName; public class NodeSmartContractPermissioningIsAllowedTransaction implements Transaction { private static final BytesValue IS_NODE_ALLOWED_SIGNATURE = - tech.pegasys.pantheon.crypto.Hash.keccak256( - BytesValue.of("enodeAllowed(bytes32,bytes32,bytes16,uint16)".getBytes(UTF_8))) + Hash.keccak256(BytesValue.of("enodeAllowed(bytes32,bytes32,bytes16,uint16)".getBytes(UTF_8))) .slice(0, 4); private final Address contractAddress; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java similarity index 82% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java index 55e3e1a240..bd3b85983d 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Accounts; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; public class NodeSmartContractPermissioningTransactions { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermAddAccountsToWhitelistTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermAddAccountsToWhitelistTransaction.java similarity index 78% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermAddAccountsToWhitelistTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermAddAccountsToWhitelistTransaction.java index 6aa13fe7dd..241d072dfb 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermAddAccountsToWhitelistTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermAddAccountsToWhitelistTransaction.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory.AddAccountsToWhitelistResponse; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory.AddAccountsToWhitelistResponse; import java.io.IOException; import java.util.List; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermAddNodeTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermAddNodeTransaction.java similarity index 72% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermAddNodeTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermAddNodeTransaction.java index 042139dbad..bc913ddb81 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermAddNodeTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermAddNodeTransaction.java @@ -10,13 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory.AddNodeResponse; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; import java.net.URI; @@ -32,7 +31,8 @@ public class PermAddNodeTransaction implements Transaction { @Override public String execute(final NodeRequests node) { try { - final AddNodeResponse result = node.perm().addNodesToWhitelist(enodeList).send(); + final PermissioningJsonRpcRequestFactory.AddNodeResponse result = + node.perm().addNodesToWhitelist(enodeList).send(); assertThat(result).isNotNull(); return result.getResult(); } catch (final IOException e) { diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermGetAccountsWhitelistTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermGetAccountsWhitelistTransaction.java similarity index 76% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermGetAccountsWhitelistTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermGetAccountsWhitelistTransaction.java index 9a2ef86fa3..1ac15c4b09 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermGetAccountsWhitelistTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermGetAccountsWhitelistTransaction.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory.GetAccountsWhitelistResponse; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory.GetAccountsWhitelistResponse; import java.io.IOException; import java.util.List; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermGetNodesWhitelistTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermGetNodesWhitelistTransaction.java similarity index 75% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermGetNodesWhitelistTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermGetNodesWhitelistTransaction.java index aca998cd9e..f5cafb78e5 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermGetNodesWhitelistTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermGetNodesWhitelistTransaction.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory.GetNodesWhitelistResponse; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory.GetNodesWhitelistResponse; import java.io.IOException; import java.util.List; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermRemoveAccountsFromWhitelistTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermRemoveAccountsFromWhitelistTransaction.java similarity index 78% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermRemoveAccountsFromWhitelistTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermRemoveAccountsFromWhitelistTransaction.java index d16f463d76..6572456f5c 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermRemoveAccountsFromWhitelistTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermRemoveAccountsFromWhitelistTransaction.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory.RemoveAccountsFromWhitelistResponse; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory.RemoveAccountsFromWhitelistResponse; import java.io.IOException; import java.util.List; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermRemoveNodeTransaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermRemoveNodeTransaction.java similarity index 78% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermRemoveNodeTransaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermRemoveNodeTransaction.java index 336fabcf76..2abac3694f 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermRemoveNodeTransaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermRemoveNodeTransaction.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory.RemoveNodeResponse; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory.RemoveNodeResponse; import java.io.IOException; import java.net.URI; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java similarity index 97% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java index 64faa3007f..7493766f3c 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; import java.net.URI; import java.util.Collections; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermissioningTransactions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningTransactions.java similarity index 91% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermissioningTransactions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningTransactions.java index e3cb79678d..dbe8d08a72 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermissioningTransactions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningTransactions.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.login.LoginSuccessfulTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.login.LoginSuccessfulTransaction; import java.net.URI; import java.util.Arrays; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java similarity index 76% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java index 555a50a142..751813e705 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.privacy; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy; import org.web3j.protocol.Web3jService; import org.web3j.protocol.pantheon.Pantheon; public class PrivacyRequestFactory { - private final Pantheon pantheonClient; + private final Pantheon besuClient; public PrivacyRequestFactory(final Web3jService web3jService) { - this.pantheonClient = Pantheon.build(web3jService); + this.besuClient = Pantheon.build(web3jService); } - public Pantheon getPantheonClient() { - return pantheonClient; + public Pantheon getBesuClient() { + return besuClient; } } diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/web3/Web3Sha3Transaction.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/web3/Web3Sha3Transaction.java similarity index 84% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/web3/Web3Sha3Transaction.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/web3/Web3Sha3Transaction.java index 392d8d2255..707841a463 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/web3/Web3Sha3Transaction.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/web3/Web3Sha3Transaction.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.web3; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.web3; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.NodeRequests; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import java.io.IOException; diff --git a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/web3/Web3Transactions.java b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/web3/Web3Transactions.java similarity index 91% rename from acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/web3/Web3Transactions.java rename to acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/web3/Web3Transactions.java index b9694cc257..8f83094405 100644 --- a/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/web3/Web3Transactions.java +++ b/acceptance-tests/src/test-support/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/web3/Web3Transactions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.dsl.transaction.web3; +package org.hyperledger.besu.tests.acceptance.dsl.transaction.web3; public class Web3Transactions { diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ClusterAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterAcceptanceTest.java similarity index 82% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ClusterAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterAcceptanceTest.java index a1d083cbe6..60c66e894b 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ClusterAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterAcceptanceTest.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance; +package org.hyperledger.besu.tests.acceptance; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; import org.junit.Before; import org.junit.Test; @@ -25,8 +25,8 @@ public class ClusterAcceptanceTest extends AcceptanceTestBase { @Before public void setUp() throws Exception { - minerNode = pantheon.createMinerNode("node1"); - fullNode = pantheon.createArchiveNode("node2"); + minerNode = besu.createMinerNode("node1"); + fullNode = besu.createArchiveNode("node2"); cluster.start(minerNode, fullNode); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java similarity index 70% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java index a866d281df..885740742c 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance; +package org.hyperledger.besu.tests.acceptance; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.Cluster; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; import org.junit.Before; import org.junit.Test; @@ -32,8 +32,8 @@ public class ClusterNoDiscoveryAcceptanceTest extends AcceptanceTestBase { final ClusterConfiguration clusterConfiguration = new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build(); noDiscoveryCluster = new Cluster(clusterConfiguration, net); - noDiscoveryNode = pantheon.createNodeWithNoDiscovery("noDiscovery"); - fullNode = pantheon.createArchiveNode("node2"); + noDiscoveryNode = besu.createNodeWithNoDiscovery("noDiscovery"); + fullNode = besu.createArchiveNode("node2"); noDiscoveryCluster.start(noDiscoveryNode, fullNode); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java similarity index 60% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java index 3208e1396a..3c14c54ce7 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance; +package org.hyperledger.besu.tests.acceptance; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNodeRunner; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.ThreadPantheonNodeRunner; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.Cluster; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNodeRunner; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.ThreadBesuNodeRunner; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; import org.junit.Before; import org.junit.Test; @@ -33,10 +33,10 @@ public class ClusterThreadNodeRunnerAcceptanceTest extends AcceptanceTestBase { public void setUp() throws Exception { final ClusterConfiguration clusterConfiguration = new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build(); - final PantheonNodeRunner pantheonNodeRunner = new ThreadPantheonNodeRunner(); - noDiscoveryCluster = new Cluster(clusterConfiguration, net, pantheonNodeRunner); - final PantheonNode noDiscoveryNode = pantheon.createNodeWithNoDiscovery("noDiscovery"); - fullNode = pantheon.createArchiveNode("node2"); + final BesuNodeRunner besuNodeRunner = new ThreadBesuNodeRunner(); + noDiscoveryCluster = new Cluster(clusterConfiguration, net, besuNodeRunner); + final BesuNode noDiscoveryNode = besu.createNodeWithNoDiscovery("noDiscovery"); + fullNode = besu.createArchiveNode("node2"); noDiscoveryCluster.start(noDiscoveryNode, fullNode); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/CreateAccountAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/CreateAccountAcceptanceTest.java similarity index 71% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/CreateAccountAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/CreateAccountAcceptanceTest.java index b31a0175f1..a48cb1f1d7 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/CreateAccountAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/CreateAccountAcceptanceTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance; +package org.hyperledger.besu.tests.acceptance; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.blockchain.Amount; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; import org.junit.Before; import org.junit.Test; @@ -26,8 +26,8 @@ public class CreateAccountAcceptanceTest extends AcceptanceTestBase { @Before public void setUp() throws Exception { - minerNode = pantheon.createMinerNode("minerNode"); - cluster.start(minerNode, pantheon.createArchiveNode("archiveNode")); + minerNode = besu.createMinerNode("minerNode"); + cluster.start(minerNode, besu.createArchiveNode("archiveNode")); } @Test diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/MetricsAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/MetricsAcceptanceTest.java similarity index 71% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/MetricsAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/MetricsAcceptanceTest.java index df81ae559e..4f664f5330 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/MetricsAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/MetricsAcceptanceTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance; +package org.hyperledger.besu.tests.acceptance; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.PantheonNodeConfigurationBuilder; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeConfigurationBuilder; import java.io.IOException; @@ -29,14 +29,14 @@ import org.junit.Test; public class MetricsAcceptanceTest extends AcceptanceTestBase { - private PantheonNode metricsNode; + private BesuNode metricsNode; private OkHttpClient client; @Before public void setUp() throws Exception { metricsNode = - pantheon.create( - new PantheonNodeConfigurationBuilder().name("metrics-node").metricsEnabled().build()); + besu.create( + new BesuNodeConfigurationBuilder().name("metrics-node").metricsEnabled().build()); cluster.start(metricsNode); client = new OkHttpClient(); } @@ -49,6 +49,6 @@ public class MetricsAcceptanceTest extends AcceptanceTestBase { client.newCall(new Request.Builder().url(metricsNode.metricsHttpUrl().get()).build()); final Response response = metricsRequest.execute(); - assertThat(response.body().string()).contains("# TYPE pantheon_peers_connected_total counter"); + assertThat(response.body().string()).contains("# TYPE besu_peers_connected_total counter"); } } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/P2pDisabledAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/P2pDisabledAcceptanceTest.java similarity index 76% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/P2pDisabledAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/P2pDisabledAcceptanceTest.java index e1248d6be0..5aa4368a98 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/P2pDisabledAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/P2pDisabledAcceptanceTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance; +package org.hyperledger.besu.tests.acceptance; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.Cluster; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; import org.junit.Before; import org.junit.Test; @@ -31,7 +31,7 @@ public class P2pDisabledAcceptanceTest extends AcceptanceTestBase { new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build(); p2pDisabledCluster = new Cluster(clusterConfiguration, net); - node = pantheon.createNodeWithP2pDisabled("node1"); + node = besu.createNodeWithP2pDisabled("node1"); p2pDisabledCluster.start(node); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/RpcApisTogglesAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/RpcApisTogglesAcceptanceTest.java similarity index 78% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/RpcApisTogglesAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/RpcApisTogglesAcceptanceTest.java index 1243c2e365..47fc57759f 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/RpcApisTogglesAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/RpcApisTogglesAcceptanceTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance; +package org.hyperledger.besu.tests.acceptance; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApis; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; import org.java_websocket.exceptions.WebsocketNotConnectedException; import org.junit.Before; @@ -25,15 +25,15 @@ import org.junit.Test; public class RpcApisTogglesAcceptanceTest extends AcceptanceTestBase { - private PantheonNode rpcEnabledNode; - private PantheonNode rpcDisabledNode; - private PantheonNode ethApiDisabledNode; + private BesuNode rpcEnabledNode; + private BesuNode rpcDisabledNode; + private BesuNode ethApiDisabledNode; @Before public void before() throws Exception { - rpcEnabledNode = pantheon.createArchiveNode("rpc-enabled"); - rpcDisabledNode = pantheon.createArchiveNodeWithRpcDisabled("rpc-disabled"); - ethApiDisabledNode = pantheon.createArchiveNodeWithRpcApis("eth-api-disabled", RpcApis.NET); + rpcEnabledNode = besu.createArchiveNode("rpc-enabled"); + rpcDisabledNode = besu.createArchiveNodeWithRpcDisabled("rpc-disabled"); + ethApiDisabledNode = besu.createArchiveNodeWithRpcApis("eth-api-disabled", RpcApis.NET); cluster.start(rpcEnabledNode, rpcDisabledNode, ethApiDisabledNode); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/StaticNodesAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/StaticNodesAcceptanceTest.java similarity index 73% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/StaticNodesAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/StaticNodesAcceptanceTest.java index 91d64beecd..bc382eeb58 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/StaticNodesAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/StaticNodesAcceptanceTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance; +package org.hyperledger.besu.tests.acceptance; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; import java.util.Arrays; @@ -28,13 +28,13 @@ public class StaticNodesAcceptanceTest extends AcceptanceTestBase { @Before public void setUp() throws Exception { - otherNode = pantheon.createNodeWithNoDiscovery("other-node"); + otherNode = besu.createNodeWithNoDiscovery("other-node"); cluster.start(otherNode); } @Test public void shouldConnectToNodeAddedAsStaticNode() throws Exception { - node = pantheon.createNodeWithStaticNodes("node", Arrays.asList(otherNode)); + node = besu.createNodeWithStaticNodes("node", Arrays.asList(otherNode)); cluster.addNode(node); node.verify(net.awaitPeerCount(1)); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueDiscardRpcAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueDiscardRpcAcceptanceTest.java similarity index 73% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueDiscardRpcAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueDiscardRpcAcceptanceTest.java index 68a5ba47d7..faf6094807 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueDiscardRpcAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueDiscardRpcAcceptanceTest.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.clique; +package org.hyperledger.besu.tests.acceptance.clique; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; import java.io.IOException; @@ -24,12 +24,9 @@ public class CliqueDiscardRpcAcceptanceTest extends AcceptanceTestBase { @Test public void shouldDiscardVotes() throws IOException { final String[] validators = {"validator1", "validator3"}; - final PantheonNode validator1 = - pantheon.createCliqueNodeWithValidators("validator1", validators); - final PantheonNode validator2 = - pantheon.createCliqueNodeWithValidators("validator2", validators); - final PantheonNode validator3 = - pantheon.createCliqueNodeWithValidators("validator3", validators); + final BesuNode validator1 = besu.createCliqueNodeWithValidators("validator1", validators); + final BesuNode validator2 = besu.createCliqueNodeWithValidators("validator2", validators); + final BesuNode validator3 = besu.createCliqueNodeWithValidators("validator3", validators); cluster.start(validator1, validator2, validator3); validator1.execute(cliqueTransactions.createAddProposal(validator2)); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueGetSignersRpcTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueGetSignersRpcTest.java similarity index 77% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueGetSignersRpcTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueGetSignersRpcTest.java index cb6e548539..eab5b5de87 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueGetSignersRpcTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueGetSignersRpcTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.clique; +package org.hyperledger.besu.tests.acceptance.clique; -import static tech.pegasys.pantheon.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST; +import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; import org.junit.Before; import org.junit.Ignore; @@ -23,14 +23,14 @@ import org.junit.Test; @Ignore public class CliqueGetSignersRpcTest extends AcceptanceTestBase { - private PantheonNode minerNode1; - private PantheonNode minerNode2; + private BesuNode minerNode1; + private BesuNode minerNode2; @Before public void setUp() throws Exception { final String[] validators = {"miner1"}; - minerNode1 = pantheon.createCliqueNodeWithValidators("miner1", validators); - minerNode2 = pantheon.createCliqueNodeWithValidators("miner2", validators); + minerNode1 = besu.createCliqueNodeWithValidators("miner1", validators); + minerNode2 = besu.createCliqueNodeWithValidators("miner2", validators); cluster.start(minerNode1, minerNode2); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueMiningAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueMiningAcceptanceTest.java similarity index 74% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueMiningAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueMiningAcceptanceTest.java index b9969e7309..6fe0230d2e 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueMiningAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueMiningAcceptanceTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.clique; +package org.hyperledger.besu.tests.acceptance.clique; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; import java.io.IOException; @@ -24,7 +24,7 @@ public class CliqueMiningAcceptanceTest extends AcceptanceTestBase { @Test public void shouldMineTransactionsOnSingleNode() throws IOException { - final PantheonNode minerNode = pantheon.createCliqueNode("miner1"); + final BesuNode minerNode = besu.createCliqueNode("miner1"); cluster.start(minerNode); final Account sender = accounts.createAccount("account1"); @@ -42,9 +42,9 @@ public class CliqueMiningAcceptanceTest extends AcceptanceTestBase { @Test public void shouldMineTransactionsOnMultipleNodes() throws IOException { - final PantheonNode minerNode1 = pantheon.createCliqueNode("miner1"); - final PantheonNode minerNode2 = pantheon.createCliqueNode("miner2"); - final PantheonNode minerNode3 = pantheon.createCliqueNode("miner3"); + final BesuNode minerNode1 = besu.createCliqueNode("miner1"); + final BesuNode minerNode2 = besu.createCliqueNode("miner2"); + final BesuNode minerNode3 = besu.createCliqueNode("miner3"); cluster.start(minerNode1, minerNode2, minerNode3); final Account sender = accounts.createAccount("account1"); @@ -62,9 +62,9 @@ public class CliqueMiningAcceptanceTest extends AcceptanceTestBase { @Test public void shouldStallMiningWhenInsufficientValidators() throws IOException { - final PantheonNode minerNode1 = pantheon.createCliqueNode("miner1"); - final PantheonNode minerNode2 = pantheon.createCliqueNode("miner2"); - final PantheonNode minerNode3 = pantheon.createCliqueNode("miner3"); + final BesuNode minerNode1 = besu.createCliqueNode("miner1"); + final BesuNode minerNode2 = besu.createCliqueNode("miner2"); + final BesuNode minerNode3 = besu.createCliqueNode("miner3"); cluster.start(minerNode1, minerNode2, minerNode3); cluster.stopNode(minerNode2); @@ -75,9 +75,9 @@ public class CliqueMiningAcceptanceTest extends AcceptanceTestBase { @Test public void shouldStillMineWhenANodeFailsAndHasSufficientValidators() throws IOException { - final PantheonNode minerNode1 = pantheon.createCliqueNode("miner1"); - final PantheonNode minerNode2 = pantheon.createCliqueNode("miner2"); - final PantheonNode minerNode3 = pantheon.createCliqueNode("miner3"); + final BesuNode minerNode1 = besu.createCliqueNode("miner1"); + final BesuNode minerNode2 = besu.createCliqueNode("miner2"); + final BesuNode minerNode3 = besu.createCliqueNode("miner3"); cluster.start(minerNode1, minerNode2, minerNode3); cluster.verifyOnActiveNodes(blockchain.reachesHeight(minerNode1, 1, 85)); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueProposalRpcAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposalRpcAcceptanceTest.java similarity index 72% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueProposalRpcAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposalRpcAcceptanceTest.java index ee414c56ea..aa8ba1c465 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueProposalRpcAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposalRpcAcceptanceTest.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.clique; +package org.hyperledger.besu.tests.acceptance.clique; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; import java.io.IOException; @@ -24,12 +24,9 @@ public class CliqueProposalRpcAcceptanceTest extends AcceptanceTestBase { @Test public void shouldReturnProposals() throws IOException { final String[] initialValidators = {"miner1", "miner2"}; - final PantheonNode minerNode1 = - pantheon.createCliqueNodeWithValidators("miner1", initialValidators); - final PantheonNode minerNode2 = - pantheon.createCliqueNodeWithValidators("miner2", initialValidators); - final PantheonNode minerNode3 = - pantheon.createCliqueNodeWithValidators("miner3", initialValidators); + final BesuNode minerNode1 = besu.createCliqueNodeWithValidators("miner1", initialValidators); + final BesuNode minerNode2 = besu.createCliqueNodeWithValidators("miner2", initialValidators); + final BesuNode minerNode3 = besu.createCliqueNodeWithValidators("miner3", initialValidators); cluster.start(minerNode1, minerNode2, minerNode3); cluster.verify(clique.noProposals()); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueProposeRpcAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposeRpcAcceptanceTest.java similarity index 64% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueProposeRpcAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposeRpcAcceptanceTest.java index 0d6edba94d..8cd4da577d 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueProposeRpcAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueProposeRpcAcceptanceTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.clique; +package org.hyperledger.besu.tests.acceptance.clique; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.clique.ExpectNonceVote.CLIQUE_NONCE_VOTE; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.condition.clique.ExpectNonceVote.CLIQUE_NONCE_VOTE; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; import java.io.IOException; @@ -26,12 +26,9 @@ public class CliqueProposeRpcAcceptanceTest extends AcceptanceTestBase { @Test public void shouldAddValidators() throws IOException { final String[] initialValidators = {"miner1", "miner2"}; - final PantheonNode minerNode1 = - pantheon.createCliqueNodeWithValidators("miner1", initialValidators); - final PantheonNode minerNode2 = - pantheon.createCliqueNodeWithValidators("miner2", initialValidators); - final PantheonNode minerNode3 = - pantheon.createCliqueNodeWithValidators("miner3", initialValidators); + final BesuNode minerNode1 = besu.createCliqueNodeWithValidators("miner1", initialValidators); + final BesuNode minerNode2 = besu.createCliqueNodeWithValidators("miner2", initialValidators); + final BesuNode minerNode3 = besu.createCliqueNodeWithValidators("miner3", initialValidators); cluster.start(minerNode1, minerNode2, minerNode3); cluster.verify(clique.validatorsEqual(minerNode1, minerNode2)); @@ -43,12 +40,9 @@ public class CliqueProposeRpcAcceptanceTest extends AcceptanceTestBase { @Test public void shouldRemoveValidators() throws IOException { final String[] initialValidators = {"miner1", "miner2", "miner3"}; - final PantheonNode minerNode1 = - pantheon.createCliqueNodeWithValidators("miner1", initialValidators); - final PantheonNode minerNode2 = - pantheon.createCliqueNodeWithValidators("miner2", initialValidators); - final PantheonNode minerNode3 = - pantheon.createCliqueNodeWithValidators("miner3", initialValidators); + final BesuNode minerNode1 = besu.createCliqueNodeWithValidators("miner1", initialValidators); + final BesuNode minerNode2 = besu.createCliqueNodeWithValidators("miner2", initialValidators); + final BesuNode minerNode3 = besu.createCliqueNodeWithValidators("miner3", initialValidators); cluster.start(minerNode1, minerNode2, minerNode3); cluster.verify(clique.validatorsEqual(minerNode1, minerNode2, minerNode3)); @@ -62,12 +56,9 @@ public class CliqueProposeRpcAcceptanceTest extends AcceptanceTestBase { @Test public void shouldNotAddValidatorWhenInsufficientVotes() throws IOException { final String[] initialValidators = {"miner1", "miner2"}; - final PantheonNode minerNode1 = - pantheon.createCliqueNodeWithValidators("miner1", initialValidators); - final PantheonNode minerNode2 = - pantheon.createCliqueNodeWithValidators("miner2", initialValidators); - final PantheonNode minerNode3 = - pantheon.createCliqueNodeWithValidators("miner3", initialValidators); + final BesuNode minerNode1 = besu.createCliqueNodeWithValidators("miner1", initialValidators); + final BesuNode minerNode2 = besu.createCliqueNodeWithValidators("miner2", initialValidators); + final BesuNode minerNode3 = besu.createCliqueNodeWithValidators("miner3", initialValidators); cluster.start(minerNode1, minerNode2, minerNode3); cluster.verify(clique.validatorsEqual(minerNode1, minerNode2)); @@ -78,9 +69,9 @@ public class CliqueProposeRpcAcceptanceTest extends AcceptanceTestBase { @Test public void shouldNotRemoveValidatorWhenInsufficientVotes() throws IOException { - final PantheonNode minerNode1 = pantheon.createCliqueNode("miner1"); - final PantheonNode minerNode2 = pantheon.createCliqueNode("miner2"); - final PantheonNode minerNode3 = pantheon.createCliqueNode("miner3"); + final BesuNode minerNode1 = besu.createCliqueNode("miner1"); + final BesuNode minerNode2 = besu.createCliqueNode("miner2"); + final BesuNode minerNode3 = besu.createCliqueNode("miner3"); cluster.start(minerNode1, minerNode2, minerNode3); cluster.verify(clique.validatorsEqual(minerNode1, minerNode2, minerNode3)); @@ -92,12 +83,9 @@ public class CliqueProposeRpcAcceptanceTest extends AcceptanceTestBase { @Test public void shouldIncludeVoteInBlockHeader() throws IOException { final String[] initialValidators = {"miner1", "miner2"}; - final PantheonNode minerNode1 = - pantheon.createCliqueNodeWithValidators("miner1", initialValidators); - final PantheonNode minerNode2 = - pantheon.createCliqueNodeWithValidators("miner2", initialValidators); - final PantheonNode minerNode3 = - pantheon.createCliqueNodeWithValidators("miner3", initialValidators); + final BesuNode minerNode1 = besu.createCliqueNodeWithValidators("miner1", initialValidators); + final BesuNode minerNode2 = besu.createCliqueNodeWithValidators("miner2", initialValidators); + final BesuNode minerNode3 = besu.createCliqueNodeWithValidators("miner3", initialValidators); cluster.start(minerNode1, minerNode2, minerNode3); minerNode1.execute(cliqueTransactions.createAddProposal(minerNode3)); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueZeroValidators.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueZeroValidators.java similarity index 70% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueZeroValidators.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueZeroValidators.java index ff67527dcb..8d333ce325 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/clique/CliqueZeroValidators.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueZeroValidators.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.clique; +package org.hyperledger.besu.tests.acceptance.clique; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; import java.io.IOException; @@ -24,8 +24,8 @@ public class CliqueZeroValidators extends AcceptanceTestBase { @Test public void zeroValidatorsFormValidCluster() throws IOException { final String[] signers = {}; - final PantheonNode node1 = pantheon.createCliqueNodeWithValidators("node1", signers); - final PantheonNode node2 = pantheon.createCliqueNodeWithValidators("node2", signers); + final BesuNode node1 = besu.createCliqueNodeWithValidators("node1", signers); + final BesuNode node2 = besu.createCliqueNodeWithValidators("node2", signers); cluster.start(node1, node2); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ibft2/Ibft2DiscardRpcAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2DiscardRpcAcceptanceTest.java similarity index 73% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ibft2/Ibft2DiscardRpcAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2DiscardRpcAcceptanceTest.java index cf72f16a0f..d7429417fa 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ibft2/Ibft2DiscardRpcAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2DiscardRpcAcceptanceTest.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.ibft2; +package org.hyperledger.besu.tests.acceptance.ibft2; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; import java.io.IOException; @@ -24,12 +24,9 @@ public class Ibft2DiscardRpcAcceptanceTest extends AcceptanceTestBase { @Test public void shouldDiscardVotes() throws IOException { final String[] validators = {"validator1", "validator3"}; - final PantheonNode validator1 = - pantheon.createIbft2NodeWithValidators("validator1", validators); - final PantheonNode validator2 = - pantheon.createIbft2NodeWithValidators("validator2", validators); - final PantheonNode validator3 = - pantheon.createIbft2NodeWithValidators("validator3", validators); + final BesuNode validator1 = besu.createIbft2NodeWithValidators("validator1", validators); + final BesuNode validator2 = besu.createIbft2NodeWithValidators("validator2", validators); + final BesuNode validator3 = besu.createIbft2NodeWithValidators("validator3", validators); cluster.start(validator1, validator2, validator3); validator1.execute(ibftTwoTransactions.createAddProposal(validator2)); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ibft2/Ibft2MiningAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2MiningAcceptanceTest.java similarity index 69% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ibft2/Ibft2MiningAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2MiningAcceptanceTest.java index 6dbc9e0300..81c78db638 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ibft2/Ibft2MiningAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2MiningAcceptanceTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.ibft2; +package org.hyperledger.besu.tests.acceptance.ibft2; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; import java.io.IOException; import java.util.List; @@ -25,7 +25,7 @@ public class Ibft2MiningAcceptanceTest extends AcceptanceTestBase { @Test public void shouldMineOnSingleNode() throws IOException { - final PantheonNode minerNode = pantheon.createIbft2Node("miner1"); + final BesuNode minerNode = besu.createIbft2Node("miner1"); cluster.start(minerNode); cluster.verify(blockchain.reachesHeight(minerNode, 1)); @@ -45,10 +45,10 @@ public class Ibft2MiningAcceptanceTest extends AcceptanceTestBase { @Test public void shouldMineOnMultipleNodes() throws IOException { - final PantheonNode minerNode1 = pantheon.createIbft2Node("miner1"); - final PantheonNode minerNode2 = pantheon.createIbft2Node("miner2"); - final PantheonNode minerNode3 = pantheon.createIbft2Node("miner3"); - final PantheonNode minerNode4 = pantheon.createIbft2Node("miner4"); + final BesuNode minerNode1 = besu.createIbft2Node("miner1"); + final BesuNode minerNode2 = besu.createIbft2Node("miner2"); + final BesuNode minerNode3 = besu.createIbft2Node("miner3"); + final BesuNode minerNode4 = besu.createIbft2Node("miner4"); cluster.start(minerNode1, minerNode2, minerNode3, minerNode4); cluster.verify(blockchain.reachesHeight(minerNode1, 1, 85)); @@ -72,14 +72,11 @@ public class Ibft2MiningAcceptanceTest extends AcceptanceTestBase { @Test public void shouldMineOnMultipleNodesEvenWhenClusterContainsNonValidator() throws IOException { final String[] validators = {"validator1", "validator2", "validator3"}; - final PantheonNode validator1 = - pantheon.createIbft2NodeWithValidators("validator1", validators); - final PantheonNode validator2 = - pantheon.createIbft2NodeWithValidators("validator2", validators); - final PantheonNode validator3 = - pantheon.createIbft2NodeWithValidators("validator3", validators); - final PantheonNode nonValidatorNode = - pantheon.createIbft2NodeWithValidators("non-validator", validators); + final BesuNode validator1 = besu.createIbft2NodeWithValidators("validator1", validators); + final BesuNode validator2 = besu.createIbft2NodeWithValidators("validator2", validators); + final BesuNode validator3 = besu.createIbft2NodeWithValidators("validator3", validators); + final BesuNode nonValidatorNode = + besu.createIbft2NodeWithValidators("non-validator", validators); cluster.start(validator1, validator2, validator3, nonValidatorNode); cluster.verify(blockchain.reachesHeight(validator1, 1, 85)); @@ -100,13 +97,13 @@ public class Ibft2MiningAcceptanceTest extends AcceptanceTestBase { @Test public void shouldStillMineWhenANonProposerNodeFailsAndHasSufficientValidators() throws IOException { - final PantheonNode minerNode1 = pantheon.createIbft2Node("miner1"); - final PantheonNode minerNode2 = pantheon.createIbft2Node("miner2"); - final PantheonNode minerNode3 = pantheon.createIbft2Node("miner3"); - final PantheonNode minerNode4 = pantheon.createIbft2Node("miner4"); - final List validators = - ibftTwo.validators(new PantheonNode[] {minerNode1, minerNode2, minerNode3, minerNode4}); - final PantheonNode nonProposerNode = validators.get(validators.size() - 1); + final BesuNode minerNode1 = besu.createIbft2Node("miner1"); + final BesuNode minerNode2 = besu.createIbft2Node("miner2"); + final BesuNode minerNode3 = besu.createIbft2Node("miner3"); + final BesuNode minerNode4 = besu.createIbft2Node("miner4"); + final List validators = + ibftTwo.validators(new BesuNode[] {minerNode1, minerNode2, minerNode3, minerNode4}); + final BesuNode nonProposerNode = validators.get(validators.size() - 1); cluster.start(validators); cluster.verify(blockchain.reachesHeight(minerNode1, 1, 85)); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ibft2/Ibft2ProposalRpcAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposalRpcAcceptanceTest.java similarity index 73% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ibft2/Ibft2ProposalRpcAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposalRpcAcceptanceTest.java index 52a4f7633d..7c41f263f8 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ibft2/Ibft2ProposalRpcAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposalRpcAcceptanceTest.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.ibft2; +package org.hyperledger.besu.tests.acceptance.ibft2; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; import java.io.IOException; @@ -24,12 +24,9 @@ public class Ibft2ProposalRpcAcceptanceTest extends AcceptanceTestBase { @Test public void shouldReturnProposals() throws IOException { final String[] validators = {"validator1", "validator2", "validator3"}; - final PantheonNode validator1 = - pantheon.createIbft2NodeWithValidators("validator1", validators); - final PantheonNode validator2 = - pantheon.createIbft2NodeWithValidators("validator2", validators); - final PantheonNode validator3 = - pantheon.createIbft2NodeWithValidators("validator3", validators); + final BesuNode validator1 = besu.createIbft2NodeWithValidators("validator1", validators); + final BesuNode validator2 = besu.createIbft2NodeWithValidators("validator2", validators); + final BesuNode validator3 = besu.createIbft2NodeWithValidators("validator3", validators); cluster.start(validator1, validator2, validator3); cluster.verify(ibftTwo.noProposals()); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ibft2/Ibft2ProposeRpcAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposeRpcAcceptanceTest.java similarity index 73% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ibft2/Ibft2ProposeRpcAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposeRpcAcceptanceTest.java index 56c40c225e..55b0171860 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ibft2/Ibft2ProposeRpcAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposeRpcAcceptanceTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.ibft2; +package org.hyperledger.besu.tests.acceptance.ibft2; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; import java.io.IOException; @@ -27,14 +27,11 @@ public class Ibft2ProposeRpcAcceptanceTest extends AcceptanceTestBase { @Test public void validatorsCanBeAddedAndThenRemoved() throws IOException { final String[] validators = {"validator1", "validator2", "validator3"}; - final PantheonNode validator1 = - pantheon.createIbft2NodeWithValidators("validator1", validators); - final PantheonNode validator2 = - pantheon.createIbft2NodeWithValidators("validator2", validators); - final PantheonNode validator3 = - pantheon.createIbft2NodeWithValidators("validator3", validators); - final PantheonNode nonValidatorNode = - pantheon.createIbft2NodeWithValidators("non-validator", validators); + final BesuNode validator1 = besu.createIbft2NodeWithValidators("validator1", validators); + final BesuNode validator2 = besu.createIbft2NodeWithValidators("validator2", validators); + final BesuNode validator3 = besu.createIbft2NodeWithValidators("validator3", validators); + final BesuNode nonValidatorNode = + besu.createIbft2NodeWithValidators("non-validator", validators); cluster.start(validator1, validator2, validator3, nonValidatorNode); cluster.verify(ibftTwo.validatorsEqual(validator1, validator2, validator3)); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ibft2/Ibft2ZeroValidators.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ZeroValidators.java similarity index 70% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ibft2/Ibft2ZeroValidators.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ZeroValidators.java index 759648cf48..c5bc381f91 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/ibft2/Ibft2ZeroValidators.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ZeroValidators.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.ibft2; +package org.hyperledger.besu.tests.acceptance.ibft2; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; import java.io.IOException; @@ -24,8 +24,8 @@ public class Ibft2ZeroValidators extends AcceptanceTestBase { @Test public void zeroValidatorsFormValidCluster() throws IOException { final String[] validators = {}; - final PantheonNode node1 = pantheon.createIbft2NodeWithValidators("node1", validators); - final PantheonNode node2 = pantheon.createIbft2NodeWithValidators("node2", validators); + final BesuNode node1 = besu.createIbft2NodeWithValidators("node1", validators); + final BesuNode node2 = besu.createIbft2NodeWithValidators("node2", validators); cluster.start(node1, node2); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/EthGetWorkAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthGetWorkAcceptanceTest.java similarity index 79% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/EthGetWorkAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthGetWorkAcceptanceTest.java index eec687f94b..2c81bfd21c 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/EthGetWorkAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthGetWorkAcceptanceTest.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.jsonrpc; +package org.hyperledger.besu.tests.acceptance.jsonrpc; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; import org.junit.Before; import org.junit.Test; @@ -25,8 +25,8 @@ public class EthGetWorkAcceptanceTest extends AcceptanceTestBase { @Before public void setUp() throws Exception { - minerNode = pantheon.createMinerNode("node1"); - fullNode = pantheon.createArchiveNode("node2"); + minerNode = besu.createMinerNode("node1"); + fullNode = besu.createArchiveNode("node2"); cluster.start(minerNode, fullNode); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java similarity index 78% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java index 90e8bfab99..b997dc65ac 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.jsonrpc; +package org.hyperledger.besu.tests.acceptance.jsonrpc; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.Cluster; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; import java.io.IOException; import java.net.URISyntaxException; @@ -27,7 +27,7 @@ import org.junit.Test; public class HttpServiceLoginAcceptanceTest extends AcceptanceTestBase { private Cluster authenticatedCluster; - private PantheonNode node; + private BesuNode node; @Before public void setUp() throws IOException, URISyntaxException { @@ -35,7 +35,7 @@ public class HttpServiceLoginAcceptanceTest extends AcceptanceTestBase { new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build(); authenticatedCluster = new Cluster(clusterConfiguration, net); - node = pantheon.createArchiveNodeWithAuthentication("node1"); + node = besu.createArchiveNodeWithAuthentication("node1"); authenticatedCluster.start(node); node.verify(login.awaitResponse("user", "badpassword")); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java similarity index 69% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java index db7849abc2..d9307518df 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.jsonrpc; +package org.hyperledger.besu.tests.acceptance.jsonrpc; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.Cluster; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; import org.junit.Test; @@ -32,8 +32,8 @@ public class NetServicesAcceptanceTest extends AcceptanceTestBase { final ClusterConfiguration clusterConfiguration = new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build(); noDiscoveryCluster = new Cluster(clusterConfiguration, net); - nodeA = pantheon.createArchiveNodeNetServicesEnabled("nodeA"); - nodeB = pantheon.createArchiveNodeNetServicesEnabled("nodeB"); + nodeA = besu.createArchiveNodeNetServicesEnabled("nodeA"); + nodeB = besu.createArchiveNodeNetServicesEnabled("nodeB"); noDiscoveryCluster.start(nodeA, nodeB); nodeA.verify(net.netServicesAllActive()); @@ -45,8 +45,8 @@ public class NetServicesAcceptanceTest extends AcceptanceTestBase { final ClusterConfiguration clusterConfiguration = new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build(); noDiscoveryCluster = new Cluster(clusterConfiguration, net); - nodeA = pantheon.createArchiveNodeNetServicesDisabled("nodeA"); - nodeB = pantheon.createArchiveNodeNetServicesDisabled("nodeB"); + nodeA = besu.createArchiveNodeNetServicesDisabled("nodeA"); + nodeB = besu.createArchiveNodeNetServicesDisabled("nodeB"); noDiscoveryCluster.start(nodeA, nodeB); nodeA.verify(net.netServicesOnlyJsonRpcEnabled()); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java similarity index 82% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java index c0d7a2ccb0..144d7ec474 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.jsonrpc; +package org.hyperledger.besu.tests.acceptance.jsonrpc; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; import org.junit.Before; import org.junit.Test; @@ -24,7 +24,7 @@ public class Web3Sha3AcceptanceTest extends AcceptanceTestBase { @Before public void setUp() throws Exception { - node = pantheon.createArchiveNode("node1"); + node = besu.createArchiveNode("node1"); cluster.start(node); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/WebsocketServiceLoginAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/WebsocketServiceLoginAcceptanceTest.java similarity index 83% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/WebsocketServiceLoginAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/WebsocketServiceLoginAcceptanceTest.java index f696765985..02f79686de 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/WebsocketServiceLoginAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/WebsocketServiceLoginAcceptanceTest.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.jsonrpc; +package org.hyperledger.besu.tests.acceptance.jsonrpc; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; import java.io.IOException; import java.net.URISyntaxException; @@ -22,11 +22,11 @@ import org.junit.Before; import org.junit.Test; public class WebsocketServiceLoginAcceptanceTest extends AcceptanceTestBase { - private PantheonNode node; + private BesuNode node; @Before public void setUp() throws IOException, URISyntaxException { - node = pantheon.createArchiveNodeWithAuthenticationOverWebSocket("node1"); + node = besu.createArchiveNodeWithAuthenticationOverWebSocket("node1"); cluster.start(node); node.useWebSocketsForJsonRpc(); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java similarity index 70% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java index b9edbc22a6..df4fa3e3ce 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.jsonrpc.admin; +package org.hyperledger.besu.tests.acceptance.jsonrpc.admin; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.Cluster; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; import org.junit.After; import org.junit.Before; @@ -33,8 +33,8 @@ public class AdminAddPeerAcceptanceTest extends AcceptanceTestBase { final ClusterConfiguration clusterConfiguration = new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build(); noDiscoveryCluster = new Cluster(clusterConfiguration, net); - nodeA = pantheon.createArchiveNodeWithDiscoveryDisabledAndAdmin("nodeA"); - nodeB = pantheon.createArchiveNodeWithDiscoveryDisabledAndAdmin("nodeB"); + nodeA = besu.createArchiveNodeWithDiscoveryDisabledAndAdmin("nodeA"); + nodeB = besu.createArchiveNodeWithDiscoveryDisabledAndAdmin("nodeB"); noDiscoveryCluster.start(nodeA, nodeB); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/mining/MiningAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/mining/MiningAcceptanceTest.java similarity index 85% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/mining/MiningAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/mining/MiningAcceptanceTest.java index c2b7b6d659..625b087171 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/mining/MiningAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/mining/MiningAcceptanceTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.mining; +package org.hyperledger.besu.tests.acceptance.mining; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; import org.junit.Before; import org.junit.Test; @@ -25,7 +25,7 @@ public class MiningAcceptanceTest extends AcceptanceTestBase { @Before public void setUp() throws Exception { - minerNode = pantheon.createMinerNode("miner1"); + minerNode = besu.createMinerNode("miner1"); cluster.start(minerNode); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/AccountLocalAndOnChainPermissioningAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalAndOnChainPermissioningAcceptanceTest.java similarity index 93% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/AccountLocalAndOnChainPermissioningAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalAndOnChainPermissioningAcceptanceTest.java index 7b0b47f4e3..939198e1d6 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/AccountLocalAndOnChainPermissioningAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalAndOnChainPermissioningAcceptanceTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.permissioning; +package org.hyperledger.besu.tests.acceptance.permissioning; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.account.TransferTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.account.TransferTransaction; import java.math.BigInteger; import java.util.Arrays; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/AccountLocalConfigPermissioningAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalConfigPermissioningAcceptanceTest.java similarity index 89% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/AccountLocalConfigPermissioningAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalConfigPermissioningAcceptanceTest.java index 9ae9701231..8415912597 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/AccountLocalConfigPermissioningAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalConfigPermissioningAcceptanceTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.permissioning; +package org.hyperledger.besu.tests.acceptance.permissioning; import static org.web3j.utils.Convert.Unit.ETHER; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.account.TransferTransaction; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.account.TransferTransaction; import java.math.BigInteger; import java.util.Collections; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTest.java similarity index 91% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTest.java index ad11c2502d..e5a33003ca 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTest.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.permissioning; +package org.hyperledger.besu.tests.acceptance.permissioning; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; import java.util.Collections; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTestBase.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTestBase.java similarity index 74% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTestBase.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTestBase.java index c92e95906a..e0f788d6e0 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTestBase.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTestBase.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.permissioning; - -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.perm.AccountSmartContractPermissioningConditions; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.Cluster; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.permissioning.PermissionedNodeBuilder; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.AccountSmartContractPermissioningTransactions; +package org.hyperledger.besu.tests.acceptance.permissioning; + +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.condition.perm.AccountSmartContractPermissioningConditions; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.permissioning.PermissionedNodeBuilder; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.AccountSmartContractPermissioningTransactions; import java.io.IOException; import java.util.List; @@ -69,7 +69,7 @@ class AccountSmartContractPermissioningAcceptanceTestBase extends AcceptanceTest protected Node node(final String name) { try { - return pantheon.createCustomGenesisNode(name, GENESIS_FILE, false); + return besu.createCustomGenesisNode(name, GENESIS_FILE, false); } catch (IOException e) { throw new RuntimeException("Error creating node", e); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeLocalAndOnChainPermissioningAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalAndOnChainPermissioningAcceptanceTest.java similarity index 97% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeLocalAndOnChainPermissioningAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalAndOnChainPermissioningAcceptanceTest.java index 60ea9ac455..cb6762a514 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeLocalAndOnChainPermissioningAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalAndOnChainPermissioningAcceptanceTest.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.permissioning; +package org.hyperledger.besu.tests.acceptance.permissioning; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; import org.junit.Before; import org.junit.Test; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeLocalConfigPermissioningAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalConfigPermissioningAcceptanceTest.java similarity index 79% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeLocalConfigPermissioningAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalConfigPermissioningAcceptanceTest.java index df70a7d928..bb92bcfbc6 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeLocalConfigPermissioningAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalConfigPermissioningAcceptanceTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.permissioning; +package org.hyperledger.besu.tests.acceptance.permissioning; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.Cluster; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; import org.junit.Before; import org.junit.Test; @@ -35,9 +35,9 @@ public class NodeLocalConfigPermissioningAcceptanceTest extends AcceptanceTestBa new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build(); permissionedCluster = new Cluster(clusterConfiguration, net); - bootnode = pantheon.createArchiveNode("bootnode"); - forbiddenNode = pantheon.createArchiveNodeThatMustNotBeTheBootnode("forbidden-node"); - allowedNode = pantheon.createArchiveNode("allowed-node"); + bootnode = besu.createArchiveNode("bootnode"); + forbiddenNode = besu.createArchiveNodeThatMustNotBeTheBootnode("forbidden-node"); + allowedNode = besu.createArchiveNode("allowed-node"); permissionedCluster.start(bootnode, allowedNode, forbiddenNode); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java similarity index 96% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java index e901952f31..e8b112e648 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.permissioning; +package org.hyperledger.besu.tests.acceptance.permissioning; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; import org.junit.Before; import org.junit.Test; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTestBase.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTestBase.java similarity index 77% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTestBase.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTestBase.java index c0cb9c32d0..f221656250 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTestBase.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTestBase.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.permissioning; +package org.hyperledger.besu.tests.acceptance.permissioning; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; -import tech.pegasys.pantheon.tests.acceptance.dsl.condition.perm.NodeSmartContractPermissioningConditions; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.Cluster; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfiguration; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.configuration.permissioning.PermissionedNodeBuilder; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.Transaction; -import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.perm.NodeSmartContractPermissioningTransactions; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils; +import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition; +import org.hyperledger.besu.tests.acceptance.dsl.condition.perm.NodeSmartContractPermissioningConditions; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration; +import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder; +import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.permissioning.PermissionedNodeBuilder; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.NodeSmartContractPermissioningTransactions; import java.io.IOException; import java.math.BigInteger; @@ -68,7 +68,7 @@ class NodeSmartContractPermissioningAcceptanceTestBase extends AcceptanceTestBas protected Node bootnode(final String name) { try { - return pantheon.createCustomGenesisNode(name, GENESIS_FILE, true); + return besu.createCustomGenesisNode(name, GENESIS_FILE, true); } catch (IOException e) { throw new RuntimeException("Error creating node", e); } @@ -76,7 +76,7 @@ class NodeSmartContractPermissioningAcceptanceTestBase extends AcceptanceTestBas protected Node node(final String name) { try { - return pantheon.createCustomGenesisNode(name, GENESIS_FILE, false); + return besu.createCustomGenesisNode(name, GENESIS_FILE, false); } catch (IOException e) { throw new RuntimeException("Error creating node", e); } @@ -84,7 +84,7 @@ class NodeSmartContractPermissioningAcceptanceTestBase extends AcceptanceTestBas protected Node miner(final String name) { try { - return pantheon.createCustomGenesisNode(name, GENESIS_FILE, false, true); + return besu.createCustomGenesisNode(name, GENESIS_FILE, false, true); } catch (IOException e) { throw new RuntimeException("Error creating node", e); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeSmartContractPermissioningOutOfSyncAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningOutOfSyncAcceptanceTest.java similarity index 94% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeSmartContractPermissioningOutOfSyncAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningOutOfSyncAcceptanceTest.java index 0f2c1270d9..2a4b0ab875 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodeSmartContractPermissioningOutOfSyncAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningOutOfSyncAcceptanceTest.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.permissioning; +package org.hyperledger.besu.tests.acceptance.permissioning; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; import org.junit.Before; import org.junit.Test; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodesSmartContractPermissioningStaticNodesAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodesSmartContractPermissioningStaticNodesAcceptanceTest.java similarity index 92% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodesSmartContractPermissioningStaticNodesAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodesSmartContractPermissioningStaticNodesAcceptanceTest.java index 176ca59547..38ed633c65 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodesSmartContractPermissioningStaticNodesAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodesSmartContractPermissioningStaticNodesAcceptanceTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.permissioning; +package org.hyperledger.besu.tests.acceptance.permissioning; import static java.util.stream.Collectors.toList; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.RunnableNode; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode; import java.net.URI; import java.util.Arrays; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/WhitelistPersistorAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/WhitelistPersistorAcceptanceTest.java similarity index 91% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/WhitelistPersistorAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/WhitelistPersistorAcceptanceTest.java index 7f2a4b0843..ee1550fd02 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/WhitelistPersistorAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/WhitelistPersistorAcceptanceTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.permissioning; +package org.hyperledger.besu.tests.acceptance.permissioning; -import static tech.pegasys.pantheon.ethereum.permissioning.WhitelistPersistor.WHITELIST_TYPE; +import static org.hyperledger.besu.ethereum.permissioning.WhitelistPersistor.WHITELIST_TYPE; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.node.Node; import java.nio.file.Files; import java.nio.file.Path; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/plugins/PantheonEventsPluginTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BesuEventsPluginTest.java similarity index 79% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/plugins/PantheonEventsPluginTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BesuEventsPluginTest.java index 9f0819f648..727b3d89d9 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/plugins/PantheonEventsPluginTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BesuEventsPluginTest.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.plugins; +package org.hyperledger.besu.tests.acceptance.plugins; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; import java.io.File; import java.nio.file.Files; @@ -26,15 +26,15 @@ import org.awaitility.Awaitility; import org.junit.Before; import org.junit.Test; -public class PantheonEventsPluginTest extends AcceptanceTestBase { - private PantheonNode pluginNode; - private PantheonNode minerNode; +public class BesuEventsPluginTest extends AcceptanceTestBase { + private BesuNode pluginNode; + private BesuNode minerNode; @Before public void setUp() throws Exception { - minerNode = pantheon.createMinerNode("minerNode"); + minerNode = besu.createMinerNode("minerNode"); pluginNode = - pantheon.createPluginsNode( + besu.createPluginsNode( "node1", Collections.singletonList("testPlugins"), Collections.emptyList()); cluster.start(pluginNode, minerNode); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/plugins/PicoCLIOptionsPluginTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PicoCLIOptionsPluginTest.java similarity index 89% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/plugins/PicoCLIOptionsPluginTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PicoCLIOptionsPluginTest.java index 8e60067744..cf47ded2a6 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/plugins/PicoCLIOptionsPluginTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PicoCLIOptionsPluginTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.plugins; +package org.hyperledger.besu.tests.acceptance.plugins; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; import java.io.File; import java.io.IOException; @@ -31,7 +31,7 @@ import org.junit.Ignore; import org.junit.Test; public class PicoCLIOptionsPluginTest extends AcceptanceTestBase { - private PantheonNode node; + private BesuNode node; // context: https://en.wikipedia.org/wiki/The_Magic_Words_are_Squeamish_Ossifrage private static final String MAGIC_WORDS = "Squemish Ossifrage"; @@ -39,7 +39,7 @@ public class PicoCLIOptionsPluginTest extends AcceptanceTestBase { @Before public void setUp() throws Exception { node = - pantheon.createPluginsNode( + besu.createPluginsNode( "node1", Collections.singletonList("testPlugins"), Collections.singletonList("--Xtest-option=" + MAGIC_WORDS)); @@ -68,7 +68,7 @@ public class PicoCLIOptionsPluginTest extends AcceptanceTestBase { } @Test - @Ignore("No way to do a graceful shutdown of Pantheon at the moment.") + @Ignore("No way to do a graceful shutdown of Besu at the moment.") public void shouldStop() { cluster.stopNode(node); waitForFile(node.homeDirectory().resolve("plugins/pluginLifecycle.stopped")); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java similarity index 91% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java index 0d28272523..d7ecaca990 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.acceptance.pubsub; +package org.hyperledger.besu.tests.acceptance.pubsub; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import tech.pegasys.pantheon.tests.acceptance.dsl.pubsub.Subscription; -import tech.pegasys.pantheon.tests.acceptance.dsl.pubsub.WebSocket; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; +import org.hyperledger.besu.tests.acceptance.dsl.pubsub.Subscription; +import org.hyperledger.besu.tests.acceptance.dsl.pubsub.WebSocket; import io.vertx.core.Vertx; import org.junit.After; @@ -30,14 +30,14 @@ public class NewPendingTransactionAcceptanceTest extends AcceptanceTestBase { private Account accountOne; private WebSocket minerWebSocket; private WebSocket archiveWebSocket; - private PantheonNode minerNode; - private PantheonNode archiveNode; + private BesuNode minerNode; + private BesuNode archiveNode; @Before public void setUp() throws Exception { vertx = Vertx.vertx(); - minerNode = pantheon.createMinerNode("miner-node1"); - archiveNode = pantheon.createArchiveNode("full-node1"); + minerNode = besu.createMinerNode("miner-node1"); + archiveNode = besu.createArchiveNode("full-node1"); cluster.start(minerNode, archiveNode); accountOne = accounts.createAccount("account-one"); minerWebSocket = new WebSocket(vertx, minerNode.getConfiguration()); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/DeploySmartContractAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/DeploySmartContractAcceptanceTest.java similarity index 78% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/DeploySmartContractAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/DeploySmartContractAcceptanceTest.java index 3433cd9790..f0a41357b2 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/DeploySmartContractAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/DeploySmartContractAcceptanceTest.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.tests.web3j; +package org.hyperledger.besu.tests.web3j; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import tech.pegasys.pantheon.tests.web3j.generated.SimpleStorage; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; +import org.hyperledger.besu.tests.web3j.generated.SimpleStorage; import org.junit.Before; import org.junit.Test; public class DeploySmartContractAcceptanceTest extends AcceptanceTestBase { - private PantheonNode minerNode; + private BesuNode minerNode; @Before public void setUp() throws Exception { - minerNode = pantheon.createMinerNode("miner-node"); + minerNode = besu.createMinerNode("miner-node"); cluster.start(minerNode); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/DeployTransactionAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/DeployTransactionAcceptanceTest.java similarity index 78% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/DeployTransactionAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/DeployTransactionAcceptanceTest.java index 99483495c5..bea8f571d6 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/DeployTransactionAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/DeployTransactionAcceptanceTest.java @@ -10,25 +10,25 @@ * 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. */ -package tech.pegasys.pantheon.tests.web3j; +package org.hyperledger.besu.tests.web3j; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.account.Account; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; import org.junit.Before; import org.junit.Test; public class DeployTransactionAcceptanceTest extends AcceptanceTestBase { - private PantheonNode minerNode; + private BesuNode minerNode; private Account recipient; @Before public void setUp() throws Exception { recipient = accounts.createAccount("recipient"); - minerNode = pantheon.createMinerNode("node"); + minerNode = besu.createMinerNode("node"); cluster.start(minerNode); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/EventEmitter.sol b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitter.sol similarity index 93% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/EventEmitter.sol rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitter.sol index 93c28213c1..e10f2c9803 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/EventEmitter.sol +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitter.sol @@ -15,7 +15,7 @@ pragma solidity >=0.4.0 <0.6.0; // compile with: // solc EventEmitter.sol --bin --abi --optimize --overwrite -o . // then create web3j wrappers with: -// web3j solidity generate -b ./generated/EventEmitter.bin -a ./generated/EventEmitter.abi -o ../../../../../ -p tech.pegasys.pantheon.tests.web3j.generated +// web3j solidity generate -b ./generated/EventEmitter.bin -a ./generated/EventEmitter.abi -o ../../../../../ -p org.hyperledger.besu.tests.web3j.generated contract EventEmitter { address owner; event stored(address _to, uint _amount); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/EventEmitterAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitterAcceptanceTest.java similarity index 84% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/EventEmitterAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitterAcceptanceTest.java index 83742d84ba..4a87f7aa96 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/EventEmitterAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitterAcceptanceTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.web3j; +package org.hyperledger.besu.tests.web3j; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import tech.pegasys.pantheon.tests.web3j.generated.EventEmitter; -import tech.pegasys.pantheon.tests.web3j.generated.EventEmitter.StoredEventResponse; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; +import org.hyperledger.besu.tests.web3j.generated.EventEmitter; +import org.hyperledger.besu.tests.web3j.generated.EventEmitter.StoredEventResponse; import java.math.BigInteger; import java.util.concurrent.atomic.AtomicBoolean; @@ -34,11 +34,11 @@ import org.web3j.protocol.core.methods.response.TransactionReceipt; */ public class EventEmitterAcceptanceTest extends AcceptanceTestBase { - private PantheonNode node; + private BesuNode node; @Before public void setUp() throws Exception { - node = pantheon.createMinerNode("node1"); + node = besu.createMinerNode("node1"); cluster.start(node); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/RevertReason.sol b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReason.sol similarity index 91% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/RevertReason.sol rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReason.sol index e4c6247379..b2c2d1188c 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/RevertReason.sol +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReason.sol @@ -15,7 +15,7 @@ pragma solidity >=0.4.0 <0.6.0; // compile with: // solc RevertReason.sol --bin --abi --optimize --overwrite -o . // then create web3j wrappers with: -// web3j solidity generate -b ./generated/RevertReason.bin -a ./generated/RevertReason.abi -o ../../../../../ -p tech.pegasys.pantheon.tests.web3j.generated +// web3j solidity generate -b ./generated/RevertReason.bin -a ./generated/RevertReason.abi -o ../../../../../ -p org.hyperledger.besu.tests.web3j.generated contract RevertReason { function revertWithRevertReason() public pure returns (bool) { diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/RevertReasonAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReasonAcceptanceTest.java similarity index 76% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/RevertReasonAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReasonAcceptanceTest.java index c50ea845f8..5672e5933e 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/RevertReasonAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReasonAcceptanceTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.web3j; +package org.hyperledger.besu.tests.web3j; -import static tech.pegasys.pantheon.tests.web3j.generated.RevertReason.FUNC_REVERTWITHOUTREVERTREASON; -import static tech.pegasys.pantheon.tests.web3j.generated.RevertReason.FUNC_REVERTWITHREVERTREASON; +import static org.hyperledger.besu.tests.web3j.generated.RevertReason.FUNC_REVERTWITHOUTREVERTREASON; +import static org.hyperledger.besu.tests.web3j.generated.RevertReason.FUNC_REVERTWITHREVERTREASON; -import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import tech.pegasys.pantheon.tests.web3j.generated.RevertReason; +import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; +import org.hyperledger.besu.tests.web3j.generated.RevertReason; import org.junit.Before; import org.junit.Test; @@ -25,11 +25,11 @@ import org.web3j.protocol.core.methods.response.EthSendTransaction; public class RevertReasonAcceptanceTest extends AcceptanceTestBase { - private PantheonNode minerNode; + private BesuNode minerNode; @Before public void setUp() throws Exception { - minerNode = pantheon.createMinerNodeWithRevertReasonEnabled("miner-node-withRevertReason"); + minerNode = besu.createMinerNodeWithRevertReasonEnabled("miner-node-withRevertReason"); cluster.start(minerNode); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/SimpleStorage.sol b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/SimpleStorage.sol similarity index 91% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/SimpleStorage.sol rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/SimpleStorage.sol index 30c2d7a5f6..3ab02fc488 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/SimpleStorage.sol +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/SimpleStorage.sol @@ -15,7 +15,7 @@ pragma solidity >=0.4.0 <0.6.0; // compile with: // solc SimpleStorage.sol --bin --abi --optimize --overwrite -o . // then create web3j wrappers with: -// web3j solidity generate -b ./generated/SimpleStorage.bin -a ./generated/SimpleStorage.abi -o ../../../../../ -p tech.pegasys.pantheon.tests.web3j.generated +// web3j solidity generate -b ./generated/SimpleStorage.bin -a ./generated/SimpleStorage.abi -o ../../../../../ -p org.hyperledger.besu.tests.web3j.generated contract SimpleStorage { uint data; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/EventEmitter.abi b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.abi similarity index 100% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/EventEmitter.abi rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.abi diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/EventEmitter.bin b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.bin similarity index 100% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/EventEmitter.bin rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.bin diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/EventEmitter.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.java similarity index 99% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/EventEmitter.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.java index ea03b153c0..85f0aa2d49 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/EventEmitter.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.web3j.generated; +package org.hyperledger.besu.tests.web3j.generated; import java.math.BigInteger; import java.util.ArrayList; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/RevertReason.abi b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.abi similarity index 100% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/RevertReason.abi rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.abi diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/RevertReason.bin b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.bin similarity index 100% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/RevertReason.bin rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.bin diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/RevertReason.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.java similarity index 99% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/RevertReason.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.java index 965bf43aec..5fc48b74a3 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/RevertReason.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.web3j.generated; +package org.hyperledger.besu.tests.web3j.generated; import java.math.BigInteger; import java.util.Arrays; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/SimpleStorage.abi b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.abi similarity index 100% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/SimpleStorage.abi rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.abi diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/SimpleStorage.bin b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.bin similarity index 100% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/SimpleStorage.bin rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.bin diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/SimpleStorage.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.java similarity index 99% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/SimpleStorage.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.java index 513af71ee3..f8b9904e33 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/SimpleStorage.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.tests.web3j.generated; +package org.hyperledger.besu.tests.web3j.generated; import java.math.BigInteger; import java.util.Arrays; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java similarity index 82% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java index 3c1594e5e0..2ffe159274 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.web3j.privacy; +package org.hyperledger.besu.tests.web3j.privacy; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyNode; -import tech.pegasys.pantheon.tests.web3j.generated.EventEmitter; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode; +import org.hyperledger.besu.tests.web3j.generated.EventEmitter; import org.junit.Before; import org.junit.Test; @@ -28,7 +28,7 @@ public class DeployPrivateSmartContractAcceptanceTest extends PrivacyAcceptanceT @Before public void setUp() throws Exception { minerNode = - privacyPantheon.createPrivateTransactionEnabledMinerNode( + privacyBesu.createPrivateTransactionEnabledMinerNode( "miner-node", privacyAccountResolver.resolve(0)); privacyCluster.start(minerNode); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java similarity index 91% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java index edbdabe735..fca1610a5a 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.tests.web3j.privacy; +package org.hyperledger.besu.tests.web3j.privacy; import static org.assertj.core.api.Assertions.catchThrowable; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyNode; -import tech.pegasys.pantheon.tests.web3j.generated.EventEmitter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode; +import org.hyperledger.besu.tests.web3j.generated.EventEmitter; import java.math.BigInteger; import java.util.Base64; @@ -38,9 +38,8 @@ public class EnclaveErrorAcceptanceTest extends PrivacyAcceptanceTestBase { @Before public void setUp() throws Exception { - alice = - privacyPantheon.createIbft2NodePrivacyEnabled("node1", privacyAccountResolver.resolve(0)); - bob = privacyPantheon.createIbft2NodePrivacyEnabled("node2", privacyAccountResolver.resolve(1)); + alice = privacyBesu.createIbft2NodePrivacyEnabled("node1", privacyAccountResolver.resolve(0)); + bob = privacyBesu.createIbft2NodePrivacyEnabled("node2", privacyAccountResolver.resolve(1)); privacyCluster.start(alice, bob); wrongPublicKey = diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/EthSignerAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java similarity index 88% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/EthSignerAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java index d0c6bd65eb..b27fae80f0 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/EthSignerAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.tests.web3j.privacy; +package org.hyperledger.besu.tests.web3j.privacy; -import tech.pegasys.pantheon.tests.acceptance.dsl.ethsigner.EthSignerClient; -import tech.pegasys.pantheon.tests.acceptance.dsl.ethsigner.testutil.EthSignerTestHarness; -import tech.pegasys.pantheon.tests.acceptance.dsl.ethsigner.testutil.EthSignerTestHarnessFactory; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyNode; -import tech.pegasys.pantheon.tests.web3j.generated.EventEmitter; +import org.hyperledger.besu.tests.acceptance.dsl.ethsigner.EthSignerClient; +import org.hyperledger.besu.tests.acceptance.dsl.ethsigner.testutil.EthSignerTestHarness; +import org.hyperledger.besu.tests.acceptance.dsl.ethsigner.testutil.EthSignerTestHarnessFactory; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode; +import org.hyperledger.besu.tests.web3j.generated.EventEmitter; import java.io.IOException; import java.math.BigInteger; @@ -40,7 +40,7 @@ public class EthSignerAcceptanceTest extends PrivacyAcceptanceTestBase { @Before public void setUp() throws Exception { minerNode = - privacyPantheon.createPrivateTransactionEnabledMinerNode( + privacyBesu.createPrivateTransactionEnabledMinerNode( "miner-node", privacyAccountResolver.resolve(0)); privacyCluster.start(minerNode); @@ -48,7 +48,7 @@ public class EthSignerAcceptanceTest extends PrivacyAcceptanceTestBase { EthSignerTestHarnessFactory.create( privacy.newFolder().toPath(), "ethSignerKey--fe3b557e8fb62b89f4916b721be55ceb828dbd73.json", - minerNode.getPantheon().getJsonRpcSocketPort().orElseThrow(), + minerNode.getBesu().getJsonRpcSocketPort().orElseThrow(), 2018); ethSignerClient = new EthSignerClient(ethSigner.getHttpListeningUrl()); diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java similarity index 92% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java index 4cca084ec8..71337d35e6 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.web3j.privacy; +package org.hyperledger.besu.tests.web3j.privacy; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyNode; -import tech.pegasys.pantheon.tests.web3j.generated.EventEmitter; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode; +import org.hyperledger.besu.tests.web3j.generated.EventEmitter; import java.math.BigInteger; @@ -32,11 +32,9 @@ public class Ibft2PrivacyClusterAcceptanceTest extends PrivacyAcceptanceTestBase @Before public void setUp() throws Exception { - alice = - privacyPantheon.createIbft2NodePrivacyEnabled("node1", privacyAccountResolver.resolve(0)); - bob = privacyPantheon.createIbft2NodePrivacyEnabled("node2", privacyAccountResolver.resolve(1)); - charlie = - privacyPantheon.createIbft2NodePrivacyEnabled("node3", privacyAccountResolver.resolve(2)); + alice = privacyBesu.createIbft2NodePrivacyEnabled("node1", privacyAccountResolver.resolve(0)); + bob = privacyBesu.createIbft2NodePrivacyEnabled("node2", privacyAccountResolver.resolve(1)); + charlie = privacyBesu.createIbft2NodePrivacyEnabled("node3", privacyAccountResolver.resolve(2)); privacyCluster.start(alice, bob, charlie); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java similarity index 92% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java index a7ca37f821..fcda4e69d0 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.tests.web3j.privacy; +package org.hyperledger.besu.tests.web3j.privacy; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyNode; -import tech.pegasys.pantheon.tests.web3j.generated.EventEmitter; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode; +import org.hyperledger.besu.tests.web3j.generated.EventEmitter; import java.math.BigInteger; @@ -33,14 +33,12 @@ public class PrivacyClusterAcceptanceTest extends PrivacyAcceptanceTestBase { @Before public void setUp() throws Exception { alice = - privacyPantheon.createPrivateTransactionEnabledMinerNode( + privacyBesu.createPrivateTransactionEnabledMinerNode( "node1", privacyAccountResolver.resolve(0)); bob = - privacyPantheon.createPrivateTransactionEnabledNode( - "node2", privacyAccountResolver.resolve(1)); + privacyBesu.createPrivateTransactionEnabledNode("node2", privacyAccountResolver.resolve(1)); charlie = - privacyPantheon.createPrivateTransactionEnabledNode( - "node3", privacyAccountResolver.resolve(2)); + privacyBesu.createPrivateTransactionEnabledNode("node3", privacyAccountResolver.resolve(2)); privacyCluster.start(alice, bob, charlie); } diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/PrivacyGroupAcceptanceTest.java b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyGroupAcceptanceTest.java similarity index 88% rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/PrivacyGroupAcceptanceTest.java rename to acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyGroupAcceptanceTest.java index 0272b14fe3..9f650601b2 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/PrivacyGroupAcceptanceTest.java +++ b/acceptance-tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyGroupAcceptanceTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.tests.web3j.privacy; +package org.hyperledger.besu.tests.web3j.privacy; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase; -import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyNode; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase; +import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode; import org.junit.Before; import org.junit.Test; @@ -31,14 +31,12 @@ public class PrivacyGroupAcceptanceTest extends PrivacyAcceptanceTestBase { @Before public void setUp() throws Exception { alice = - privacyPantheon.createPrivateTransactionEnabledMinerNode( + privacyBesu.createPrivateTransactionEnabledMinerNode( "node1", privacyAccountResolver.resolve(0)); bob = - privacyPantheon.createPrivateTransactionEnabledNode( - "node2", privacyAccountResolver.resolve(1)); + privacyBesu.createPrivateTransactionEnabledNode("node2", privacyAccountResolver.resolve(1)); charlie = - privacyPantheon.createPrivateTransactionEnabledNode( - "node3", privacyAccountResolver.resolve(2)); + privacyBesu.createPrivateTransactionEnabledNode("node3", privacyAccountResolver.resolve(2)); privacyCluster.start(alice, bob, charlie); } diff --git a/acceptance-tests/src/test/resources/log4j2.xml b/acceptance-tests/src/test/resources/log4j2.xml index cee8a4c7e6..fedada36d2 100644 --- a/acceptance-tests/src/test/resources/log4j2.xml +++ b/acceptance-tests/src/test/resources/log4j2.xml @@ -12,7 +12,7 @@ - + diff --git a/pantheon/build.gradle b/besu/build.gradle similarity index 99% rename from pantheon/build.gradle rename to besu/build.gradle index 31a70f243d..b346867a2d 100644 --- a/pantheon/build.gradle +++ b/besu/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon' + baseName 'besu' manifest { attributes( 'Specification-Title': baseName, diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/Pantheon.java b/besu/src/main/java/org/hyperledger/besu/Besu.java similarity index 74% rename from pantheon/src/main/java/tech/pegasys/pantheon/Pantheon.java rename to besu/src/main/java/org/hyperledger/besu/Besu.java index c8def18f84..de1642ede8 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/Pantheon.java +++ b/besu/src/main/java/org/hyperledger/besu/Besu.java @@ -10,43 +10,43 @@ * 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. */ -package tech.pegasys.pantheon; +package org.hyperledger.besu; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.chainexport.RlpBlockExporter; -import tech.pegasys.pantheon.chainimport.JsonBlockImporter; -import tech.pegasys.pantheon.chainimport.RlpBlockImporter; -import tech.pegasys.pantheon.cli.PantheonCommand; -import tech.pegasys.pantheon.controller.PantheonController; -import tech.pegasys.pantheon.services.PantheonPluginContextImpl; +import org.hyperledger.besu.chainexport.RlpBlockExporter; +import org.hyperledger.besu.chainimport.JsonBlockImporter; +import org.hyperledger.besu.chainimport.RlpBlockImporter; +import org.hyperledger.besu.cli.BesuCommand; +import org.hyperledger.besu.controller.BesuController; +import org.hyperledger.besu.services.BesuPluginContextImpl; import io.netty.util.internal.logging.InternalLoggerFactory; import io.netty.util.internal.logging.Log4J2LoggerFactory; import org.apache.logging.log4j.Logger; import picocli.CommandLine.RunLast; -public final class Pantheon { +public final class Besu { private static final int SUCCESS_EXIT_CODE = 0; private static final int ERROR_EXIT_CODE = 1; public static void main(final String... args) { final Logger logger = setupLogging(); - final PantheonCommand pantheonCommand = - new PantheonCommand( + final BesuCommand besuCommand = + new BesuCommand( logger, new RlpBlockImporter(), JsonBlockImporter::new, RlpBlockExporter::new, new RunnerBuilder(), - new PantheonController.Builder(), - new PantheonPluginContextImpl(), + new BesuController.Builder(), + new BesuPluginContextImpl(), System.getenv()); - pantheonCommand.parse( + besuCommand.parse( new RunLast().andExit(SUCCESS_EXIT_CODE), - pantheonCommand.exceptionHandler().andExit(ERROR_EXIT_CODE), + besuCommand.exceptionHandler().andExit(ERROR_EXIT_CODE), System.in, args); } diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/PantheonInfo.java b/besu/src/main/java/org/hyperledger/besu/BesuInfo.java similarity index 75% rename from pantheon/src/main/java/tech/pegasys/pantheon/PantheonInfo.java rename to besu/src/main/java/org/hyperledger/besu/BesuInfo.java index 5fcafa7c21..4db1751ff6 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/PantheonInfo.java +++ b/besu/src/main/java/org/hyperledger/besu/BesuInfo.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon; +package org.hyperledger.besu; -import tech.pegasys.pantheon.util.PlatformDetector; +import org.hyperledger.besu.util.PlatformDetector; -public final class PantheonInfo { - private static final String CLIENT_IDENTITY = "pantheon"; +public final class BesuInfo { + private static final String CLIENT_IDENTITY = "besu"; private static final String VERSION = CLIENT_IDENTITY + "/v" - + PantheonInfo.class.getPackage().getImplementationVersion() + + BesuInfo.class.getPackage().getImplementationVersion() + "/" + PlatformDetector.getOS() + "/" + PlatformDetector.getVM(); - private PantheonInfo() {} + private BesuInfo() {} public static String version() { return VERSION; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/Runner.java b/besu/src/main/java/org/hyperledger/besu/Runner.java similarity index 85% rename from pantheon/src/main/java/tech/pegasys/pantheon/Runner.java rename to besu/src/main/java/org/hyperledger/besu/Runner.java index 1e7cdec495..8df4de3ff6 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/Runner.java +++ b/besu/src/main/java/org/hyperledger/besu/Runner.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon; +package org.hyperledger.besu; -import tech.pegasys.pantheon.controller.PantheonController; -import tech.pegasys.pantheon.ethereum.api.graphql.GraphQLHttpService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcHttpService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketService; -import tech.pegasys.pantheon.ethereum.p2p.network.NetworkRunner; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.metrics.prometheus.MetricsService; -import tech.pegasys.pantheon.nat.upnp.UpnpNatManager; +import org.hyperledger.besu.controller.BesuController; +import org.hyperledger.besu.ethereum.api.graphql.GraphQLHttpService; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcHttpService; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketService; +import org.hyperledger.besu.ethereum.p2p.network.NetworkRunner; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.metrics.prometheus.MetricsService; +import org.hyperledger.besu.nat.upnp.UpnpNatManager; import java.io.File; import java.io.FileOutputStream; @@ -49,7 +49,7 @@ public class Runner implements AutoCloseable { private final Optional websocketRpc; private final Optional metrics; - private final PantheonController pantheonController; + private final BesuController besuController; private final Path dataDir; Runner( @@ -60,7 +60,7 @@ public class Runner implements AutoCloseable { final Optional graphQLHttp, final Optional websocketRpc, final Optional metrics, - final PantheonController pantheonController, + final BesuController besuController, final Path dataDir) { this.vertx = vertx; this.networkRunner = networkRunner; @@ -69,7 +69,7 @@ public class Runner implements AutoCloseable { this.jsonRpc = jsonRpc; this.websocketRpc = websocketRpc; this.metrics = metrics; - this.pantheonController = pantheonController; + this.besuController = besuController; this.dataDir = dataDir; } @@ -81,21 +81,18 @@ public class Runner implements AutoCloseable { } networkRunner.start(); if (networkRunner.getNetwork().isP2pEnabled()) { - pantheonController.getSynchronizer().start(); + besuController.getSynchronizer().start(); } vertx.setPeriodic( TimeUnit.MINUTES.toMillis(1), time -> - pantheonController - .getTransactionPool() - .getPendingTransactions() - .evictOldTransactions()); + besuController.getTransactionPool().getPendingTransactions().evictOldTransactions()); jsonRpc.ifPresent(service -> waitForServiceToStart("jsonRpc", service.start())); graphQLHttp.ifPresent(service -> waitForServiceToStart("graphQLHttp", service.start())); websocketRpc.ifPresent(service -> waitForServiceToStop("websocketRpc", service.start())); metrics.ifPresent(service -> waitForServiceToStart("metrics", service.start())); LOG.info("Ethereum main loop is up."); - writePantheonPortsToFile(); + writeBesuPortsToFile(); } catch (final Exception ex) { LOG.error("Startup failed", ex); throw new IllegalStateException(ex); @@ -115,7 +112,7 @@ public class Runner implements AutoCloseable { public void close() throws Exception { try { if (networkRunner.getNetwork().isP2pEnabled()) { - pantheonController.getSynchronizer().stop(); + besuController.getSynchronizer().stop(); } networkRunner.stop(); @@ -133,7 +130,7 @@ public class Runner implements AutoCloseable { try { vertx.close(); } finally { - pantheonController.close(); + besuController.close(); } } } @@ -169,7 +166,7 @@ public class Runner implements AutoCloseable { } } - private void writePantheonPortsToFile() { + private void writeBesuPortsToFile() { final Properties properties = new Properties(); if (networkRunner.getNetwork().isP2pEnabled()) { networkRunner @@ -201,13 +198,13 @@ public class Runner implements AutoCloseable { properties.setProperty("metrics", String.valueOf(getMetricsPort().get())); } - final File portsFile = new File(dataDir.toFile(), "pantheon.ports"); + final File portsFile = new File(dataDir.toFile(), "besu.ports"); portsFile.deleteOnExit(); try (final FileOutputStream fileOutputStream = new FileOutputStream(portsFile)) { properties.store( fileOutputStream, - "This file contains the ports used by the running instance of Pantheon. This file will be deleted after the node is shutdown."); + "This file contains the ports used by the running instance of Besu. This file will be deleted after the node is shutdown."); } catch (final Exception e) { LOG.warn("Error writing ports file", e); } diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/RunnerBuilder.java b/besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java similarity index 75% rename from pantheon/src/main/java/tech/pegasys/pantheon/RunnerBuilder.java rename to besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java index 0a3029431c..702f44f570 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/RunnerBuilder.java +++ b/besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java @@ -10,82 +10,82 @@ * 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. */ -package tech.pegasys.pantheon; +package org.hyperledger.besu; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.isNull; -import tech.pegasys.pantheon.cli.config.EthNetworkConfig; -import tech.pegasys.pantheon.controller.PantheonController; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.api.graphql.GraphQLConfiguration; -import tech.pegasys.pantheon.ethereum.api.graphql.GraphQLDataFetcherContext; -import tech.pegasys.pantheon.ethereum.api.graphql.GraphQLDataFetchers; -import tech.pegasys.pantheon.ethereum.api.graphql.GraphQLHttpService; -import tech.pegasys.pantheon.ethereum.api.graphql.GraphQLProvider; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcHttpService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcMethodsFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApi; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.HealthService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.LivenessCheck; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.ReadinessCheck; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterIdGenerator; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterRepository; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketRequestHandler; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods.WebSocketMethodsFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.blockheaders.NewBlockHeadersSubscriptionService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.logs.LogsSubscriptionService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.pending.PendingTransactionDroppedSubscriptionService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.pending.PendingTransactionSubscriptionService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.syncing.SyncingSubscriptionService; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.config.RlpxConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.config.SubProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.network.DefaultP2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.network.NetworkRunner; -import tech.pegasys.pantheon.ethereum.p2p.network.NetworkRunner.NetworkBuilder; -import tech.pegasys.pantheon.ethereum.p2p.network.NoopP2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.network.ProtocolManager; -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissionsBlacklist; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.SubProtocol; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.NodePermissioningControllerFactory; -import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.account.AccountPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.account.AccountPermissioningControllerFactory; -import tech.pegasys.pantheon.ethereum.permissioning.node.InsufficientPeersPermissioningProvider; -import tech.pegasys.pantheon.ethereum.permissioning.node.NodePermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.node.PeerPermissionsAdapter; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulator; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; -import tech.pegasys.pantheon.metrics.prometheus.MetricsService; -import tech.pegasys.pantheon.nat.NatMethod; -import tech.pegasys.pantheon.nat.upnp.UpnpNatManager; -import tech.pegasys.pantheon.util.NetworkUtility; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.cli.config.EthNetworkConfig; +import org.hyperledger.besu.controller.BesuController; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration; +import org.hyperledger.besu.ethereum.api.graphql.GraphQLDataFetcherContext; +import org.hyperledger.besu.ethereum.api.graphql.GraphQLDataFetchers; +import org.hyperledger.besu.ethereum.api.graphql.GraphQLHttpService; +import org.hyperledger.besu.ethereum.api.graphql.GraphQLProvider; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcHttpService; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcMethodsFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi; +import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService; +import org.hyperledger.besu.ethereum.api.jsonrpc.health.LivenessCheck; +import org.hyperledger.besu.ethereum.api.jsonrpc.health.ReadinessCheck; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterIdGenerator; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterRepository; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketRequestHandler; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketService; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketMethodsFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.blockheaders.NewBlockHeadersSubscriptionService; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.logs.LogsSubscriptionService; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.pending.PendingTransactionDroppedSubscriptionService; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.pending.PendingTransactionSubscriptionService; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.syncing.SyncingSubscriptionService; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.SubProtocolConfiguration; +import org.hyperledger.besu.ethereum.p2p.network.DefaultP2PNetwork; +import org.hyperledger.besu.ethereum.p2p.network.NetworkRunner; +import org.hyperledger.besu.ethereum.p2p.network.NetworkRunner.NetworkBuilder; +import org.hyperledger.besu.ethereum.p2p.network.NoopP2PNetwork; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.network.ProtocolManager; +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsBlacklist; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.NodePermissioningControllerFactory; +import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.account.AccountPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.account.AccountPermissioningControllerFactory; +import org.hyperledger.besu.ethereum.permissioning.node.InsufficientPeersPermissioningProvider; +import org.hyperledger.besu.ethereum.permissioning.node.NodePermissioningController; +import org.hyperledger.besu.ethereum.permissioning.node.PeerPermissionsAdapter; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.ObservableMetricsSystem; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.metrics.prometheus.MetricsService; +import org.hyperledger.besu.nat.NatMethod; +import org.hyperledger.besu.nat.upnp.UpnpNatManager; +import org.hyperledger.besu.util.NetworkUtility; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.nio.file.Path; @@ -106,7 +106,7 @@ import io.vertx.core.Vertx; public class RunnerBuilder { private Vertx vertx; - private PantheonController pantheonController; + private BesuController besuController; private NetworkingConfiguration networkingConfiguration = NetworkingConfiguration.create(); private Collection bannedNodeIds = new ArrayList<>(); @@ -135,8 +135,8 @@ public class RunnerBuilder { return this; } - public RunnerBuilder pantheonController(final PantheonController pantheonController) { - this.pantheonController = pantheonController; + public RunnerBuilder besuController(final BesuController besuController) { + this.besuController = besuController; return this; } @@ -247,7 +247,7 @@ public class RunnerBuilder { public Runner build() { - Preconditions.checkNotNull(pantheonController); + Preconditions.checkNotNull(besuController); final DiscoveryConfiguration discoveryConfiguration; if (discovery) { @@ -267,13 +267,13 @@ public class RunnerBuilder { discoveryConfiguration = DiscoveryConfiguration.create().setActive(false); } - final KeyPair keyPair = pantheonController.getLocalNodeKeyPair(); + final KeyPair keyPair = besuController.getLocalNodeKeyPair(); final SubProtocolConfiguration subProtocolConfiguration = - pantheonController.getSubProtocolConfiguration(); + besuController.getSubProtocolConfiguration(); - final ProtocolSchedule protocolSchedule = pantheonController.getProtocolSchedule(); - final ProtocolContext context = pantheonController.getProtocolContext(); + final ProtocolSchedule protocolSchedule = besuController.getProtocolSchedule(); + final ProtocolContext context = besuController.getProtocolContext(); final List subProtocols = subProtocolConfiguration.getSubProtocols(); final List protocolManagers = subProtocolConfiguration.getProtocolManagers(); @@ -288,7 +288,7 @@ public class RunnerBuilder { .setBindPort(p2pListenPort) .setMaxPeers(maxPeers) .setSupportedProtocols(subProtocols) - .setClientId(PantheonInfo.version()) + .setClientId(BesuInfo.version()) .setLimitRemoteWireConnectionsEnabled(limitRemoteWireConnectionsEnabled) .setFractionRemoteWireConnectionsAllowed(fractionRemoteConnectionsAllowed); networkingConfiguration.setRlpx(rlpxConfiguration).setDiscovery(discoveryConfiguration); @@ -298,7 +298,7 @@ public class RunnerBuilder { final List bootnodes = discoveryConfiguration.getBootnodes(); - final Synchronizer synchronizer = pantheonController.getSynchronizer(); + final Synchronizer synchronizer = besuController.getSynchronizer(); final TransactionSimulator transactionSimulator = new TransactionSimulator( @@ -344,10 +344,10 @@ public class RunnerBuilder { n.setInsufficientPeersPermissioningProvider( new InsufficientPeersPermissioningProvider(network, bootnodes))); - final TransactionPool transactionPool = pantheonController.getTransactionPool(); - final MiningCoordinator miningCoordinator = pantheonController.getMiningCoordinator(); + final TransactionPool transactionPool = besuController.getTransactionPool(); + final MiningCoordinator miningCoordinator = besuController.getMiningCoordinator(); - final PrivacyParameters privacyParameters = pantheonController.getPrivacyParameters(); + final PrivacyParameters privacyParameters = besuController.getPrivacyParameters(); final FilterManager filterManager = createFilterManager(vertx, context, transactionPool); final P2PNetwork peerNetwork = networkRunner.getNetwork(); @@ -361,7 +361,7 @@ public class RunnerBuilder { final Optional accountPermissioningController = buildAccountPermissioningController( - permissioningConfiguration, pantheonController, transactionSimulator); + permissioningConfiguration, besuController, transactionSimulator); final Optional accountLocalConfigPermissioningController = @@ -374,7 +374,7 @@ public class RunnerBuilder { jsonRpcMethods( context, protocolSchedule, - pantheonController, + besuController, peerNetwork, synchronizer, transactionPool, @@ -432,7 +432,7 @@ public class RunnerBuilder { jsonRpcMethods( context, protocolSchedule, - pantheonController, + besuController, peerNetwork, synchronizer, transactionPool, @@ -478,7 +478,7 @@ public class RunnerBuilder { graphQLHttpService, webSocketService, metricsService, - pantheonController, + besuController, dataDir); } @@ -519,7 +519,7 @@ public class RunnerBuilder { private Optional buildAccountPermissioningController( final Optional permissioningConfiguration, - final PantheonController pantheonController, + final BesuController besuController, final TransactionSimulator transactionSimulator) { if (permissioningConfiguration.isPresent()) { @@ -529,7 +529,7 @@ public class RunnerBuilder { accountPermissioningController.ifPresent( permissioningController -> - pantheonController + besuController .getProtocolSchedule() .setTransactionFilter(permissioningController::isPermitted)); @@ -562,7 +562,7 @@ public class RunnerBuilder { private Map jsonRpcMethods( final ProtocolContext context, final ProtocolSchedule protocolSchedule, - final PantheonController pantheonController, + final BesuController besuController, final P2PNetwork network, final Synchronizer synchronizer, final TransactionPool transactionPool, @@ -580,9 +580,9 @@ public class RunnerBuilder { final Map methods = new JsonRpcMethodsFactory() .methods( - PantheonInfo.version(), + BesuInfo.version(), ethNetworkConfig.getNetworkId(), - pantheonController.getGenesisConfigOptions(), + besuController.getGenesisConfigOptions(), network, context.getBlockchain(), context.getWorldStateArchive(), @@ -600,7 +600,7 @@ public class RunnerBuilder { jsonRpcConfiguration, webSocketConfiguration, metricsConfiguration); - methods.putAll(pantheonController.getAdditionalJsonRpcMethods(jsonRpcApis)); + methods.putAll(besuController.getAdditionalJsonRpcMethods(jsonRpcApis)); return methods; } diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/chainexport/BlockExporter.java b/besu/src/main/java/org/hyperledger/besu/chainexport/BlockExporter.java similarity index 91% rename from pantheon/src/main/java/tech/pegasys/pantheon/chainexport/BlockExporter.java rename to besu/src/main/java/org/hyperledger/besu/chainexport/BlockExporter.java index fcd7be8315..08bc319e5c 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/chainexport/BlockExporter.java +++ b/besu/src/main/java/org/hyperledger/besu/chainexport/BlockExporter.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.chainexport; +package org.hyperledger.besu.chainexport; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.io.File; import java.io.FileOutputStream; @@ -26,7 +26,7 @@ import java.util.Optional; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -/** Pantheon Block Export Util. */ +/** Besu Block Export Util. */ public abstract class BlockExporter { private static final Logger LOG = LogManager.getLogger(); private final Blockchain blockchain; @@ -36,7 +36,7 @@ public abstract class BlockExporter { } /** - * Export blocks that are stored in Pantheon's block storage. + * Export blocks that are stored in Besu's block storage. * * @param outputFile the path at which to save the exported block data * @param maybeStartBlock the starting index of the block list to export (inclusive) diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/chainexport/RlpBlockExporter.java b/besu/src/main/java/org/hyperledger/besu/chainexport/RlpBlockExporter.java similarity index 80% rename from pantheon/src/main/java/tech/pegasys/pantheon/chainexport/RlpBlockExporter.java rename to besu/src/main/java/org/hyperledger/besu/chainexport/RlpBlockExporter.java index 63b348f7a6..4151fc5acb 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/chainexport/RlpBlockExporter.java +++ b/besu/src/main/java/org/hyperledger/besu/chainexport/RlpBlockExporter.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.chainexport; +package org.hyperledger.besu.chainexport; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.FileOutputStream; import java.io.IOException; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/chainimport/JsonBlockImporter.java b/besu/src/main/java/org/hyperledger/besu/chainimport/JsonBlockImporter.java similarity index 90% rename from pantheon/src/main/java/tech/pegasys/pantheon/chainimport/JsonBlockImporter.java rename to besu/src/main/java/org/hyperledger/besu/chainimport/JsonBlockImporter.java index 9aabb91729..f2857bbabb 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/chainimport/JsonBlockImporter.java +++ b/besu/src/main/java/org/hyperledger/besu/chainimport/JsonBlockImporter.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.chainimport; - -import tech.pegasys.pantheon.chainimport.internal.BlockData; -import tech.pegasys.pantheon.chainimport.internal.ChainData; -import tech.pegasys.pantheon.config.GenesisConfigOptions; -import tech.pegasys.pantheon.controller.PantheonController; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.chainimport; + +import org.hyperledger.besu.chainimport.internal.BlockData; +import org.hyperledger.besu.chainimport.internal.ChainData; +import org.hyperledger.besu.config.GenesisConfigOptions; +import org.hyperledger.besu.controller.BesuController; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.util.ArrayList; @@ -50,9 +50,9 @@ public class JsonBlockImporter { private static final Logger LOG = LogManager.getLogger(); private final ObjectMapper mapper; - private final PantheonController controller; + private final BesuController controller; - public JsonBlockImporter(final PantheonController controller) { + public JsonBlockImporter(final BesuController controller) { this.controller = controller; mapper = new ObjectMapper(); // Jdk8Module allows us to easily parse {@code Optional} values from json diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/chainimport/RlpBlockImporter.java b/besu/src/main/java/org/hyperledger/besu/chainimport/RlpBlockImporter.java similarity index 83% rename from pantheon/src/main/java/tech/pegasys/pantheon/chainimport/RlpBlockImporter.java rename to besu/src/main/java/org/hyperledger/besu/chainimport/RlpBlockImporter.java index a9a7cca3a4..55eafc2290 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/chainimport/RlpBlockImporter.java +++ b/besu/src/main/java/org/hyperledger/besu/chainimport/RlpBlockImporter.java @@ -10,24 +10,25 @@ * 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. */ -package tech.pegasys.pantheon.chainimport; +package org.hyperledger.besu.chainimport; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.controller.PantheonController; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.util.RawBlockIterator; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.controller.BesuController; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.util.RawBlockIterator; +import org.hyperledger.besu.util.uint.UInt256; import java.io.IOException; import java.nio.file.Path; @@ -51,19 +52,19 @@ public class RlpBlockImporter { private final ExecutorService importExecutor = Executors.newSingleThreadExecutor(); /** - * Imports blocks that are stored as concatenated RLP sections in the given file into Pantheon's - * block storage. + * Imports blocks that are stored as concatenated RLP sections in the given file into Besu's block + * storage. * * @param blocks Path to the file containing the blocks - * @param pantheonController the PantheonController that defines blockchain behavior + * @param besuController the BesuController that defines blockchain behavior * @param the consensus context type * @return the import result * @throws IOException On Failure */ public RlpBlockImporter.ImportResult importBlockchain( - final Path blocks, final PantheonController pantheonController) throws IOException { - final ProtocolSchedule protocolSchedule = pantheonController.getProtocolSchedule(); - final ProtocolContext context = pantheonController.getProtocolContext(); + final Path blocks, final BesuController besuController) throws IOException { + final ProtocolSchedule protocolSchedule = besuController.getProtocolSchedule(); + final ProtocolContext context = besuController.getProtocolContext(); final MutableBlockchain blockchain = context.getBlockchain(); int count = 0; @@ -140,7 +141,7 @@ public class RlpBlockImporter { } catch (final Exception e) { LOG.error("Error shutting down importExecutor", e); } - pantheonController.close(); + besuController.close(); } } @@ -175,8 +176,7 @@ public class RlpBlockImporter { final BlockHeader header, final ProtocolSpec protocolSpec) { try { - final tech.pegasys.pantheon.ethereum.core.BlockImporter blockImporter = - protocolSpec.getBlockImporter(); + final BlockImporter blockImporter = protocolSpec.getBlockImporter(); final boolean blockImported = blockImporter.importBlock(context, block, HeaderValidationMode.SKIP_DETACHED); if (!blockImported) { diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/chainimport/internal/BlockData.java b/besu/src/main/java/org/hyperledger/besu/chainimport/internal/BlockData.java similarity index 84% rename from pantheon/src/main/java/tech/pegasys/pantheon/chainimport/internal/BlockData.java rename to besu/src/main/java/org/hyperledger/besu/chainimport/internal/BlockData.java index 2081a9d560..9daf8487a9 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/chainimport/internal/BlockData.java +++ b/besu/src/main/java/org/hyperledger/besu/chainimport/internal/BlockData.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.chainimport.internal; +package org.hyperledger.besu.chainimport.internal; -import tech.pegasys.pantheon.chainimport.internal.TransactionData.NonceProvider; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.chainimport.internal.TransactionData.NonceProvider; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.HashMap; import java.util.List; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/chainimport/internal/ChainData.java b/besu/src/main/java/org/hyperledger/besu/chainimport/internal/ChainData.java similarity index 95% rename from pantheon/src/main/java/tech/pegasys/pantheon/chainimport/internal/ChainData.java rename to besu/src/main/java/org/hyperledger/besu/chainimport/internal/ChainData.java index f629b1addf..bab29b2482 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/chainimport/internal/ChainData.java +++ b/besu/src/main/java/org/hyperledger/besu/chainimport/internal/ChainData.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.chainimport.internal; +package org.hyperledger.besu.chainimport.internal; import java.util.List; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/chainimport/internal/TransactionData.java b/besu/src/main/java/org/hyperledger/besu/chainimport/internal/TransactionData.java similarity index 83% rename from pantheon/src/main/java/tech/pegasys/pantheon/chainimport/internal/TransactionData.java rename to besu/src/main/java/org/hyperledger/besu/chainimport/internal/TransactionData.java index 8cb104fa4f..a31f105929 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/chainimport/internal/TransactionData.java +++ b/besu/src/main/java/org/hyperledger/besu/chainimport/internal/TransactionData.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.chainimport.internal; +package org.hyperledger.besu.chainimport.internal; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.PrivateKey; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.PrivateKey; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Optional; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java similarity index 84% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java rename to besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java index 4a33d8222d..57c027cc18 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java @@ -10,105 +10,105 @@ * 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. */ -package tech.pegasys.pantheon.cli; +package org.hyperledger.besu.cli; import static com.google.common.base.Preconditions.checkNotNull; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; -import static tech.pegasys.pantheon.cli.DefaultCommandValues.getDefaultPantheonDataPath; -import static tech.pegasys.pantheon.cli.config.NetworkName.MAINNET; -import static tech.pegasys.pantheon.cli.util.CommandLineUtils.checkOptionDependencies; -import static tech.pegasys.pantheon.controller.PantheonController.DATABASE_PATH; -import static tech.pegasys.pantheon.ethereum.api.graphql.GraphQLConfiguration.DEFAULT_GRAPHQL_HTTP_PORT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration.DEFAULT_JSON_RPC_PORT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApis.DEFAULT_JSON_RPC_APIS; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration.DEFAULT_WEBSOCKET_PORT; -import static tech.pegasys.pantheon.metrics.PantheonMetricCategory.DEFAULT_METRIC_CATEGORIES; -import static tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration.DEFAULT_METRICS_PORT; -import static tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration.DEFAULT_METRICS_PUSH_PORT; - -import tech.pegasys.pantheon.PantheonInfo; -import tech.pegasys.pantheon.Runner; -import tech.pegasys.pantheon.RunnerBuilder; -import tech.pegasys.pantheon.chainimport.RlpBlockImporter; -import tech.pegasys.pantheon.cli.config.EthNetworkConfig; -import tech.pegasys.pantheon.cli.config.NetworkName; -import tech.pegasys.pantheon.cli.converter.MetricCategoryConverter; -import tech.pegasys.pantheon.cli.converter.PercentageConverter; -import tech.pegasys.pantheon.cli.converter.RpcApisConverter; -import tech.pegasys.pantheon.cli.custom.CorsAllowedOriginsProperty; -import tech.pegasys.pantheon.cli.custom.JsonRPCWhitelistHostsProperty; -import tech.pegasys.pantheon.cli.custom.RpcAuthFileValidator; -import tech.pegasys.pantheon.cli.error.PantheonExceptionHandler; -import tech.pegasys.pantheon.cli.options.EthProtocolOptions; -import tech.pegasys.pantheon.cli.options.MetricsCLIOptions; -import tech.pegasys.pantheon.cli.options.NetworkingOptions; -import tech.pegasys.pantheon.cli.options.SynchronizerOptions; -import tech.pegasys.pantheon.cli.options.TransactionPoolOptions; -import tech.pegasys.pantheon.cli.subcommands.PasswordSubCommand; -import tech.pegasys.pantheon.cli.subcommands.PublicKeySubCommand; -import tech.pegasys.pantheon.cli.subcommands.PublicKeySubCommand.KeyLoader; -import tech.pegasys.pantheon.cli.subcommands.RetestethSubCommand; -import tech.pegasys.pantheon.cli.subcommands.blocks.BlocksSubCommand; -import tech.pegasys.pantheon.cli.subcommands.blocks.BlocksSubCommand.JsonBlockImporterFactory; -import tech.pegasys.pantheon.cli.subcommands.blocks.BlocksSubCommand.RlpBlockExporterFactory; -import tech.pegasys.pantheon.cli.subcommands.operator.OperatorSubCommand; -import tech.pegasys.pantheon.cli.subcommands.rlp.RLPSubCommand; -import tech.pegasys.pantheon.cli.util.ConfigOptionSearchAndRunHandler; -import tech.pegasys.pantheon.cli.util.VersionProvider; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.controller.KeyPairUtil; -import tech.pegasys.pantheon.controller.PantheonController; -import tech.pegasys.pantheon.controller.PantheonControllerBuilder; -import tech.pegasys.pantheon.ethereum.api.graphql.GraphQLConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApi; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApis; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.sync.SyncMode; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.StaticNodesParser; -import tech.pegasys.pantheon.ethereum.permissioning.LocalPermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfigurationBuilder; -import tech.pegasys.pantheon.ethereum.permissioning.SmartContractPermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueStorageProvider; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder; -import tech.pegasys.pantheon.ethereum.worldstate.PruningConfiguration; -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.metrics.StandardMetricCategory; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; -import tech.pegasys.pantheon.metrics.prometheus.PrometheusMetricsSystem; -import tech.pegasys.pantheon.metrics.vertx.VertxMetricsAdapterFactory; -import tech.pegasys.pantheon.nat.NatMethod; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.PantheonConfiguration; -import tech.pegasys.pantheon.plugin.services.PantheonEvents; -import tech.pegasys.pantheon.plugin.services.PicoCLIOptions; -import tech.pegasys.pantheon.plugin.services.StorageService; -import tech.pegasys.pantheon.plugin.services.exception.StorageException; -import tech.pegasys.pantheon.plugin.services.metrics.MetricCategory; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.RocksDBPlugin; -import tech.pegasys.pantheon.services.PantheonConfigurationImpl; -import tech.pegasys.pantheon.services.PantheonEventsImpl; -import tech.pegasys.pantheon.services.PantheonPluginContextImpl; -import tech.pegasys.pantheon.services.PicoCLIOptionsImpl; -import tech.pegasys.pantheon.services.StorageServiceImpl; -import tech.pegasys.pantheon.util.NetworkUtility; -import tech.pegasys.pantheon.util.PermissioningConfigurationValidator; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.number.Fraction; -import tech.pegasys.pantheon.util.number.PositiveNumber; -import tech.pegasys.pantheon.util.uint.UInt256; +import static org.hyperledger.besu.cli.DefaultCommandValues.getDefaultBesuDataPath; +import static org.hyperledger.besu.cli.config.NetworkName.MAINNET; +import static org.hyperledger.besu.controller.BesuController.DATABASE_PATH; +import static org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration.DEFAULT_GRAPHQL_HTTP_PORT; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration.DEFAULT_JSON_RPC_PORT; +import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.DEFAULT_JSON_RPC_APIS; +import static org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration.DEFAULT_WEBSOCKET_PORT; +import static org.hyperledger.besu.metrics.BesuMetricCategory.DEFAULT_METRIC_CATEGORIES; +import static org.hyperledger.besu.metrics.prometheus.MetricsConfiguration.DEFAULT_METRICS_PORT; +import static org.hyperledger.besu.metrics.prometheus.MetricsConfiguration.DEFAULT_METRICS_PUSH_PORT; + +import org.hyperledger.besu.BesuInfo; +import org.hyperledger.besu.Runner; +import org.hyperledger.besu.RunnerBuilder; +import org.hyperledger.besu.chainimport.RlpBlockImporter; +import org.hyperledger.besu.cli.config.EthNetworkConfig; +import org.hyperledger.besu.cli.config.NetworkName; +import org.hyperledger.besu.cli.converter.MetricCategoryConverter; +import org.hyperledger.besu.cli.converter.PercentageConverter; +import org.hyperledger.besu.cli.converter.RpcApisConverter; +import org.hyperledger.besu.cli.custom.CorsAllowedOriginsProperty; +import org.hyperledger.besu.cli.custom.JsonRPCWhitelistHostsProperty; +import org.hyperledger.besu.cli.custom.RpcAuthFileValidator; +import org.hyperledger.besu.cli.error.BesuExceptionHandler; +import org.hyperledger.besu.cli.options.EthProtocolOptions; +import org.hyperledger.besu.cli.options.MetricsCLIOptions; +import org.hyperledger.besu.cli.options.NetworkingOptions; +import org.hyperledger.besu.cli.options.SynchronizerOptions; +import org.hyperledger.besu.cli.options.TransactionPoolOptions; +import org.hyperledger.besu.cli.subcommands.PasswordSubCommand; +import org.hyperledger.besu.cli.subcommands.PublicKeySubCommand; +import org.hyperledger.besu.cli.subcommands.PublicKeySubCommand.KeyLoader; +import org.hyperledger.besu.cli.subcommands.RetestethSubCommand; +import org.hyperledger.besu.cli.subcommands.blocks.BlocksSubCommand; +import org.hyperledger.besu.cli.subcommands.blocks.BlocksSubCommand.JsonBlockImporterFactory; +import org.hyperledger.besu.cli.subcommands.blocks.BlocksSubCommand.RlpBlockExporterFactory; +import org.hyperledger.besu.cli.subcommands.operator.OperatorSubCommand; +import org.hyperledger.besu.cli.subcommands.rlp.RLPSubCommand; +import org.hyperledger.besu.cli.util.CommandLineUtils; +import org.hyperledger.besu.cli.util.ConfigOptionSearchAndRunHandler; +import org.hyperledger.besu.cli.util.VersionProvider; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.controller.BesuController; +import org.hyperledger.besu.controller.BesuControllerBuilder; +import org.hyperledger.besu.controller.KeyPairUtil; +import org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.sync.SyncMode; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.StaticNodesParser; +import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.PermissioningConfigurationBuilder; +import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProvider; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder; +import org.hyperledger.besu.ethereum.worldstate.PruningConfiguration; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.metrics.ObservableMetricsSystem; +import org.hyperledger.besu.metrics.StandardMetricCategory; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.metrics.prometheus.PrometheusMetricsSystem; +import org.hyperledger.besu.metrics.vertx.VertxMetricsAdapterFactory; +import org.hyperledger.besu.nat.NatMethod; +import org.hyperledger.besu.plugin.services.BesuConfiguration; +import org.hyperledger.besu.plugin.services.BesuEvents; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.PicoCLIOptions; +import org.hyperledger.besu.plugin.services.StorageService; +import org.hyperledger.besu.plugin.services.exception.StorageException; +import org.hyperledger.besu.plugin.services.metrics.MetricCategory; +import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBPlugin; +import org.hyperledger.besu.services.BesuConfigurationImpl; +import org.hyperledger.besu.services.BesuEventsImpl; +import org.hyperledger.besu.services.BesuPluginContextImpl; +import org.hyperledger.besu.services.PicoCLIOptionsImpl; +import org.hyperledger.besu.services.StorageServiceImpl; +import org.hyperledger.besu.util.NetworkUtility; +import org.hyperledger.besu.util.PermissioningConfigurationValidator; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.number.Fraction; +import org.hyperledger.besu.util.number.PositiveNumber; +import org.hyperledger.besu.util.uint.UInt256; import java.io.File; import java.io.IOException; @@ -152,9 +152,9 @@ import picocli.CommandLine.ParameterException; @SuppressWarnings("FieldCanBeLocal") // because Picocli injected fields report false positives @Command( - description = "This command runs the Pantheon Ethereum client full node.", + description = "This command runs the Besu Ethereum client full node.", abbreviateSynopsis = true, - name = "pantheon", + name = "besu", mixinStandardHelpOptions = true, versionProvider = VersionProvider.class, header = "Usage:", @@ -162,8 +162,8 @@ import picocli.CommandLine.ParameterException; descriptionHeading = "%nDescription:%n%n", optionListHeading = "%nOptions:%n", footerHeading = "%n", - footer = "Pantheon is licensed under the Apache License 2.0") -public class PantheonCommand implements DefaultCommandValues, Runnable { + footer = "Besu is licensed under the Apache License 2.0") +public class BesuCommand implements DefaultCommandValues, Runnable { private final Logger logger; @@ -179,8 +179,8 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { final MetricsCLIOptions metricsCLIOptions = MetricsCLIOptions.create(); final TransactionPoolOptions transactionPoolOptions = TransactionPoolOptions.create(); private final RunnerBuilder runnerBuilder; - private final PantheonController.Builder controllerBuilderFactory; - private final PantheonPluginContextImpl pantheonPluginContext; + private final BesuController.Builder controllerBuilderFactory; + private final BesuPluginContextImpl besuPluginContext; private final StorageServiceImpl storageService; private final Map environment; @@ -191,13 +191,13 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { // Public IP stored to prevent having to research it each time we need it. private InetAddress autoDiscoveredDefaultIP = null; - // Property to indicate whether Pantheon has been launched via docker - private final boolean isDocker = Boolean.getBoolean("pantheon.docker"); + // Property to indicate whether Besu has been launched via docker + private final boolean isDocker = Boolean.getBoolean("besu.docker"); // CLI options defined by user at runtime. // Options parsing is done with CLI library Picocli https://picocli.info/ - // Completely disables P2P within Pantheon. + // Completely disables P2P within Besu. @Option( names = {"--p2p-enabled"}, description = "Enable P2P functionality (default: ${DEFAULT-VALUE})", @@ -522,7 +522,7 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { names = {"--metrics-push-prometheus-job"}, description = "Job name to use when in push mode (default: ${DEFAULT-VALUE})", arity = "1") - private String metricsPrometheusJob = "pantheon-client"; + private String metricsPrometheusJob = "besu-client"; @Option( names = {"--host-whitelist"}, @@ -693,20 +693,20 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { private MetricsConfiguration metricsConfiguration; private Optional permissioningConfiguration; private Collection staticNodes; - private PantheonController pantheonController; + private BesuController besuController; private StandaloneCommand standaloneCommands; - private PantheonConfiguration pluginCommonConfiguration; + private BesuConfiguration pluginCommonConfiguration; private final Supplier metricsSystem = Suppliers.memoize(() -> PrometheusMetricsSystem.init(metricsConfiguration())); - public PantheonCommand( + public BesuCommand( final Logger logger, final RlpBlockImporter rlpBlockImporter, final JsonBlockImporterFactory jsonBlockImporterFactory, final RlpBlockExporterFactory rlpBlockExporterFactory, final RunnerBuilder runnerBuilder, - final PantheonController.Builder controllerBuilderFactory, - final PantheonPluginContextImpl pantheonPluginContext, + final BesuController.Builder controllerBuilderFactory, + final BesuPluginContextImpl besuPluginContext, final Map environment) { this( logger, @@ -715,20 +715,20 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { rlpBlockExporterFactory, runnerBuilder, controllerBuilderFactory, - pantheonPluginContext, + besuPluginContext, environment, new StorageServiceImpl()); } @VisibleForTesting - protected PantheonCommand( + protected BesuCommand( final Logger logger, final RlpBlockImporter rlpBlockImporter, final JsonBlockImporterFactory jsonBlockImporterFactory, final RlpBlockExporterFactory rlpBlockExporterFactory, final RunnerBuilder runnerBuilder, - final PantheonController.Builder controllerBuilderFactory, - final PantheonPluginContextImpl pantheonPluginContext, + final BesuController.Builder controllerBuilderFactory, + final BesuPluginContextImpl besuPluginContext, final Map environment, final StorageServiceImpl storageService) { this.logger = logger; @@ -737,14 +737,14 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { this.jsonBlockImporterFactory = jsonBlockImporterFactory; this.runnerBuilder = runnerBuilder; this.controllerBuilderFactory = controllerBuilderFactory; - this.pantheonPluginContext = pantheonPluginContext; + this.besuPluginContext = besuPluginContext; this.environment = environment; this.storageService = storageService; } public void parse( final AbstractParseResultHandler> resultHandler, - final PantheonExceptionHandler exceptionHandler, + final BesuExceptionHandler exceptionHandler, final InputStream in, final String... args) { commandLine = new CommandLine(this).setCaseInsensitiveEnumValuesAllowed(true); @@ -760,7 +760,7 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { public void run() { try { prepareLogging(); - logger.info("Starting Pantheon version: {}", PantheonInfo.version()); + logger.info("Starting Besu version: {}", BesuInfo.version()); validateOptions().configure().controller().startPlugins().startSynchronization(); } catch (final Exception e) { throw new ParameterException(this.commandLine, e.getMessage(), e); @@ -769,17 +769,17 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { private void addConfigurationService() { if (pluginCommonConfiguration == null) { - pluginCommonConfiguration = new PantheonConfigurationImpl(dataDir().resolve(DATABASE_PATH)); - pantheonPluginContext.addService(PantheonConfiguration.class, pluginCommonConfiguration); + pluginCommonConfiguration = new BesuConfigurationImpl(dataDir().resolve(DATABASE_PATH)); + besuPluginContext.addService(BesuConfiguration.class, pluginCommonConfiguration); } } @VisibleForTesting - void setPantheonConfiguration(final PantheonConfiguration pluginCommonConfiguration) { + void setBesuConfiguration(final BesuConfiguration pluginCommonConfiguration) { this.pluginCommonConfiguration = pluginCommonConfiguration; } - private PantheonCommand handleStandaloneCommand() { + private BesuCommand handleStandaloneCommand() { standaloneCommands = new StandaloneCommand(); if (isFullInstantiation()) { commandLine.addMixin("standaloneCommands", standaloneCommands); @@ -787,7 +787,7 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { return this; } - private PantheonCommand addSubCommands( + private BesuCommand addSubCommands( final AbstractParseResultHandler> resultHandler, final InputStream in) { commandLine.addSubcommand( BlocksSubCommand.COMMAND_NAME, @@ -809,7 +809,7 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { return this; } - private PantheonCommand registerConverters() { + private BesuCommand registerConverters() { commandLine.registerConverter(Address.class, Address::fromHexStringStrict); commandLine.registerConverter(BytesValue.class, BytesValue::fromHexString); commandLine.registerConverter(Level.class, Level::valueOf); @@ -819,13 +819,13 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { commandLine.registerConverter(PositiveNumber.class, PositiveNumber::fromString); final MetricCategoryConverter metricCategoryConverter = new MetricCategoryConverter(); - metricCategoryConverter.addCategories(PantheonMetricCategory.class); + metricCategoryConverter.addCategories(BesuMetricCategory.class); metricCategoryConverter.addCategories(StandardMetricCategory.class); commandLine.registerConverter(MetricCategory.class, metricCategoryConverter); return this; } - private PantheonCommand handleUnstableOptions() { + private BesuCommand handleUnstableOptions() { // Add unstable options final ImmutableMap.Builder unstableOptionsBuild = ImmutableMap.builder(); final ImmutableMap unstableOptions = @@ -841,20 +841,20 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { return this; } - private PantheonCommand preparePlugins() { - pantheonPluginContext.addService(PicoCLIOptions.class, new PicoCLIOptionsImpl(commandLine)); - pantheonPluginContext.addService(StorageService.class, storageService); + private BesuCommand preparePlugins() { + besuPluginContext.addService(PicoCLIOptions.class, new PicoCLIOptionsImpl(commandLine)); + besuPluginContext.addService(StorageService.class, storageService); // register built-in plugins - new RocksDBPlugin().register(pantheonPluginContext); + new RocksDBPlugin().register(besuPluginContext); - pantheonPluginContext.registerPlugins(pluginsDir()); + besuPluginContext.registerPlugins(pluginsDir()); return this; } private void parse( final AbstractParseResultHandler> resultHandler, - final PantheonExceptionHandler exceptionHandler, + final BesuExceptionHandler exceptionHandler, final String... args) { // Create a handler that will search for a config file option and use it for // default values @@ -867,7 +867,7 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { private void startSynchronization() { synchronize( - pantheonController, + besuController, p2pEnabled, peerDiscoveryEnabled, ethNetworkConfig, @@ -883,15 +883,15 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { staticNodes); } - private PantheonCommand startPlugins() { - pantheonPluginContext.addService( - PantheonEvents.class, - new PantheonEventsImpl( - pantheonController.getProtocolManager().getBlockBroadcaster(), - pantheonController.getTransactionPool(), - pantheonController.getSyncState())); - pantheonPluginContext.addService(MetricsSystem.class, getMetricsSystem()); - pantheonPluginContext.startPlugins(); + private BesuCommand startPlugins() { + besuPluginContext.addService( + BesuEvents.class, + new BesuEventsImpl( + besuController.getProtocolManager().getBlockBroadcaster(), + besuController.getTransactionPool(), + besuController.getSyncState())); + besuPluginContext.addService(MetricsSystem.class, getMetricsSystem()); + besuPluginContext.startPlugins(); return this; } @@ -903,7 +903,7 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { } } - private PantheonCommand validateOptions() { + private BesuCommand validateOptions() { issueOptionWarnings(); validateP2PInterface(p2pInterface); @@ -935,7 +935,7 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { private void issueOptionWarnings() { // Check that P2P options are able to work - checkOptionDependencies( + CommandLineUtils.checkOptionDependencies( logger, commandLine, "--p2p-enabled", @@ -951,21 +951,21 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { "--p2p-port", "--remote-connections-max-percentage")); // Check that mining options are able to work - checkOptionDependencies( + CommandLineUtils.checkOptionDependencies( logger, commandLine, "--miner-enabled", !isMiningEnabled, asList("--miner-coinbase", "--min-gas-price", "--miner-extra-data")); - checkOptionDependencies( + CommandLineUtils.checkOptionDependencies( logger, commandLine, "--sync-mode", !SyncMode.FAST.equals(syncMode), singletonList("--fast-sync-min-peers")); - checkOptionDependencies( + CommandLineUtils.checkOptionDependencies( logger, commandLine, "--pruning-enabled", @@ -973,7 +973,7 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { asList("--pruning-block-confirmations", "--pruning-blocks-retained")); } - private PantheonCommand configure() throws Exception { + private BesuCommand configure() throws Exception { ethNetworkConfig = updateNetworkConfig(getNetwork()); jsonRpcConfiguration = jsonRpcConfiguration(); graphQLConfiguration = graphQLConfiguration(); @@ -1015,12 +1015,12 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { } } - private PantheonCommand controller() { - pantheonController = buildController(); + private BesuCommand controller() { + besuController = buildController(); return this; } - public PantheonController buildController() { + public BesuController buildController() { try { return getControllerBuilder().build(); } catch (final Exception e) { @@ -1028,7 +1028,7 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { } } - public PantheonControllerBuilder getControllerBuilder() { + public BesuControllerBuilder getControllerBuilder() { try { addConfigurationService(); return controllerBuilderFactory @@ -1055,7 +1055,7 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { private GraphQLConfiguration graphQLConfiguration() { - checkOptionDependencies( + CommandLineUtils.checkOptionDependencies( logger, commandLine, "--graphql-http-enabled", @@ -1074,7 +1074,7 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { private JsonRpcConfiguration jsonRpcConfiguration() { - checkOptionDependencies( + CommandLineUtils.checkOptionDependencies( logger, commandLine, "--rpc-http-enabled", @@ -1108,7 +1108,7 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { private WebSocketConfiguration webSocketConfiguration() { - checkOptionDependencies( + CommandLineUtils.checkOptionDependencies( logger, commandLine, "--rpc-ws-enabled", @@ -1146,14 +1146,14 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { + "time. Please refer to CLI reference for more details about this constraint."); } - checkOptionDependencies( + CommandLineUtils.checkOptionDependencies( logger, commandLine, "--metrics-enabled", !isMetricsEnabled, asList("--metrics-host", "--metrics-port")); - checkOptionDependencies( + CommandLineUtils.checkOptionDependencies( logger, commandLine, "--metrics-push-enabled", @@ -1272,7 +1272,7 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { private PrivacyParameters privacyParameters() throws IOException { - checkOptionDependencies( + CommandLineUtils.checkOptionDependencies( logger, commandLine, "--privacy-enabled", @@ -1332,7 +1332,7 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { // Blockchain synchronisation from peers. private void synchronize( - final PantheonController controller, + final BesuController controller, final boolean p2pEnabled, final boolean peerDiscoveryEnabled, final EthNetworkConfig ethNetworkConfig, @@ -1355,7 +1355,7 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { final Runner runner = runnerBuilder .vertx(Vertx.vertx(createVertxOptions(metricsSystem))) - .pantheonController(controller) + .besuController(controller) .p2pEnabled(p2pEnabled) .natMethod(natMethod) .discovery(peerDiscoveryEnabled) @@ -1397,11 +1397,11 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { new Thread( () -> { try { - pantheonPluginContext.stopPlugins(); + besuPluginContext.stopPlugins(); runner.close(); LogManager.shutdown(); } catch (final Exception e) { - logger.error("Failed to stop Pantheon"); + logger.error("Failed to stop Besu"); } })); } @@ -1529,15 +1529,15 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { } else if (isDocker) { return Paths.get(DOCKER_DATADIR_LOCATION); } else { - return getDefaultPantheonDataPath(this); + return getDefaultBesuDataPath(this); } } private Path pluginsDir() { if (isFullInstantiation()) { - final String pluginsDir = System.getProperty("pantheon.plugins.dir"); + final String pluginsDir = System.getProperty("besu.plugins.dir"); if (pluginsDir == null) { - return new File(System.getProperty("pantheon.home", "."), "plugins").toPath(); + return new File(System.getProperty("besu.home", "."), "plugins").toPath(); } else { return new File(pluginsDir).toPath(); } @@ -1648,8 +1648,8 @@ public class PantheonCommand implements DefaultCommandValues, Runnable { return StaticNodesParser.fromPath(staticNodesPath); } - public PantheonExceptionHandler exceptionHandler() { - return new PantheonExceptionHandler(this::getLogLevel); + public BesuExceptionHandler exceptionHandler() { + return new BesuExceptionHandler(this::getLogLevel); } private Level getLogLevel() { diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/DefaultCommandValues.java b/besu/src/main/java/org/hyperledger/besu/cli/DefaultCommandValues.java similarity index 71% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/DefaultCommandValues.java rename to besu/src/main/java/org/hyperledger/besu/cli/DefaultCommandValues.java index facb710ff4..422d1a02a6 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/DefaultCommandValues.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/DefaultCommandValues.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.cli; +package org.hyperledger.besu.cli; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.sync.SyncMode; -import tech.pegasys.pantheon.ethereum.p2p.config.RlpxConfiguration; -import tech.pegasys.pantheon.nat.NatMethod; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.sync.SyncMode; +import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration; +import org.hyperledger.besu.nat.NatMethod; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.File; import java.io.IOException; @@ -34,7 +34,7 @@ public interface DefaultCommandValues { String MANDATORY_PATH_FORMAT_HELP = ""; String MANDATORY_FILE_FORMAT_HELP = ""; String MANDATORY_DIRECTORY_FORMAT_HELP = ""; - String PANTHEON_HOME_PROPERTY_NAME = "pantheon.home"; + String BESU_HOME_PROPERTY_NAME = "besu.home"; String DEFAULT_DATA_DIR_PATH = "./build/data"; String MANDATORY_INTEGER_FORMAT_HELP = ""; String MANDATORY_DOUBLE_FORMAT_HELP = ""; @@ -48,15 +48,15 @@ public interface DefaultCommandValues { BytesValue DEFAULT_EXTRA_DATA = BytesValue.EMPTY; long DEFAULT_MAX_REFRESH_DELAY = 3600000; long DEFAULT_MIN_REFRESH_DELAY = 1; - String DOCKER_GENESIS_LOCATION = "/etc/pantheon/genesis.json"; - String DOCKER_DATADIR_LOCATION = "/var/lib/pantheon"; - String DOCKER_PLUGINSDIR_LOCATION = "/etc/pantheon/plugins"; + String DOCKER_GENESIS_LOCATION = "/etc/besu/genesis.json"; + String DOCKER_DATADIR_LOCATION = "/var/lib/besu"; + String DOCKER_PLUGINSDIR_LOCATION = "/etc/besu/plugins"; String DOCKER_RPC_HTTP_AUTHENTICATION_CREDENTIALS_FILE_LOCATION = - "/etc/pantheon/rpc_http_auth_config.toml"; + "/etc/besu/rpc_http_auth_config.toml"; String DOCKER_RPC_WS_AUTHENTICATION_CREDENTIALS_FILE_LOCATION = - "/etc/pantheon/rpc_ws_auth_config.toml"; - String DOCKER_PRIVACY_PUBLIC_KEY_FILE = "/etc/pantheon/privacy_public_key"; - String DOCKER_PERMISSIONS_CONFIG_FILE_LOCATION = "/etc/pantheon/permissions_config.toml"; + "/etc/besu/rpc_ws_auth_config.toml"; + String DOCKER_PRIVACY_PUBLIC_KEY_FILE = "/etc/besu/privacy_public_key"; + String DOCKER_PERMISSIONS_CONFIG_FILE_LOCATION = "/etc/besu/permissions_config.toml"; String PERMISSIONING_CONFIG_LOCATION = "permissions_config.toml"; String MANDATORY_HOST_FORMAT_HELP = ""; String MANDATORY_PORT_FORMAT_HELP = ""; @@ -70,21 +70,21 @@ public interface DefaultCommandValues { RlpxConfiguration.DEFAULT_FRACTION_REMOTE_CONNECTIONS_ALLOWED; String DEFAULT_KEY_VALUE_STORAGE_NAME = "rocksdb"; - static Path getDefaultPantheonDataPath(final Object command) { - // this property is retrieved from Gradle tasks or Pantheon running shell script. - final String pantheonHomeProperty = System.getProperty(PANTHEON_HOME_PROPERTY_NAME); - final Path pantheonHome; + static Path getDefaultBesuDataPath(final Object command) { + // this property is retrieved from Gradle tasks or Besu running shell script. + final String besuHomeProperty = System.getProperty(BESU_HOME_PROPERTY_NAME); + final Path besuHome; // If prop is found, then use it - if (pantheonHomeProperty != null) { + if (besuHomeProperty != null) { try { - pantheonHome = Paths.get(pantheonHomeProperty); + besuHome = Paths.get(besuHomeProperty); } catch (final InvalidPathException e) { throw new CommandLine.ParameterException( new CommandLine(command), String.format( "Unable to define default data directory from %s property.", - PANTHEON_HOME_PROPERTY_NAME), + BESU_HOME_PROPERTY_NAME), e); } } else { @@ -93,7 +93,7 @@ public interface DefaultCommandValues { // the property. try { final String path = new File(DEFAULT_DATA_DIR_PATH).getCanonicalPath(); - pantheonHome = Paths.get(path); + besuHome = Paths.get(path); } catch (final IOException e) { throw new CommandLine.ParameterException( new CommandLine(command), "Unable to create default data directory."); @@ -104,20 +104,19 @@ public interface DefaultCommandValues { // directory. Otherwise, if it doesn't exist or exists but is already a directory, // Runner will use it to store data. try { - Files.createDirectories(pantheonHome); + Files.createDirectories(besuHome); } catch (final FileAlreadyExistsException e) { // Only thrown if it exists but is not a directory throw new CommandLine.ParameterException( new CommandLine(command), - String.format( - "%s: already exists and is not a directory.", pantheonHome.toAbsolutePath()), + String.format("%s: already exists and is not a directory.", besuHome.toAbsolutePath()), e); } catch (final Exception e) { throw new CommandLine.ParameterException( new CommandLine(command), - String.format("Error creating directory %s.", pantheonHome.toAbsolutePath()), + String.format("Error creating directory %s.", besuHome.toAbsolutePath()), e); } - return pantheonHome; + return besuHome; } } diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/StandaloneCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/StandaloneCommand.java similarity index 88% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/StandaloneCommand.java rename to besu/src/main/java/org/hyperledger/besu/cli/StandaloneCommand.java index 3ba0ce81e2..2ea7d54acb 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/StandaloneCommand.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/StandaloneCommand.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.cli; +package org.hyperledger.besu.cli; -import static tech.pegasys.pantheon.cli.DefaultCommandValues.getDefaultPantheonDataPath; +import static org.hyperledger.besu.cli.DefaultCommandValues.getDefaultBesuDataPath; import java.io.File; import java.nio.file.Path; @@ -33,8 +33,8 @@ class StandaloneCommand implements DefaultCommandValues { @CommandLine.Option( names = {"--data-path"}, paramLabel = MANDATORY_PATH_FORMAT_HELP, - description = "The path to Pantheon data directory (default: ${DEFAULT-VALUE})") - final Path dataPath = getDefaultPantheonDataPath(this); + description = "The path to Besu data directory (default: ${DEFAULT-VALUE})") + final Path dataPath = getDefaultBesuDataPath(this); // Genesis file path with null default option if the option // is not defined on command line as this default is handled by Runner @@ -52,7 +52,7 @@ class StandaloneCommand implements DefaultCommandValues { names = {"--node-private-key-file"}, paramLabel = MANDATORY_PATH_FORMAT_HELP, description = - "The node's private key file (default: a file named \"key\" in the Pantheon data folder)") + "The node's private key file (default: a file named \"key\" in the Besu data folder)") final File nodePrivateKeyFile = null; @CommandLine.Option( @@ -79,12 +79,12 @@ class StandaloneCommand implements DefaultCommandValues { @CommandLine.Option( names = {"--permissions-nodes-config-file"}, description = - "Node permissioning config TOML file (default: a file named \"permissions_config.toml\" in the Pantheon data folder)") + "Node permissioning config TOML file (default: a file named \"permissions_config.toml\" in the Besu data folder)") String nodePermissionsConfigFile = null; @CommandLine.Option( names = {"--permissions-accounts-config-file"}, description = - "Account permissioning config TOML file (default: a file named \"permissions_config.toml\" in the Pantheon data folder)") + "Account permissioning config TOML file (default: a file named \"permissions_config.toml\" in the Besu data folder)") String accountPermissionsConfigFile = null; } diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/UnstableOptionsSubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/UnstableOptionsSubCommand.java similarity index 93% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/UnstableOptionsSubCommand.java rename to besu/src/main/java/org/hyperledger/besu/cli/UnstableOptionsSubCommand.java index 8d746bc488..a28eed5ce4 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/UnstableOptionsSubCommand.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/UnstableOptionsSubCommand.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.cli; +package org.hyperledger.besu.cli; -import static tech.pegasys.pantheon.cli.UnstableOptionsSubCommand.COMMAND_NAME; +import static org.hyperledger.besu.cli.UnstableOptionsSubCommand.COMMAND_NAME; import java.io.PrintStream; import java.util.Map; @@ -20,12 +20,12 @@ import java.util.Map; import picocli.CommandLine; /** - * This class provides a CLI command to enumerate the unstable options available in Pantheon. + * This class provides a CLI command to enumerate the unstable options available in Besu. * *

Unstable options are distinguished by * *

    - *
  • Not being configured in the main PantheonCommand + *
  • Not being configured in the main BesuCommand *
  • Being marked as 'hidden' *
  • Having their first option name start with --X *
diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/config/EthNetworkConfig.java b/besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java similarity index 91% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/config/EthNetworkConfig.java rename to besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java index d1752c6375..6118d6569d 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/config/EthNetworkConfig.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.cli.config; +package org.hyperledger.besu.cli.config; import static java.nio.charset.StandardCharsets.UTF_8; -import static tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration.GOERLI_BOOTSTRAP_NODES; -import static tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration.MAINNET_BOOTSTRAP_NODES; -import static tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration.RINKEBY_BOOTSTRAP_NODES; -import static tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration.ROPSTEN_BOOTSTRAP_NODES; +import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.GOERLI_BOOTSTRAP_NODES; +import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.MAINNET_BOOTSTRAP_NODES; +import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.RINKEBY_BOOTSTRAP_NODES; +import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.ROPSTEN_BOOTSTRAP_NODES; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; import java.io.IOException; import java.math.BigInteger; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/config/NetworkName.java b/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java similarity index 94% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/config/NetworkName.java rename to besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java index ac7ead3298..23963cf8eb 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/config/NetworkName.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.config; +package org.hyperledger.besu.cli.config; public enum NetworkName { MAINNET, diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/FractionConverter.java b/besu/src/main/java/org/hyperledger/besu/cli/converter/FractionConverter.java similarity index 84% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/FractionConverter.java rename to besu/src/main/java/org/hyperledger/besu/cli/converter/FractionConverter.java index 61d203964c..c365fffc6c 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/FractionConverter.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/converter/FractionConverter.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.cli.converter; +package org.hyperledger.besu.cli.converter; -import tech.pegasys.pantheon.cli.converter.exception.FractionConversionException; -import tech.pegasys.pantheon.util.number.Fraction; +import org.hyperledger.besu.cli.converter.exception.FractionConversionException; +import org.hyperledger.besu.util.number.Fraction; import picocli.CommandLine; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/MetricCategoryConverter.java b/besu/src/main/java/org/hyperledger/besu/cli/converter/MetricCategoryConverter.java similarity index 92% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/MetricCategoryConverter.java rename to besu/src/main/java/org/hyperledger/besu/cli/converter/MetricCategoryConverter.java index f0f2b4689e..4188361ef9 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/MetricCategoryConverter.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/converter/MetricCategoryConverter.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.cli.converter; +package org.hyperledger.besu.cli.converter; -import tech.pegasys.pantheon.plugin.services.metrics.MetricCategory; +import org.hyperledger.besu.plugin.services.metrics.MetricCategory; import java.util.EnumSet; import java.util.HashMap; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/PercentageConverter.java b/besu/src/main/java/org/hyperledger/besu/cli/converter/PercentageConverter.java similarity index 84% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/PercentageConverter.java rename to besu/src/main/java/org/hyperledger/besu/cli/converter/PercentageConverter.java index f3f0d95503..100df7f5af 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/PercentageConverter.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/converter/PercentageConverter.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.cli.converter; +package org.hyperledger.besu.cli.converter; -import tech.pegasys.pantheon.cli.converter.exception.PercentageConversionException; -import tech.pegasys.pantheon.util.number.Percentage; +import org.hyperledger.besu.cli.converter.exception.PercentageConversionException; +import org.hyperledger.besu.util.number.Percentage; import picocli.CommandLine; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/RpcApisConverter.java b/besu/src/main/java/org/hyperledger/besu/cli/converter/RpcApisConverter.java similarity index 76% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/RpcApisConverter.java rename to besu/src/main/java/org/hyperledger/besu/cli/converter/RpcApisConverter.java index 2c6054f946..d5c4174e71 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/RpcApisConverter.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/converter/RpcApisConverter.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.cli.converter; +package org.hyperledger.besu.cli.converter; -import tech.pegasys.pantheon.cli.converter.exception.RpcApisConversionException; -import tech.pegasys.pantheon.consensus.clique.jsonrpc.CliqueRpcApis; -import tech.pegasys.pantheon.consensus.ibft.jsonrpc.IbftRpcApis; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApi; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApis; +import org.hyperledger.besu.cli.converter.exception.RpcApisConversionException; +import org.hyperledger.besu.consensus.clique.jsonrpc.CliqueRpcApis; +import org.hyperledger.besu.consensus.ibft.jsonrpc.IbftRpcApis; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis; import java.util.Optional; import java.util.function.Function; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/exception/FractionConversionException.java b/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/FractionConversionException.java similarity index 93% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/exception/FractionConversionException.java rename to besu/src/main/java/org/hyperledger/besu/cli/converter/exception/FractionConversionException.java index 94889de1c2..b35593bb15 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/exception/FractionConversionException.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/FractionConversionException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.converter.exception; +package org.hyperledger.besu.cli.converter.exception; import static java.lang.String.format; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/exception/PercentageConversionException.java b/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/PercentageConversionException.java similarity index 93% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/exception/PercentageConversionException.java rename to besu/src/main/java/org/hyperledger/besu/cli/converter/exception/PercentageConversionException.java index 95bdc2c67b..09cd058463 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/exception/PercentageConversionException.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/PercentageConversionException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.converter.exception; +package org.hyperledger.besu.cli.converter.exception; import static java.lang.String.format; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/exception/RpcApisConversionException.java b/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/RpcApisConversionException.java similarity index 93% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/exception/RpcApisConversionException.java rename to besu/src/main/java/org/hyperledger/besu/cli/converter/exception/RpcApisConversionException.java index 8a3e2a2cc1..e87d825895 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/converter/exception/RpcApisConversionException.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/RpcApisConversionException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.converter.exception; +package org.hyperledger.besu.cli.converter.exception; import static java.lang.String.format; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/custom/CorsAllowedOriginsProperty.java b/besu/src/main/java/org/hyperledger/besu/cli/custom/CorsAllowedOriginsProperty.java similarity index 98% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/custom/CorsAllowedOriginsProperty.java rename to besu/src/main/java/org/hyperledger/besu/cli/custom/CorsAllowedOriginsProperty.java index e1f3cc4d5f..a22869ebd6 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/custom/CorsAllowedOriginsProperty.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/custom/CorsAllowedOriginsProperty.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.custom; +package org.hyperledger.besu.cli.custom; import java.util.AbstractList; import java.util.ArrayList; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/custom/EnodeToURIPropertyConverter.java b/besu/src/main/java/org/hyperledger/besu/cli/custom/EnodeToURIPropertyConverter.java similarity index 92% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/custom/EnodeToURIPropertyConverter.java rename to besu/src/main/java/org/hyperledger/besu/cli/custom/EnodeToURIPropertyConverter.java index f0659a00e9..0728ea3c8e 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/custom/EnodeToURIPropertyConverter.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/custom/EnodeToURIPropertyConverter.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.cli.custom; +package org.hyperledger.besu.cli.custom; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; import java.net.URI; import java.util.function.Function; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/custom/JsonRPCWhitelistHostsProperty.java b/besu/src/main/java/org/hyperledger/besu/cli/custom/JsonRPCWhitelistHostsProperty.java similarity index 98% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/custom/JsonRPCWhitelistHostsProperty.java rename to besu/src/main/java/org/hyperledger/besu/cli/custom/JsonRPCWhitelistHostsProperty.java index 9058aa194e..598bcf3d7e 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/custom/JsonRPCWhitelistHostsProperty.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/custom/JsonRPCWhitelistHostsProperty.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.custom; +package org.hyperledger.besu.cli.custom; import java.util.AbstractList; import java.util.ArrayList; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/custom/RpcAuthFileValidator.java b/besu/src/main/java/org/hyperledger/besu/cli/custom/RpcAuthFileValidator.java similarity index 96% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/custom/RpcAuthFileValidator.java rename to besu/src/main/java/org/hyperledger/besu/cli/custom/RpcAuthFileValidator.java index c42322ec89..507f7b8013 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/custom/RpcAuthFileValidator.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/custom/RpcAuthFileValidator.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.cli.custom; +package org.hyperledger.besu.cli.custom; -import tech.pegasys.pantheon.ethereum.permissioning.TomlConfigFileParser; +import org.hyperledger.besu.ethereum.permissioning.TomlConfigFileParser; import java.io.File; import java.io.IOException; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/error/PantheonExceptionHandler.java b/besu/src/main/java/org/hyperledger/besu/cli/error/BesuExceptionHandler.java similarity index 85% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/error/PantheonExceptionHandler.java rename to besu/src/main/java/org/hyperledger/besu/cli/error/BesuExceptionHandler.java index cfa8b3df84..e3163b7ad0 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/error/PantheonExceptionHandler.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/error/BesuExceptionHandler.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.error; +package org.hyperledger.besu.cli.error; import java.util.List; import java.util.function.Supplier; @@ -18,13 +18,13 @@ import java.util.function.Supplier; import org.apache.logging.log4j.Level; import picocli.CommandLine; -public class PantheonExceptionHandler - extends CommandLine.AbstractHandler, PantheonExceptionHandler> +public class BesuExceptionHandler + extends CommandLine.AbstractHandler, BesuExceptionHandler> implements CommandLine.IExceptionHandler2> { private final Supplier levelSupplier; - public PantheonExceptionHandler(final Supplier levelSupplier) { + public BesuExceptionHandler(final Supplier levelSupplier) { this.levelSupplier = levelSupplier; } @@ -50,7 +50,7 @@ public class PantheonExceptionHandler } @Override - protected PantheonExceptionHandler self() { + protected BesuExceptionHandler self() { return this; } } diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/options/CLIOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/CLIOptions.java similarity index 96% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/options/CLIOptions.java rename to besu/src/main/java/org/hyperledger/besu/cli/options/CLIOptions.java index 76ceeb9280..b00021b90d 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/options/CLIOptions.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/options/CLIOptions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.options; +package org.hyperledger.besu.cli.options; import java.util.List; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/options/EthProtocolOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/EthProtocolOptions.java similarity index 95% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/options/EthProtocolOptions.java rename to besu/src/main/java/org/hyperledger/besu/cli/options/EthProtocolOptions.java index 0e5d3197ca..5745a8f714 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/options/EthProtocolOptions.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/options/EthProtocolOptions.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.cli.options; +package org.hyperledger.besu.cli.options; -import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration; -import tech.pegasys.pantheon.util.number.PositiveNumber; +import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; +import org.hyperledger.besu.util.number.PositiveNumber; import java.util.Arrays; import java.util.List; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/options/MetricsCLIOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/MetricsCLIOptions.java similarity index 93% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/options/MetricsCLIOptions.java rename to besu/src/main/java/org/hyperledger/besu/cli/options/MetricsCLIOptions.java index cf3faf94d3..5ab29ff56f 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/options/MetricsCLIOptions.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/options/MetricsCLIOptions.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.cli.options; +package org.hyperledger.besu.cli.options; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; import java.util.Arrays; import java.util.List; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/options/NetworkingOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/NetworkingOptions.java similarity index 96% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/options/NetworkingOptions.java rename to besu/src/main/java/org/hyperledger/besu/cli/options/NetworkingOptions.java index 888133aab6..22337f3eaf 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/options/NetworkingOptions.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/options/NetworkingOptions.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.cli.options; +package org.hyperledger.besu.cli.options; -import tech.pegasys.pantheon.ethereum.p2p.config.NetworkingConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; import java.util.Arrays; import java.util.List; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/options/OptionParser.java b/besu/src/main/java/org/hyperledger/besu/cli/options/OptionParser.java similarity index 95% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/options/OptionParser.java rename to besu/src/main/java/org/hyperledger/besu/cli/options/OptionParser.java index 197ee7aabe..9671cd4ea1 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/options/OptionParser.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/options/OptionParser.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.cli.options; +package org.hyperledger.besu.cli.options; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.util.Iterator; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/options/SynchronizerOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/SynchronizerOptions.java similarity index 98% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/options/SynchronizerOptions.java rename to besu/src/main/java/org/hyperledger/besu/cli/options/SynchronizerOptions.java index a569676f21..cd6b7a8adc 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/options/SynchronizerOptions.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/options/SynchronizerOptions.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.cli.options; +package org.hyperledger.besu.cli.options; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Arrays; import java.util.List; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/options/TransactionPoolOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/TransactionPoolOptions.java similarity index 94% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/options/TransactionPoolOptions.java rename to besu/src/main/java/org/hyperledger/besu/cli/options/TransactionPoolOptions.java index a8e92575b8..163a00659b 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/options/TransactionPoolOptions.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/options/TransactionPoolOptions.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.cli.options; +package org.hyperledger.besu.cli.options; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; import java.util.Arrays; import java.util.List; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/PasswordSubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/PasswordSubCommand.java similarity index 87% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/PasswordSubCommand.java rename to besu/src/main/java/org/hyperledger/besu/cli/subcommands/PasswordSubCommand.java index 039686702e..1ffd1c87ee 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/PasswordSubCommand.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/PasswordSubCommand.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.cli.subcommands; +package org.hyperledger.besu.cli.subcommands; import static com.google.common.base.Preconditions.checkNotNull; -import static tech.pegasys.pantheon.cli.subcommands.PasswordSubCommand.COMMAND_NAME; +import static org.hyperledger.besu.cli.subcommands.PasswordSubCommand.COMMAND_NAME; -import tech.pegasys.pantheon.cli.PantheonCommand; -import tech.pegasys.pantheon.cli.subcommands.PasswordSubCommand.HashSubCommand; +import org.hyperledger.besu.cli.BesuCommand; +import org.hyperledger.besu.cli.subcommands.PasswordSubCommand.HashSubCommand; import java.io.PrintStream; @@ -38,7 +38,7 @@ public class PasswordSubCommand implements Runnable { @SuppressWarnings("unused") @ParentCommand - private PantheonCommand parentCommand; + private BesuCommand parentCommand; @SuppressWarnings("unused") @Spec diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/PublicKeySubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/PublicKeySubCommand.java similarity index 88% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/PublicKeySubCommand.java rename to besu/src/main/java/org/hyperledger/besu/cli/subcommands/PublicKeySubCommand.java index 3064cec745..d03d6af520 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/PublicKeySubCommand.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/PublicKeySubCommand.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.cli.subcommands; +package org.hyperledger.besu.cli.subcommands; import static com.google.common.base.Preconditions.checkNotNull; import static java.nio.charset.StandardCharsets.UTF_8; -import static tech.pegasys.pantheon.cli.DefaultCommandValues.MANDATORY_FILE_FORMAT_HELP; -import static tech.pegasys.pantheon.cli.subcommands.PublicKeySubCommand.COMMAND_NAME; +import static org.hyperledger.besu.cli.subcommands.PublicKeySubCommand.COMMAND_NAME; -import tech.pegasys.pantheon.cli.PantheonCommand; -import tech.pegasys.pantheon.cli.subcommands.PublicKeySubCommand.AddressSubCommand; -import tech.pegasys.pantheon.cli.subcommands.PublicKeySubCommand.ExportSubCommand; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Util; +import org.hyperledger.besu.cli.BesuCommand; +import org.hyperledger.besu.cli.DefaultCommandValues; +import org.hyperledger.besu.cli.subcommands.PublicKeySubCommand.AddressSubCommand; +import org.hyperledger.besu.cli.subcommands.PublicKeySubCommand.ExportSubCommand; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Util; import java.io.BufferedWriter; import java.io.File; @@ -54,7 +54,7 @@ public class PublicKeySubCommand implements Runnable { @SuppressWarnings("unused") @ParentCommand - private PantheonCommand parentCommand; // Picocli injects reference to parent command + private BesuCommand parentCommand; // Picocli injects reference to parent command @SuppressWarnings("unused") @Spec @@ -98,7 +98,7 @@ public class PublicKeySubCommand implements Runnable { @Option( names = "--to", - paramLabel = MANDATORY_FILE_FORMAT_HELP, + paramLabel = DefaultCommandValues.MANDATORY_FILE_FORMAT_HELP, description = "File to write public key to instead of standard output", arity = "1..1") private File publicKeyExportFile = null; @@ -150,7 +150,7 @@ public class PublicKeySubCommand implements Runnable { @Option( names = "--to", - paramLabel = MANDATORY_FILE_FORMAT_HELP, + paramLabel = DefaultCommandValues.MANDATORY_FILE_FORMAT_HELP, description = "File to write address to instead of standard output", arity = "1..1") private File addressExportFile = null; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/RetestethSubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/RetestethSubCommand.java similarity index 75% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/RetestethSubCommand.java rename to besu/src/main/java/org/hyperledger/besu/cli/subcommands/RetestethSubCommand.java index 2b4153437f..23facecf29 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/RetestethSubCommand.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/RetestethSubCommand.java @@ -10,20 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.cli.subcommands; +package org.hyperledger.besu.cli.subcommands; -import static tech.pegasys.pantheon.cli.DefaultCommandValues.MANDATORY_HOST_FORMAT_HELP; -import static tech.pegasys.pantheon.cli.DefaultCommandValues.MANDATORY_PATH_FORMAT_HELP; -import static tech.pegasys.pantheon.cli.DefaultCommandValues.MANDATORY_PORT_FORMAT_HELP; -import static tech.pegasys.pantheon.cli.DefaultCommandValues.getDefaultPantheonDataPath; -import static tech.pegasys.pantheon.cli.subcommands.RetestethSubCommand.COMMAND_NAME; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration.DEFAULT_JSON_RPC_PORT; +import static org.hyperledger.besu.cli.subcommands.RetestethSubCommand.COMMAND_NAME; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration.DEFAULT_JSON_RPC_PORT; -import tech.pegasys.pantheon.PantheonInfo; -import tech.pegasys.pantheon.cli.custom.JsonRPCWhitelistHostsProperty; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration; -import tech.pegasys.pantheon.ethereum.retesteth.RetestethConfiguration; -import tech.pegasys.pantheon.ethereum.retesteth.RetestethService; +import org.hyperledger.besu.BesuInfo; +import org.hyperledger.besu.cli.DefaultCommandValues; +import org.hyperledger.besu.cli.custom.JsonRPCWhitelistHostsProperty; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; +import org.hyperledger.besu.ethereum.retesteth.RetestethConfiguration; +import org.hyperledger.besu.ethereum.retesteth.RetestethService; import java.net.InetAddress; import java.nio.file.Path; @@ -48,9 +45,9 @@ public class RetestethSubCommand implements Runnable { @CommandLine.Option( names = {"--data-path"}, - paramLabel = MANDATORY_PATH_FORMAT_HELP, - description = "The path to Pantheon data directory (default: ${DEFAULT-VALUE})") - final Path dataPath = getDefaultPantheonDataPath(this); + paramLabel = DefaultCommandValues.MANDATORY_PATH_FORMAT_HELP, + description = "The path to Besu data directory (default: ${DEFAULT-VALUE})") + final Path dataPath = DefaultCommandValues.getDefaultBesuDataPath(this); @Option( names = {"--logging", "-l"}, @@ -62,14 +59,14 @@ public class RetestethSubCommand implements Runnable { @SuppressWarnings("FieldMayBeFinal") // Because PicoCLI requires Strings to not be final. @Option( names = {"--rpc-http-host"}, - paramLabel = MANDATORY_HOST_FORMAT_HELP, + paramLabel = DefaultCommandValues.MANDATORY_HOST_FORMAT_HELP, description = "Host for JSON-RPC HTTP to listen on (default: ${DEFAULT-VALUE})", arity = "1") private String rpcHttpHost = autoDiscoverDefaultIP().getHostAddress(); @Option( names = {"--rpc-http-port"}, - paramLabel = MANDATORY_PORT_FORMAT_HELP, + paramLabel = DefaultCommandValues.MANDATORY_PORT_FORMAT_HELP, description = "Port for JSON-RPC HTTP to listen on (default: ${DEFAULT-VALUE})", arity = "1") private final Integer rpcHttpPort = DEFAULT_JSON_RPC_PORT; @@ -117,7 +114,7 @@ public class RetestethSubCommand implements Runnable { jsonRpcConfiguration.setHostsWhitelist(hostsWhitelist); final RetestethService retestethService = - new RetestethService(PantheonInfo.version(), retestethConfiguration, jsonRpcConfiguration); + new RetestethService(BesuInfo.version(), retestethConfiguration, jsonRpcConfiguration); Runtime.getRuntime() .addShutdownHook( @@ -127,7 +124,7 @@ public class RetestethSubCommand implements Runnable { retestethService.close(); LogManager.shutdown(); } catch (final Exception e) { - LOG.error("Failed to stop Pantheon Retesteth"); + LOG.error("Failed to stop Besu Retesteth"); } })); retestethService.start(); diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/blocks/BlockExportFormat.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlockExportFormat.java similarity index 92% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/blocks/BlockExportFormat.java rename to besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlockExportFormat.java index 2fda6eb6bf..945c7ae9e0 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/blocks/BlockExportFormat.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlockExportFormat.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.subcommands.blocks; +package org.hyperledger.besu.cli.subcommands.blocks; public enum BlockExportFormat { RLP diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/blocks/BlockImportFormat.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlockImportFormat.java similarity index 92% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/blocks/BlockImportFormat.java rename to besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlockImportFormat.java index 45a6575ab1..d2a9a416e5 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/blocks/BlockImportFormat.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlockImportFormat.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.subcommands.blocks; +package org.hyperledger.besu.cli.subcommands.blocks; public enum BlockImportFormat { RLP, diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/blocks/BlocksSubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlocksSubCommand.java similarity index 84% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/blocks/BlocksSubCommand.java rename to besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlocksSubCommand.java index 8902110a74..8d81494be3 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/blocks/BlocksSubCommand.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlocksSubCommand.java @@ -10,28 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.cli.subcommands.blocks; +package org.hyperledger.besu.cli.subcommands.blocks; import static com.google.common.base.Preconditions.checkNotNull; -import static tech.pegasys.pantheon.cli.DefaultCommandValues.MANDATORY_FILE_FORMAT_HELP; -import static tech.pegasys.pantheon.cli.DefaultCommandValues.MANDATORY_LONG_FORMAT_HELP; -import static tech.pegasys.pantheon.cli.subcommands.blocks.BlocksSubCommand.COMMAND_NAME; - -import tech.pegasys.pantheon.chainexport.RlpBlockExporter; -import tech.pegasys.pantheon.chainimport.JsonBlockImporter; -import tech.pegasys.pantheon.chainimport.RlpBlockImporter; -import tech.pegasys.pantheon.cli.PantheonCommand; -import tech.pegasys.pantheon.cli.subcommands.blocks.BlocksSubCommand.ExportSubCommand; -import tech.pegasys.pantheon.cli.subcommands.blocks.BlocksSubCommand.ImportSubCommand; -import tech.pegasys.pantheon.controller.PantheonController; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; -import tech.pegasys.pantheon.metrics.prometheus.MetricsService; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import static org.hyperledger.besu.cli.subcommands.blocks.BlocksSubCommand.COMMAND_NAME; + +import org.hyperledger.besu.chainexport.RlpBlockExporter; +import org.hyperledger.besu.chainimport.JsonBlockImporter; +import org.hyperledger.besu.chainimport.RlpBlockImporter; +import org.hyperledger.besu.cli.BesuCommand; +import org.hyperledger.besu.cli.DefaultCommandValues; +import org.hyperledger.besu.cli.subcommands.blocks.BlocksSubCommand.ExportSubCommand; +import org.hyperledger.besu.cli.subcommands.blocks.BlocksSubCommand.ImportSubCommand; +import org.hyperledger.besu.controller.BesuController; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.metrics.prometheus.MetricsService; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.File; import java.io.FileNotFoundException; @@ -68,7 +67,7 @@ public class BlocksSubCommand implements Runnable { @SuppressWarnings("unused") @ParentCommand - private PantheonCommand parentCommand; // Picocli injects reference to parent command + private BesuCommand parentCommand; // Picocli injects reference to parent command @SuppressWarnings("unused") @Spec @@ -114,7 +113,7 @@ public class BlocksSubCommand implements Runnable { @Option( names = "--from", required = true, - paramLabel = MANDATORY_FILE_FORMAT_HELP, + paramLabel = DefaultCommandValues.MANDATORY_FILE_FORMAT_HELP, description = "File containing blocks to import.", arity = "1..1") private final File blocksImportFile = null; @@ -146,7 +145,7 @@ public class BlocksSubCommand implements Runnable { // mandatory. So we are sure it's always not null, we can remove the warning. //noinspection ConstantConditions final Path path = blocksImportFile.toPath(); - final PantheonController controller = createController(); + final BesuController controller = createController(); switch (format) { case RLP: importRlpBlocks(controller, path); @@ -174,7 +173,7 @@ public class BlocksSubCommand implements Runnable { checkNotNull(parentCommand.parentCommand); } - private PantheonController createController() { + private BesuController createController() { try { // Set some defaults return parentCommand @@ -195,7 +194,7 @@ public class BlocksSubCommand implements Runnable { return new MiningParameters(coinbase, minTransactionGasPrice, extraData, false); } - private void importJsonBlocks(final PantheonController controller, final Path path) + private void importJsonBlocks(final BesuController controller, final Path path) throws IOException { JsonBlockImporter importer = parentCommand.jsonBlockImporterFactory.get(controller); @@ -203,7 +202,7 @@ public class BlocksSubCommand implements Runnable { importer.importChain(jsonData); } - private void importRlpBlocks(final PantheonController controller, final Path path) + private void importRlpBlocks(final BesuController controller, final Path path) throws IOException { parentCommand.rlpBlockImporter.importBlockchain(path, controller); } @@ -225,14 +224,14 @@ public class BlocksSubCommand implements Runnable { @Option( names = "--start-block", - paramLabel = MANDATORY_LONG_FORMAT_HELP, + paramLabel = DefaultCommandValues.MANDATORY_LONG_FORMAT_HELP, description = "The starting index of the block, or block list to export.", arity = "1..1") private final Long startBlock = null; @Option( names = "--end-block", - paramLabel = MANDATORY_LONG_FORMAT_HELP, + paramLabel = DefaultCommandValues.MANDATORY_LONG_FORMAT_HELP, description = "The ending index of the block list to export (exclusive). If not specified a single block will be exported.", arity = "1..1") @@ -249,7 +248,7 @@ public class BlocksSubCommand implements Runnable { @Option( names = "--to", required = true, - paramLabel = MANDATORY_FILE_FORMAT_HELP, + paramLabel = DefaultCommandValues.MANDATORY_FILE_FORMAT_HELP, description = "File to write the block list to.", arity = "1..1") private File blocksExportFile = null; @@ -266,7 +265,7 @@ public class BlocksSubCommand implements Runnable { checkCommand(this, startBlock, endBlock); final Optional metricsService = initMetrics(parentCommand); - final PantheonController controller = createPantheonController(); + final BesuController controller = createBesuController(); try { switch (format) { case RLP: @@ -284,11 +283,11 @@ public class BlocksSubCommand implements Runnable { } } - private PantheonController createPantheonController() { + private BesuController createBesuController() { return parentCommand.parentCommand.buildController(); } - private void exportRlpFormat(final PantheonController controller) throws IOException { + private void exportRlpFormat(final BesuController controller) throws IOException { final ProtocolContext context = controller.getProtocolContext(); RlpBlockExporter exporter = parentCommand.rlpBlockExporterFactory.get(context.getBlockchain()); @@ -340,7 +339,7 @@ public class BlocksSubCommand implements Runnable { Path databasePath = Paths.get( parentCommand.parentCommand.dataDir().toAbsolutePath().toString(), - PantheonController.DATABASE_PATH); + BesuController.DATABASE_PATH); File databaseDirectory = new File(databasePath.toString()); if (!databaseDirectory.isDirectory() || databaseDirectory.list().length == 0) { // Empty data directory, nothing to export @@ -378,7 +377,7 @@ public class BlocksSubCommand implements Runnable { @FunctionalInterface public interface JsonBlockImporterFactory { - JsonBlockImporter get(PantheonController controller); + JsonBlockImporter get(BesuController controller); } @FunctionalInterface diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/operator/OperatorSubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/OperatorSubCommand.java similarity index 90% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/operator/OperatorSubCommand.java rename to besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/OperatorSubCommand.java index c5832dc7bf..db9278a7c7 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/operator/OperatorSubCommand.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/OperatorSubCommand.java @@ -10,23 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.cli.subcommands.operator; +package org.hyperledger.besu.cli.subcommands.operator; import static com.google.common.base.Preconditions.checkNotNull; import static java.nio.charset.StandardCharsets.UTF_8; -import static tech.pegasys.pantheon.cli.DefaultCommandValues.MANDATORY_DIRECTORY_FORMAT_HELP; -import static tech.pegasys.pantheon.cli.DefaultCommandValues.MANDATORY_FILE_FORMAT_HELP; -import static tech.pegasys.pantheon.cli.DefaultCommandValues.MANDATORY_PATH_FORMAT_HELP; -import static tech.pegasys.pantheon.cli.subcommands.operator.OperatorSubCommand.COMMAND_NAME; - -import tech.pegasys.pantheon.cli.PantheonCommand; -import tech.pegasys.pantheon.config.JsonGenesisConfigOptions; -import tech.pegasys.pantheon.config.JsonUtil; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import static org.hyperledger.besu.cli.subcommands.operator.OperatorSubCommand.COMMAND_NAME; + +import org.hyperledger.besu.cli.BesuCommand; +import org.hyperledger.besu.cli.DefaultCommandValues; +import org.hyperledger.besu.config.JsonGenesisConfigOptions; +import org.hyperledger.besu.config.JsonUtil; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.File; import java.io.IOException; @@ -67,7 +65,7 @@ public class OperatorSubCommand implements Runnable { @SuppressWarnings("unused") @ParentCommand - private PantheonCommand parentCommand; // Picocli injects reference to parent command + private BesuCommand parentCommand; // Picocli injects reference to parent command @SuppressWarnings("unused") @Spec @@ -93,7 +91,7 @@ public class OperatorSubCommand implements Runnable { @Option( required = true, names = "--config-file", - paramLabel = MANDATORY_FILE_FORMAT_HELP, + paramLabel = DefaultCommandValues.MANDATORY_FILE_FORMAT_HELP, description = "Configuration file.", arity = "1..1") private File configurationFile = null; @@ -101,28 +99,28 @@ public class OperatorSubCommand implements Runnable { @Option( required = true, names = "--to", - paramLabel = MANDATORY_DIRECTORY_FORMAT_HELP, + paramLabel = DefaultCommandValues.MANDATORY_DIRECTORY_FORMAT_HELP, description = "Directory to write output files to.", arity = "1..1") private File outputDirectory = null; @Option( names = "--genesis-file-name", - paramLabel = MANDATORY_PATH_FORMAT_HELP, + paramLabel = DefaultCommandValues.MANDATORY_PATH_FORMAT_HELP, description = "Name of the genesis file. (default: ${DEFAULT-VALUE})", arity = "1..1") private String genesisFileName = "genesis.json"; @Option( names = "--private-key-file-name", - paramLabel = MANDATORY_PATH_FORMAT_HELP, + paramLabel = DefaultCommandValues.MANDATORY_PATH_FORMAT_HELP, description = "Name of the private key file. (default: ${DEFAULT-VALUE})", arity = "1..1") private String privateKeyFileName = "key.priv"; @Option( names = "--public-key-file-name", - paramLabel = MANDATORY_PATH_FORMAT_HELP, + paramLabel = DefaultCommandValues.MANDATORY_PATH_FORMAT_HELP, description = "Name of the public key file. (default: ${DEFAULT-VALUE})", arity = "1..1") private String publicKeyFileName = "key.pub"; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/rlp/IbftExtraDataCLIAdapter.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/IbftExtraDataCLIAdapter.java similarity index 88% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/rlp/IbftExtraDataCLIAdapter.java rename to besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/IbftExtraDataCLIAdapter.java index 8a0ed31b74..bef0b4cc64 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/rlp/IbftExtraDataCLIAdapter.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/IbftExtraDataCLIAdapter.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.cli.subcommands.rlp; +package org.hyperledger.besu.cli.subcommands.rlp; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.util.Collection; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/rlp/JSONToRLP.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/JSONToRLP.java similarity index 90% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/rlp/JSONToRLP.java rename to besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/JSONToRLP.java index f0fdf0403d..708e8c2528 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/rlp/JSONToRLP.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/JSONToRLP.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.cli.subcommands.rlp; +package org.hyperledger.besu.cli.subcommands.rlp; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/rlp/RLPSubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/RLPSubCommand.java similarity index 93% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/rlp/RLPSubCommand.java rename to besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/RLPSubCommand.java index 74b9a9548a..968ee02f20 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/rlp/RLPSubCommand.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/RLPSubCommand.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.cli.subcommands.rlp; +package org.hyperledger.besu.cli.subcommands.rlp; import static com.google.common.base.Preconditions.checkNotNull; import static java.nio.charset.StandardCharsets.UTF_8; -import static tech.pegasys.pantheon.cli.DefaultCommandValues.MANDATORY_FILE_FORMAT_HELP; -import tech.pegasys.pantheon.cli.PantheonCommand; -import tech.pegasys.pantheon.cli.subcommands.rlp.RLPSubCommand.EncodeSubCommand; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.cli.BesuCommand; +import org.hyperledger.besu.cli.DefaultCommandValues; +import org.hyperledger.besu.cli.subcommands.rlp.RLPSubCommand.EncodeSubCommand; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -53,7 +53,7 @@ public class RLPSubCommand implements Runnable { @SuppressWarnings("unused") @ParentCommand - private PantheonCommand parentCommand; + private BesuCommand parentCommand; @SuppressWarnings("unused") @Spec @@ -97,14 +97,14 @@ public class RLPSubCommand implements Runnable { @Option( names = "--from", - paramLabel = MANDATORY_FILE_FORMAT_HELP, + paramLabel = DefaultCommandValues.MANDATORY_FILE_FORMAT_HELP, description = "File containing JSON object to encode", arity = "1..1") private File jsonSourceFile = null; @Option( names = "--to", - paramLabel = MANDATORY_FILE_FORMAT_HELP, + paramLabel = DefaultCommandValues.MANDATORY_FILE_FORMAT_HELP, description = "File to write encoded RLP string to.", arity = "1..1") private File rlpTargetFile = null; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/rlp/RLPType.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/RLPType.java similarity index 94% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/rlp/RLPType.java rename to besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/RLPType.java index 9fd66a35de..3088ac2efb 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/subcommands/rlp/RLPType.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/RLPType.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.subcommands.rlp; +package org.hyperledger.besu.cli.subcommands.rlp; /** Type of the RLP data to encode/decode */ public enum RLPType { diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/util/CascadingDefaultProvider.java b/besu/src/main/java/org/hyperledger/besu/cli/util/CascadingDefaultProvider.java similarity index 97% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/util/CascadingDefaultProvider.java rename to besu/src/main/java/org/hyperledger/besu/cli/util/CascadingDefaultProvider.java index c3e8cd8432..9b353040e7 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/util/CascadingDefaultProvider.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/util/CascadingDefaultProvider.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.util; +package org.hyperledger.besu.cli.util; import static java.util.Arrays.asList; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/util/CommandLineUtils.java b/besu/src/main/java/org/hyperledger/besu/cli/util/CommandLineUtils.java similarity index 96% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/util/CommandLineUtils.java rename to besu/src/main/java/org/hyperledger/besu/cli/util/CommandLineUtils.java index 36f4d770f0..41c1d35b10 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/util/CommandLineUtils.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/util/CommandLineUtils.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.cli.util; +package org.hyperledger.besu.cli.util; -import tech.pegasys.pantheon.util.StringUtils; +import org.hyperledger.besu.util.StringUtils; import java.util.Arrays; import java.util.List; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/util/ConfigOptionSearchAndRunHandler.java b/besu/src/main/java/org/hyperledger/besu/cli/util/ConfigOptionSearchAndRunHandler.java similarity index 96% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/util/ConfigOptionSearchAndRunHandler.java rename to besu/src/main/java/org/hyperledger/besu/cli/util/ConfigOptionSearchAndRunHandler.java index 7d569ff90c..c0017395cd 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/util/ConfigOptionSearchAndRunHandler.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/util/ConfigOptionSearchAndRunHandler.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.util; +package org.hyperledger.besu.cli.util; import java.io.File; import java.util.ArrayList; @@ -27,7 +27,7 @@ import picocli.CommandLine.Model.OptionSpec; import picocli.CommandLine.ParseResult; public class ConfigOptionSearchAndRunHandler extends AbstractParseResultHandler> { - private static final String DOCKER_CONFIG_LOCATION = "/etc/pantheon/pantheon.conf"; + private static final String DOCKER_CONFIG_LOCATION = "/etc/besu/besu.conf"; private final AbstractParseResultHandler> resultHandler; private final CommandLine.IExceptionHandler2> exceptionHandler; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/util/EnvironmentVariableDefaultProvider.java b/besu/src/main/java/org/hyperledger/besu/cli/util/EnvironmentVariableDefaultProvider.java similarity index 94% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/util/EnvironmentVariableDefaultProvider.java rename to besu/src/main/java/org/hyperledger/besu/cli/util/EnvironmentVariableDefaultProvider.java index d03c4b65c7..35d429d4f8 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/util/EnvironmentVariableDefaultProvider.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/util/EnvironmentVariableDefaultProvider.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.util; +package org.hyperledger.besu.cli.util; import java.util.Arrays; import java.util.Locale; @@ -23,7 +23,7 @@ import picocli.CommandLine.Model.ArgSpec; import picocli.CommandLine.Model.OptionSpec; public class EnvironmentVariableDefaultProvider implements IDefaultValueProvider { - private static final String ENV_VAR_PREFIX = "PANTHEON_"; + private static final String ENV_VAR_PREFIX = "BESU_"; private final Map environment; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/util/TomlConfigFileDefaultProvider.java b/besu/src/main/java/org/hyperledger/besu/cli/util/TomlConfigFileDefaultProvider.java similarity index 98% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/util/TomlConfigFileDefaultProvider.java rename to besu/src/main/java/org/hyperledger/besu/cli/util/TomlConfigFileDefaultProvider.java index 537ef6b883..dd49534fef 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/util/TomlConfigFileDefaultProvider.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/util/TomlConfigFileDefaultProvider.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.cli.util; +package org.hyperledger.besu.cli.util; -import tech.pegasys.pantheon.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.Wei; import java.io.File; import java.io.IOException; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/util/VersionProvider.java b/besu/src/main/java/org/hyperledger/besu/cli/util/VersionProvider.java similarity index 84% rename from pantheon/src/main/java/tech/pegasys/pantheon/cli/util/VersionProvider.java rename to besu/src/main/java/org/hyperledger/besu/cli/util/VersionProvider.java index de3b390141..23272fa017 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/util/VersionProvider.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/util/VersionProvider.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.cli.util; +package org.hyperledger.besu.cli.util; -import tech.pegasys.pantheon.PantheonInfo; +import org.hyperledger.besu.BesuInfo; import picocli.CommandLine; public class VersionProvider implements CommandLine.IVersionProvider { @Override public String[] getVersion() { - return new String[] {PantheonInfo.version()}; + return new String[] {BesuInfo.version()}; } } diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java b/besu/src/main/java/org/hyperledger/besu/controller/BesuController.java similarity index 73% rename from pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java rename to besu/src/main/java/org/hyperledger/besu/controller/BesuController.java index 787c0afa1f..d876606269 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java +++ b/besu/src/main/java/org/hyperledger/besu/controller/BesuController.java @@ -10,30 +10,30 @@ * 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. */ -package tech.pegasys.pantheon.controller; - -import tech.pegasys.pantheon.cli.config.EthNetworkConfig; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.config.GenesisConfigOptions; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApi; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethodFactory; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.config.SubProtocolConfiguration; +package org.hyperledger.besu.controller; + +import org.hyperledger.besu.cli.config.EthNetworkConfig; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.config.GenesisConfigOptions; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethodFactory; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.config.SubProtocolConfiguration; import java.util.Collection; import java.util.Collections; import java.util.Map; -public class PantheonController implements java.io.Closeable { +public class BesuController implements java.io.Closeable { public static final String DATABASE_PATH = "database"; private final ProtocolSchedule protocolSchedule; @@ -51,7 +51,7 @@ public class PantheonController implements java.io.Closeable { private final Runnable close; private final SyncState syncState; - PantheonController( + BesuController( final ProtocolSchedule protocolSchedule, final ProtocolContext protocolContext, final EthProtocolManager ethProtocolManager, @@ -136,12 +136,11 @@ public class PantheonController implements java.io.Closeable { public static class Builder { - public PantheonControllerBuilder fromEthNetworkConfig( - final EthNetworkConfig ethNetworkConfig) { + public BesuControllerBuilder fromEthNetworkConfig(final EthNetworkConfig ethNetworkConfig) { return fromEthNetworkConfig(ethNetworkConfig, Collections.emptyMap()); } - public PantheonControllerBuilder fromEthNetworkConfig( + public BesuControllerBuilder fromEthNetworkConfig( final EthNetworkConfig ethNetworkConfig, final Map genesisConfigOverrides) { return fromGenesisConfig( GenesisConfigFile.fromConfig(ethNetworkConfig.getGenesisConfig()), @@ -149,24 +148,24 @@ public class PantheonController implements java.io.Closeable { .networkId(ethNetworkConfig.getNetworkId()); } - public PantheonControllerBuilder fromGenesisConfig(final GenesisConfigFile genesisConfig) { + public BesuControllerBuilder fromGenesisConfig(final GenesisConfigFile genesisConfig) { return fromGenesisConfig(genesisConfig, Collections.emptyMap()); } - public PantheonControllerBuilder fromGenesisConfig( + public BesuControllerBuilder fromGenesisConfig( final GenesisConfigFile genesisConfig, final Map genesisConfigOverrides) { final GenesisConfigOptions configOptions = genesisConfig.getConfigOptions(genesisConfigOverrides); - final PantheonControllerBuilder builder; + final BesuControllerBuilder builder; if (configOptions.isEthHash()) { - builder = new MainnetPantheonControllerBuilder(); + builder = new MainnetBesuControllerBuilder(); } else if (configOptions.isIbft2()) { - builder = new IbftPantheonControllerBuilder(); + builder = new IbftBesuControllerBuilder(); } else if (configOptions.isIbftLegacy()) { - builder = new IbftLegacyPantheonControllerBuilder(); + builder = new IbftLegacyBesuControllerBuilder(); } else if (configOptions.isClique()) { - builder = new CliquePantheonControllerBuilder(); + builder = new CliqueBesuControllerBuilder(); } else { throw new IllegalArgumentException("Unknown consensus mechanism defined"); } diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java similarity index 74% rename from pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonControllerBuilder.java rename to besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java index 19c4d23d01..a200d4b5a4 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonControllerBuilder.java +++ b/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java @@ -10,44 +10,44 @@ * 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. */ -package tech.pegasys.pantheon.controller; +package org.hyperledger.besu.controller; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import static tech.pegasys.pantheon.controller.KeyPairUtil.loadKeyPair; - -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethodFactory; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.GenesisState; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.peervalidation.DaoForkPeerValidator; -import tech.pegasys.pantheon.ethereum.eth.peervalidation.PeerValidatorRunner; -import tech.pegasys.pantheon.ethereum.eth.sync.DefaultSynchronizer; -import tech.pegasys.pantheon.ethereum.eth.sync.SyncMode; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolFactory; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.config.SubProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.storage.StorageProvider; -import tech.pegasys.pantheon.ethereum.worldstate.MarkSweepPruner; -import tech.pegasys.pantheon.ethereum.worldstate.Pruner; -import tech.pegasys.pantheon.ethereum.worldstate.PruningConfiguration; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; +import static org.hyperledger.besu.controller.KeyPairUtil.loadKeyPair; + +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethodFactory; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.GenesisState; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.peervalidation.DaoForkPeerValidator; +import org.hyperledger.besu.ethereum.eth.peervalidation.PeerValidatorRunner; +import org.hyperledger.besu.ethereum.eth.sync.DefaultSynchronizer; +import org.hyperledger.besu.ethereum.eth.sync.SyncMode; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolFactory; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.config.SubProtocolConfiguration; +import org.hyperledger.besu.ethereum.storage.StorageProvider; +import org.hyperledger.besu.ethereum.worldstate.MarkSweepPruner; +import org.hyperledger.besu.ethereum.worldstate.Pruner; +import org.hyperledger.besu.ethereum.worldstate.PruningConfiguration; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.ObservableMetricsSystem; import java.io.File; import java.io.IOException; @@ -66,7 +66,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -public abstract class PantheonControllerBuilder { +public abstract class BesuControllerBuilder { private static final Logger LOG = LogManager.getLogger(); @@ -89,98 +89,98 @@ public abstract class PantheonControllerBuilder { private PruningConfiguration pruningConfiguration; Map genesisConfigOverrides; - public PantheonControllerBuilder storageProvider(final StorageProvider storageProvider) { + public BesuControllerBuilder storageProvider(final StorageProvider storageProvider) { this.storageProvider = storageProvider; return this; } - public PantheonControllerBuilder genesisConfigFile(final GenesisConfigFile genesisConfig) { + public BesuControllerBuilder genesisConfigFile(final GenesisConfigFile genesisConfig) { this.genesisConfig = genesisConfig; return this; } - public PantheonControllerBuilder synchronizerConfiguration( + public BesuControllerBuilder synchronizerConfiguration( final SynchronizerConfiguration synchronizerConfig) { this.syncConfig = synchronizerConfig; return this; } - public PantheonControllerBuilder ethProtocolConfiguration( + public BesuControllerBuilder ethProtocolConfiguration( final EthProtocolConfiguration ethProtocolConfiguration) { this.ethereumWireProtocolConfiguration = ethProtocolConfiguration; return this; } - public PantheonControllerBuilder networkId(final BigInteger networkId) { + public BesuControllerBuilder networkId(final BigInteger networkId) { this.networkId = networkId; return this; } - public PantheonControllerBuilder miningParameters(final MiningParameters miningParameters) { + public BesuControllerBuilder miningParameters(final MiningParameters miningParameters) { this.miningParameters = miningParameters; return this; } - public PantheonControllerBuilder nodePrivateKeyFile(final File nodePrivateKeyFile) + public BesuControllerBuilder nodePrivateKeyFile(final File nodePrivateKeyFile) throws IOException { this.nodeKeys = loadKeyPair(nodePrivateKeyFile); return this; } - public PantheonControllerBuilder nodeKeys(final KeyPair nodeKeys) { + public BesuControllerBuilder nodeKeys(final KeyPair nodeKeys) { this.nodeKeys = nodeKeys; return this; } - public PantheonControllerBuilder metricsSystem(final ObservableMetricsSystem metricsSystem) { + public BesuControllerBuilder metricsSystem(final ObservableMetricsSystem metricsSystem) { this.metricsSystem = metricsSystem; return this; } - public PantheonControllerBuilder privacyParameters(final PrivacyParameters privacyParameters) { + public BesuControllerBuilder privacyParameters(final PrivacyParameters privacyParameters) { this.privacyParameters = privacyParameters; return this; } - public PantheonControllerBuilder dataDirectory(final Path dataDirectory) { + public BesuControllerBuilder dataDirectory(final Path dataDirectory) { this.dataDirectory = dataDirectory; return this; } - public PantheonControllerBuilder clock(final Clock clock) { + public BesuControllerBuilder clock(final Clock clock) { this.clock = clock; return this; } - public PantheonControllerBuilder transactionPoolConfiguration( + public BesuControllerBuilder transactionPoolConfiguration( final TransactionPoolConfiguration transactionPoolConfiguration) { this.transactionPoolConfiguration = transactionPoolConfiguration; return this; } - public PantheonControllerBuilder isRevertReasonEnabled(final boolean isRevertReasonEnabled) { + public BesuControllerBuilder isRevertReasonEnabled(final boolean isRevertReasonEnabled) { this.isRevertReasonEnabled = isRevertReasonEnabled; return this; } - public PantheonControllerBuilder isPruningEnabled(final boolean pruningEnabled) { + public BesuControllerBuilder isPruningEnabled(final boolean pruningEnabled) { this.isPruningEnabled = pruningEnabled; return this; } - public PantheonControllerBuilder pruningConfiguration( + public BesuControllerBuilder pruningConfiguration( final PruningConfiguration pruningConfiguration) { this.pruningConfiguration = pruningConfiguration; return this; } - public PantheonControllerBuilder genesisConfigOverrides( + public BesuControllerBuilder genesisConfigOverrides( final Map genesisConfigOverrides) { this.genesisConfigOverrides = genesisConfigOverrides; return this; } - public PantheonController build() { + public BesuController build() { checkNotNull(genesisConfig, "Missing genesis config"); checkNotNull(syncConfig, "Missing sync config"); checkNotNull(ethereumWireProtocolConfiguration, "Missing ethereum protocol configuration"); @@ -298,7 +298,7 @@ public abstract class PantheonControllerBuilder { final JsonRpcMethodFactory additionalJsonRpcMethodFactory = createAdditionalJsonRpcMethodFactory(protocolContext); - return new PantheonController<>( + return new BesuController<>( protocolSchedule, protocolContext, ethProtocolManager, diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/CliquePantheonControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/CliqueBesuControllerBuilder.java similarity index 69% rename from pantheon/src/main/java/tech/pegasys/pantheon/controller/CliquePantheonControllerBuilder.java rename to besu/src/main/java/org/hyperledger/besu/controller/CliqueBesuControllerBuilder.java index c3833ba406..b3087c50a5 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/CliquePantheonControllerBuilder.java +++ b/besu/src/main/java/org/hyperledger/besu/controller/CliqueBesuControllerBuilder.java @@ -10,35 +10,35 @@ * 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. */ -package tech.pegasys.pantheon.controller; +package org.hyperledger.besu.controller; -import tech.pegasys.pantheon.config.CliqueConfigOptions; -import tech.pegasys.pantheon.consensus.clique.CliqueBlockInterface; -import tech.pegasys.pantheon.consensus.clique.CliqueContext; -import tech.pegasys.pantheon.consensus.clique.CliqueMiningTracker; -import tech.pegasys.pantheon.consensus.clique.CliqueProtocolSchedule; -import tech.pegasys.pantheon.consensus.clique.blockcreation.CliqueBlockScheduler; -import tech.pegasys.pantheon.consensus.clique.blockcreation.CliqueMinerExecutor; -import tech.pegasys.pantheon.consensus.clique.blockcreation.CliqueMiningCoordinator; -import tech.pegasys.pantheon.consensus.clique.jsonrpc.CliqueJsonRpcMethodsFactory; -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.consensus.common.EpochManager; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.consensus.common.VoteTallyUpdater; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethodFactory; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.config.CliqueConfigOptions; +import org.hyperledger.besu.consensus.clique.CliqueBlockInterface; +import org.hyperledger.besu.consensus.clique.CliqueContext; +import org.hyperledger.besu.consensus.clique.CliqueMiningTracker; +import org.hyperledger.besu.consensus.clique.CliqueProtocolSchedule; +import org.hyperledger.besu.consensus.clique.blockcreation.CliqueBlockScheduler; +import org.hyperledger.besu.consensus.clique.blockcreation.CliqueMinerExecutor; +import org.hyperledger.besu.consensus.clique.blockcreation.CliqueMiningCoordinator; +import org.hyperledger.besu.consensus.clique.jsonrpc.CliqueJsonRpcMethodsFactory; +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.consensus.common.EpochManager; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.consensus.common.VoteTallyUpdater; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethodFactory; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -47,7 +47,7 @@ import java.util.concurrent.TimeUnit; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -public class CliquePantheonControllerBuilder extends PantheonControllerBuilder { +public class CliqueBesuControllerBuilder extends BesuControllerBuilder { private static final Logger LOG = LogManager.getLogger(); private Address localAddress; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/IbftBesuControllerBuilder.java similarity index 68% rename from pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonControllerBuilder.java rename to besu/src/main/java/org/hyperledger/besu/controller/IbftBesuControllerBuilder.java index 22357ff035..aa9de1f4b8 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonControllerBuilder.java +++ b/besu/src/main/java/org/hyperledger/besu/controller/IbftBesuControllerBuilder.java @@ -10,59 +10,59 @@ * 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. */ -package tech.pegasys.pantheon.controller; - -import static tech.pegasys.pantheon.ethereum.eth.manager.MonitoredExecutors.newScheduledThreadPool; - -import tech.pegasys.pantheon.config.IbftConfigOptions; -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.consensus.common.EpochManager; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.consensus.common.VoteTallyUpdater; -import tech.pegasys.pantheon.consensus.ibft.BlockTimer; -import tech.pegasys.pantheon.consensus.ibft.EthSynchronizerUpdater; -import tech.pegasys.pantheon.consensus.ibft.EventMultiplexer; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockInterface; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.IbftEventQueue; -import tech.pegasys.pantheon.consensus.ibft.IbftGossip; -import tech.pegasys.pantheon.consensus.ibft.IbftProcessor; -import tech.pegasys.pantheon.consensus.ibft.IbftProtocolSchedule; -import tech.pegasys.pantheon.consensus.ibft.MessageTracker; -import tech.pegasys.pantheon.consensus.ibft.RoundTimer; -import tech.pegasys.pantheon.consensus.ibft.UniqueMessageMulticaster; -import tech.pegasys.pantheon.consensus.ibft.blockcreation.IbftBlockCreatorFactory; -import tech.pegasys.pantheon.consensus.ibft.blockcreation.IbftMiningCoordinator; -import tech.pegasys.pantheon.consensus.ibft.blockcreation.ProposerSelector; -import tech.pegasys.pantheon.consensus.ibft.jsonrpc.IbftJsonRpcMethodsFactory; -import tech.pegasys.pantheon.consensus.ibft.network.ValidatorPeers; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.protocol.IbftProtocolManager; -import tech.pegasys.pantheon.consensus.ibft.protocol.IbftSubProtocol; -import tech.pegasys.pantheon.consensus.ibft.statemachine.FutureMessageBuffer; -import tech.pegasys.pantheon.consensus.ibft.statemachine.IbftBlockHeightManagerFactory; -import tech.pegasys.pantheon.consensus.ibft.statemachine.IbftController; -import tech.pegasys.pantheon.consensus.ibft.statemachine.IbftFinalState; -import tech.pegasys.pantheon.consensus.ibft.statemachine.IbftRoundFactory; -import tech.pegasys.pantheon.consensus.ibft.validation.MessageValidatorFactory; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethodFactory; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.MinedBlockObserver; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.config.SubProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.Subscribers; +package org.hyperledger.besu.controller; + +import static org.hyperledger.besu.ethereum.eth.manager.MonitoredExecutors.newScheduledThreadPool; + +import org.hyperledger.besu.config.IbftConfigOptions; +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.consensus.common.EpochManager; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.consensus.common.VoteTallyUpdater; +import org.hyperledger.besu.consensus.ibft.BlockTimer; +import org.hyperledger.besu.consensus.ibft.EthSynchronizerUpdater; +import org.hyperledger.besu.consensus.ibft.EventMultiplexer; +import org.hyperledger.besu.consensus.ibft.IbftBlockInterface; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.IbftEventQueue; +import org.hyperledger.besu.consensus.ibft.IbftGossip; +import org.hyperledger.besu.consensus.ibft.IbftProcessor; +import org.hyperledger.besu.consensus.ibft.IbftProtocolSchedule; +import org.hyperledger.besu.consensus.ibft.MessageTracker; +import org.hyperledger.besu.consensus.ibft.RoundTimer; +import org.hyperledger.besu.consensus.ibft.UniqueMessageMulticaster; +import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreatorFactory; +import org.hyperledger.besu.consensus.ibft.blockcreation.IbftMiningCoordinator; +import org.hyperledger.besu.consensus.ibft.blockcreation.ProposerSelector; +import org.hyperledger.besu.consensus.ibft.jsonrpc.IbftJsonRpcMethodsFactory; +import org.hyperledger.besu.consensus.ibft.network.ValidatorPeers; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.protocol.IbftProtocolManager; +import org.hyperledger.besu.consensus.ibft.protocol.IbftSubProtocol; +import org.hyperledger.besu.consensus.ibft.statemachine.FutureMessageBuffer; +import org.hyperledger.besu.consensus.ibft.statemachine.IbftBlockHeightManagerFactory; +import org.hyperledger.besu.consensus.ibft.statemachine.IbftController; +import org.hyperledger.besu.consensus.ibft.statemachine.IbftFinalState; +import org.hyperledger.besu.consensus.ibft.statemachine.IbftRoundFactory; +import org.hyperledger.besu.consensus.ibft.validation.MessageValidatorFactory; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethodFactory; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.MinedBlockObserver; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.config.SubProtocolConfiguration; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.Subscribers; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -72,7 +72,7 @@ import java.util.concurrent.TimeUnit; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -public class IbftPantheonControllerBuilder extends PantheonControllerBuilder { +public class IbftBesuControllerBuilder extends BesuControllerBuilder { private static final Logger LOG = LogManager.getLogger(); private IbftEventQueue ibftEventQueue; private IbftConfigOptions ibftConfig; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftLegacyPantheonControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/IbftLegacyBesuControllerBuilder.java similarity index 67% rename from pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftLegacyPantheonControllerBuilder.java rename to besu/src/main/java/org/hyperledger/besu/controller/IbftLegacyBesuControllerBuilder.java index 727b0ce745..b177ece3b3 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftLegacyPantheonControllerBuilder.java +++ b/besu/src/main/java/org/hyperledger/besu/controller/IbftLegacyBesuControllerBuilder.java @@ -10,35 +10,35 @@ * 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. */ -package tech.pegasys.pantheon.controller; +package org.hyperledger.besu.controller; -import tech.pegasys.pantheon.config.IbftConfigOptions; -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.consensus.common.EpochManager; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.consensus.common.VoteTallyUpdater; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibftlegacy.IbftLegacyBlockInterface; -import tech.pegasys.pantheon.consensus.ibftlegacy.IbftProtocolSchedule; -import tech.pegasys.pantheon.consensus.ibftlegacy.protocol.Istanbul64Protocol; -import tech.pegasys.pantheon.consensus.ibftlegacy.protocol.Istanbul64ProtocolManager; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.config.SubProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.config.IbftConfigOptions; +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.consensus.common.EpochManager; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.consensus.common.VoteTallyUpdater; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibftlegacy.IbftLegacyBlockInterface; +import org.hyperledger.besu.consensus.ibftlegacy.IbftProtocolSchedule; +import org.hyperledger.besu.consensus.ibftlegacy.protocol.Istanbul64Protocol; +import org.hyperledger.besu.consensus.ibftlegacy.protocol.Istanbul64ProtocolManager; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.config.SubProtocolConfiguration; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -public class IbftLegacyPantheonControllerBuilder extends PantheonControllerBuilder { +public class IbftLegacyBesuControllerBuilder extends BesuControllerBuilder { private static final Logger LOG = LogManager.getLogger(); private final BlockInterface blockInterface = new IbftLegacyBlockInterface(); diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/KeyPairUtil.java b/besu/src/main/java/org/hyperledger/besu/controller/KeyPairUtil.java similarity index 93% rename from pantheon/src/main/java/tech/pegasys/pantheon/controller/KeyPairUtil.java rename to besu/src/main/java/org/hyperledger/besu/controller/KeyPairUtil.java index e53639e808..d17c7ac699 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/KeyPairUtil.java +++ b/besu/src/main/java/org/hyperledger/besu/controller/KeyPairUtil.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.controller; +package org.hyperledger.besu.controller; -import tech.pegasys.pantheon.crypto.InvalidSEC256K1PrivateKeyStoreException; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.crypto.InvalidSEC256K1PrivateKeyStoreException; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.util.bytes.Bytes32; import java.io.File; import java.io.IOException; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/MainnetPantheonControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/MainnetBesuControllerBuilder.java similarity index 72% rename from pantheon/src/main/java/tech/pegasys/pantheon/controller/MainnetPantheonControllerBuilder.java rename to besu/src/main/java/org/hyperledger/besu/controller/MainnetBesuControllerBuilder.java index ae9a898bc8..c8faae7b73 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/MainnetPantheonControllerBuilder.java +++ b/besu/src/main/java/org/hyperledger/besu/controller/MainnetBesuControllerBuilder.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.controller; +package org.hyperledger.besu.controller; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.blockcreation.DefaultBlockScheduler; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMinerExecutor; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderValidator; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.blockcreation.DefaultBlockScheduler; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMinerExecutor; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderValidator; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -34,7 +34,7 @@ import java.util.concurrent.TimeUnit; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -public class MainnetPantheonControllerBuilder extends PantheonControllerBuilder { +public class MainnetBesuControllerBuilder extends BesuControllerBuilder { private static final Logger LOG = LogManager.getLogger(); @Override diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/services/PantheonConfigurationImpl.java b/besu/src/main/java/org/hyperledger/besu/services/BesuConfigurationImpl.java similarity index 78% rename from pantheon/src/main/java/tech/pegasys/pantheon/services/PantheonConfigurationImpl.java rename to besu/src/main/java/org/hyperledger/besu/services/BesuConfigurationImpl.java index 73fdad9535..40f3e3d71d 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/services/PantheonConfigurationImpl.java +++ b/besu/src/main/java/org/hyperledger/besu/services/BesuConfigurationImpl.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.services; +package org.hyperledger.besu.services; -import tech.pegasys.pantheon.plugin.services.PantheonConfiguration; +import org.hyperledger.besu.plugin.services.BesuConfiguration; import java.net.URI; import java.nio.file.Path; import java.util.Optional; -public class PantheonConfigurationImpl implements PantheonConfiguration { +public class BesuConfigurationImpl implements BesuConfiguration { private final Path storagePath; - public PantheonConfigurationImpl(final Path storagePath) { + public BesuConfigurationImpl(final Path storagePath) { this.storagePath = storagePath; } diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/services/PantheonEventsImpl.java b/besu/src/main/java/org/hyperledger/besu/services/BesuEventsImpl.java similarity index 86% rename from pantheon/src/main/java/tech/pegasys/pantheon/services/PantheonEventsImpl.java rename to besu/src/main/java/org/hyperledger/besu/services/BesuEventsImpl.java index 1c31ba3983..4e799cd812 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/services/PantheonEventsImpl.java +++ b/besu/src/main/java/org/hyperledger/besu/services/BesuEventsImpl.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.services; +package org.hyperledger.besu.services; -import tech.pegasys.pantheon.ethereum.eth.sync.BlockBroadcaster; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.plugin.services.PantheonEvents; +import org.hyperledger.besu.ethereum.eth.sync.BlockBroadcaster; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.plugin.services.BesuEvents; -public class PantheonEventsImpl implements PantheonEvents { +public class BesuEventsImpl implements BesuEvents { private final BlockBroadcaster blockBroadcaster; private final TransactionPool transactionPool; private final SyncState syncState; - public PantheonEventsImpl( + public BesuEventsImpl( final BlockBroadcaster blockBroadcaster, final TransactionPool transactionPool, final SyncState syncState) { diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/services/PantheonPluginContextImpl.java b/besu/src/main/java/org/hyperledger/besu/services/BesuPluginContextImpl.java similarity index 84% rename from pantheon/src/main/java/tech/pegasys/pantheon/services/PantheonPluginContextImpl.java rename to besu/src/main/java/org/hyperledger/besu/services/BesuPluginContextImpl.java index 6a54d7a9a7..7a5c604cc5 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/services/PantheonPluginContextImpl.java +++ b/besu/src/main/java/org/hyperledger/besu/services/BesuPluginContextImpl.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.services; +package org.hyperledger.besu.services; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import tech.pegasys.pantheon.plugin.PantheonContext; -import tech.pegasys.pantheon.plugin.PantheonPlugin; +import org.hyperledger.besu.plugin.BesuContext; +import org.hyperledger.besu.plugin.BesuPlugin; import java.io.IOException; import java.net.MalformedURLException; @@ -38,7 +38,7 @@ import com.google.common.annotations.VisibleForTesting; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -public class PantheonPluginContextImpl implements PantheonContext { +public class BesuPluginContextImpl implements BesuContext { private static final Logger LOG = LogManager.getLogger(); @@ -54,7 +54,7 @@ public class PantheonPluginContextImpl implements PantheonContext { private Lifecycle state = Lifecycle.UNINITIALIZED; private final Map, ? super Object> serviceRegistry = new HashMap<>(); - private final List plugins = new ArrayList<>(); + private final List plugins = new ArrayList<>(); public void addService(final Class serviceType, final T service) { checkArgument(serviceType.isInterface(), "Services must be Java interfaces."); @@ -73,17 +73,17 @@ public class PantheonPluginContextImpl implements PantheonContext { public void registerPlugins(final Path pluginsDir) { checkState( state == Lifecycle.UNINITIALIZED, - "Pantheon plugins have already been registered. Cannot register additional plugins."); + "Besu plugins have already been registered. Cannot register additional plugins."); final ClassLoader pluginLoader = pluginDirectoryLoader(pluginsDir).orElse(this.getClass().getClassLoader()); state = Lifecycle.REGISTERING; - final ServiceLoader serviceLoader = - ServiceLoader.load(PantheonPlugin.class, pluginLoader); + final ServiceLoader serviceLoader = + ServiceLoader.load(BesuPlugin.class, pluginLoader); - for (final PantheonPlugin plugin : serviceLoader) { + for (final BesuPlugin plugin : serviceLoader) { try { plugin.register(this); LOG.debug("Registered plugin of type {}.", plugin.getClass().getName()); @@ -105,14 +105,14 @@ public class PantheonPluginContextImpl implements PantheonContext { public void startPlugins() { checkState( state == Lifecycle.REGISTERED, - "PantheonContext should be in state %s but it was in %s", + "BesuContext should be in state %s but it was in %s", Lifecycle.REGISTERED, state); state = Lifecycle.STARTING; - final Iterator pluginsIterator = plugins.iterator(); + final Iterator pluginsIterator = plugins.iterator(); while (pluginsIterator.hasNext()) { - final PantheonPlugin plugin = pluginsIterator.next(); + final BesuPlugin plugin = pluginsIterator.next(); try { plugin.start(); @@ -133,12 +133,12 @@ public class PantheonPluginContextImpl implements PantheonContext { public void stopPlugins() { checkState( state == Lifecycle.STARTED, - "PantheonContext should be in state %s but it was in %s", + "BesuContext should be in state %s but it was in %s", Lifecycle.STARTED, state); state = Lifecycle.STOPPING; - for (final PantheonPlugin plugin : plugins) { + for (final BesuPlugin plugin : plugins) { try { plugin.stop(); LOG.debug("Stopped plugin of type {}.", plugin.getClass().getName()); @@ -160,7 +160,7 @@ public class PantheonPluginContextImpl implements PantheonContext { } @VisibleForTesting - List getPlugins() { + List getPlugins() { return Collections.unmodifiableList(plugins); } @@ -172,7 +172,7 @@ public class PantheonPluginContextImpl implements PantheonContext { final URL[] pluginJarURLs = pluginFilesList .filter(p -> p.getFileName().toString().endsWith(".jar")) - .map(PantheonPluginContextImpl::pathToURIOrNull) + .map(BesuPluginContextImpl::pathToURIOrNull) .toArray(URL[]::new); return Optional.of(new URLClassLoader(pluginJarURLs, this.getClass().getClassLoader())); } catch (final MalformedURLException e) { diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/services/PicoCLIOptionsImpl.java b/besu/src/main/java/org/hyperledger/besu/services/PicoCLIOptionsImpl.java similarity index 90% rename from pantheon/src/main/java/tech/pegasys/pantheon/services/PicoCLIOptionsImpl.java rename to besu/src/main/java/org/hyperledger/besu/services/PicoCLIOptionsImpl.java index 69437cbbaa..974ab9b768 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/services/PicoCLIOptionsImpl.java +++ b/besu/src/main/java/org/hyperledger/besu/services/PicoCLIOptionsImpl.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.services; +package org.hyperledger.besu.services; -import tech.pegasys.pantheon.plugin.services.PicoCLIOptions; +import org.hyperledger.besu.plugin.services.PicoCLIOptions; import picocli.CommandLine; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/services/StorageServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/StorageServiceImpl.java similarity index 81% rename from pantheon/src/main/java/tech/pegasys/pantheon/services/StorageServiceImpl.java rename to besu/src/main/java/org/hyperledger/besu/services/StorageServiceImpl.java index c7ff5054ab..d21f27a45d 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/services/StorageServiceImpl.java +++ b/besu/src/main/java/org/hyperledger/besu/services/StorageServiceImpl.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.services; +package org.hyperledger.besu.services; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueSegmentIdentifier; -import tech.pegasys.pantheon.plugin.services.StorageService; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageFactory; -import tech.pegasys.pantheon.plugin.services.storage.SegmentIdentifier; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier; +import org.hyperledger.besu.plugin.services.StorageService; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageFactory; +import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier; import java.util.List; import java.util.Map; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/util/PermissioningConfigurationValidator.java b/besu/src/main/java/org/hyperledger/besu/util/PermissioningConfigurationValidator.java similarity index 95% rename from pantheon/src/main/java/tech/pegasys/pantheon/util/PermissioningConfigurationValidator.java rename to besu/src/main/java/org/hyperledger/besu/util/PermissioningConfigurationValidator.java index d13a991385..480f5747ee 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/util/PermissioningConfigurationValidator.java +++ b/besu/src/main/java/org/hyperledger/besu/util/PermissioningConfigurationValidator.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; -import tech.pegasys.pantheon.ethereum.permissioning.LocalPermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration; import java.net.URI; import java.net.URISyntaxException; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/util/PlatformDetector.java b/besu/src/main/java/org/hyperledger/besu/util/PlatformDetector.java similarity index 99% rename from pantheon/src/main/java/tech/pegasys/pantheon/util/PlatformDetector.java rename to besu/src/main/java/org/hyperledger/besu/util/PlatformDetector.java index 4a2823daef..694ca91d2e 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/util/PlatformDetector.java +++ b/besu/src/main/java/org/hyperledger/besu/util/PlatformDetector.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; import java.util.Locale; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/util/StringUtils.java b/besu/src/main/java/org/hyperledger/besu/util/StringUtils.java similarity index 97% rename from pantheon/src/main/java/tech/pegasys/pantheon/util/StringUtils.java rename to besu/src/main/java/org/hyperledger/besu/util/StringUtils.java index 67ad700725..97e65eca50 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/util/StringUtils.java +++ b/besu/src/main/java/org/hyperledger/besu/util/StringUtils.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; import java.util.List; import java.util.function.Function; diff --git a/pantheon/src/main/resources/log4j2.xml b/besu/src/main/resources/log4j2.xml similarity index 100% rename from pantheon/src/main/resources/log4j2.xml rename to besu/src/main/resources/log4j2.xml diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/PantheonInfoTest.java b/besu/src/test/java/org/hyperledger/besu/BesuInfoTest.java similarity index 78% rename from pantheon/src/test/java/tech/pegasys/pantheon/PantheonInfoTest.java rename to besu/src/test/java/org/hyperledger/besu/BesuInfoTest.java index f94b2bd4ee..ba73820731 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/PantheonInfoTest.java +++ b/besu/src/test/java/org/hyperledger/besu/BesuInfoTest.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon; +package org.hyperledger.besu; import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; -public final class PantheonInfoTest { +public final class BesuInfoTest { /** * Ethstats wants a version string like <foo>/v<bar>/<baz>/<bif>. Foo is the - * client identity (pantheon, Geth, Parity, etc). Bar is the version, in semantic version form + * client identity (besu, Geth, Parity, etc). Bar is the version, in semantic version form * (1.2.3-whatever), baz is OS and chip architecture, and bif is "compiler" - which we use as JVM * info. */ @Test public void versionStringIsEthstatsFriendly() { - assertThat(PantheonInfo.version()).matches("[^/]+/v(\\d+\\.\\d+\\.\\d+[^/]*|null)/[^/]+/[^/]+"); + assertThat(BesuInfo.version()).matches("[^/]+/v(\\d+\\.\\d+\\.\\d+[^/]*|null)/[^/]+/[^/]+"); } } diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/PrivacyTest.java b/besu/src/test/java/org/hyperledger/besu/PrivacyTest.java similarity index 67% rename from pantheon/src/test/java/tech/pegasys/pantheon/PrivacyTest.java rename to besu/src/test/java/org/hyperledger/besu/PrivacyTest.java index 032c2ff7df..676183c542 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/PrivacyTest.java +++ b/besu/src/test/java/org/hyperledger/besu/PrivacyTest.java @@ -10,30 +10,30 @@ * 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. */ -package tech.pegasys.pantheon; +package org.hyperledger.besu; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.controller.PantheonController; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider; -import tech.pegasys.pantheon.ethereum.core.MiningParametersTestBuilder; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.ethereum.mainnet.PrecompiledContract; -import tech.pegasys.pantheon.ethereum.storage.StorageProvider; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueSegmentIdentifier; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.RocksDBKeyValuePrivacyStorageFactory; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; -import tech.pegasys.pantheon.services.PantheonConfigurationImpl; -import tech.pegasys.pantheon.testutil.TestClock; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.controller.BesuController; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider; +import org.hyperledger.besu.ethereum.core.MiningParametersTestBuilder; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.mainnet.PrecompiledContract; +import org.hyperledger.besu.ethereum.storage.StorageProvider; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBKeyValuePrivacyStorageFactory; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; +import org.hyperledger.besu.services.BesuConfigurationImpl; +import org.hyperledger.besu.testutil.TestClock; import java.io.IOException; import java.math.BigInteger; @@ -63,8 +63,8 @@ public class PrivacyTest { .setEnabled(true) .setStorageProvider(createKeyValueStorageProvider(dataDir)) .build(); - final PantheonController pantheonController = - new PantheonController.Builder() + final BesuController besuController = + new BesuController.Builder() .fromGenesisConfig(GenesisConfigFile.mainnet()) .synchronizerConfiguration(SynchronizerConfiguration.builder().build()) .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig()) @@ -81,7 +81,7 @@ public class PrivacyTest { final Address privacyContractAddress = Address.privacyPrecompiled(ADDRESS); final PrecompiledContract precompiledContract = - pantheonController + besuController .getProtocolSchedule() .getByBlockNumber(1) .getPrecompileContractRegistry() @@ -101,7 +101,7 @@ public class PrivacyTest { BACKGROUND_THREAD_COUNT, CACHE_CAPACITY), Arrays.asList(KeyValueSegmentIdentifier.values()))) - .withCommonConfiguration(new PantheonConfigurationImpl(dbAhead)) + .withCommonConfiguration(new BesuConfigurationImpl(dbAhead)) .withMetricsSystem(new NoOpMetricsSystem()) .build(); } diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/RunnerTest.java b/besu/src/test/java/org/hyperledger/besu/RunnerTest.java similarity index 83% rename from pantheon/src/test/java/tech/pegasys/pantheon/RunnerTest.java rename to besu/src/test/java/org/hyperledger/besu/RunnerTest.java index 211887d1a6..69fd957105 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/RunnerTest.java +++ b/besu/src/test/java/org/hyperledger/besu/RunnerTest.java @@ -10,48 +10,48 @@ * 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. */ -package tech.pegasys.pantheon; +package org.hyperledger.besu; import static java.util.Collections.emptySet; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.cli.config.EthNetworkConfig.DEV_NETWORK_ID; -import static tech.pegasys.pantheon.cli.config.NetworkName.DEV; -import static tech.pegasys.pantheon.controller.KeyPairUtil.loadKeyPair; +import static org.hyperledger.besu.cli.config.EthNetworkConfig.DEV_NETWORK_ID; +import static org.hyperledger.besu.cli.config.NetworkName.DEV; -import tech.pegasys.pantheon.cli.config.EthNetworkConfig; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.controller.MainnetPantheonControllerBuilder; -import tech.pegasys.pantheon.controller.PantheonController; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.api.graphql.GraphQLConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.core.BlockSyncTestUtils; -import tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider; -import tech.pegasys.pantheon.ethereum.core.MiningParametersTestBuilder; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.SyncMode; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.storage.StorageProvider; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueSegmentIdentifier; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder; -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.RocksDBKeyValueStorageFactory; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; -import tech.pegasys.pantheon.services.PantheonConfigurationImpl; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.cli.config.EthNetworkConfig; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.controller.BesuController; +import org.hyperledger.besu.controller.KeyPairUtil; +import org.hyperledger.besu.controller.MainnetBesuControllerBuilder; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.core.BlockSyncTestUtils; +import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider; +import org.hyperledger.besu.ethereum.core.MiningParametersTestBuilder; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.SyncMode; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.storage.StorageProvider; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder; +import org.hyperledger.besu.metrics.ObservableMetricsSystem; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBKeyValueStorageFactory; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; +import org.hyperledger.besu.services.BesuConfigurationImpl; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.net.InetAddress; @@ -122,15 +122,15 @@ public final class RunnerTest { final Path dataDirAhead = temp.newFolder().toPath(); final Path dbAhead = dataDirAhead.resolve("database"); final int blockCount = 500; - final KeyPair aheadDbNodeKeys = loadKeyPair(dbAhead); + final KeyPair aheadDbNodeKeys = KeyPairUtil.loadKeyPair(dbAhead); final SynchronizerConfiguration syncConfigAhead = SynchronizerConfiguration.builder().syncMode(SyncMode.FULL).build(); final ObservableMetricsSystem noOpMetricsSystem = new NoOpMetricsSystem(); final BigInteger networkId = BigInteger.valueOf(2929); // Setup state with block data - try (final PantheonController controller = - new MainnetPantheonControllerBuilder() + try (final BesuController controller = + new MainnetBesuControllerBuilder() .genesisConfigFile(GenesisConfigFile.mainnet()) .synchronizerConfiguration(syncConfigAhead) .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig()) @@ -148,8 +148,8 @@ public final class RunnerTest { } // Setup Runner with blocks - final PantheonController controllerAhead = - new MainnetPantheonControllerBuilder() + final BesuController controllerAhead = + new MainnetBesuControllerBuilder() .genesisConfigFile(GenesisConfigFile.mainnet()) .synchronizerConfiguration(syncConfigAhead) .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig()) @@ -181,7 +181,7 @@ public final class RunnerTest { Runner runnerBehind = null; final Runner runnerAhead = runnerBuilder - .pantheonController(controllerAhead) + .besuController(controllerAhead) .ethNetworkConfig(EthNetworkConfig.getNetworkConfig(DEV)) .jsonRpcConfiguration(aheadJsonRpcConfiguration) .graphQLConfiguration(aheadGraphQLConfiguration) @@ -206,8 +206,8 @@ public final class RunnerTest { final MetricsConfiguration behindMetricsConfiguration = metricsConfiguration(); // Setup runner with no block data - final PantheonController controllerBehind = - new MainnetPantheonControllerBuilder() + final BesuController controllerBehind = + new MainnetBesuControllerBuilder() .genesisConfigFile(GenesisConfigFile.mainnet()) .synchronizerConfiguration(syncConfigBehind) .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig()) @@ -227,7 +227,7 @@ public final class RunnerTest { EthNetworkConfig.jsonConfig(DEV), DEV_NETWORK_ID, Collections.singletonList(enode)); runnerBehind = runnerBuilder - .pantheonController(controllerBehind) + .besuController(controllerBehind) .ethNetworkConfig(behindEthNetworkConfiguration) .jsonRpcConfiguration(behindJsonRpcConfiguration) .graphQLConfiguration(behindGraphQLConfiguration) @@ -348,7 +348,7 @@ public final class RunnerTest { BACKGROUND_THREAD_COUNT, CACHE_CAPACITY), Arrays.asList(KeyValueSegmentIdentifier.values()))) - .withCommonConfiguration(new PantheonConfigurationImpl(dbAhead)) + .withCommonConfiguration(new BesuConfigurationImpl(dbAhead)) .withMetricsSystem(new NoOpMetricsSystem()) .build(); } diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/chainexport/RlpBlockExporterTest.java b/besu/src/test/java/org/hyperledger/besu/chainexport/RlpBlockExporterTest.java similarity index 84% rename from pantheon/src/test/java/tech/pegasys/pantheon/chainexport/RlpBlockExporterTest.java rename to besu/src/test/java/org/hyperledger/besu/chainexport/RlpBlockExporterTest.java index da226eeb86..a4b0817b19 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/chainexport/RlpBlockExporterTest.java +++ b/besu/src/test/java/org/hyperledger/besu/chainexport/RlpBlockExporterTest.java @@ -10,31 +10,31 @@ * 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. */ -package tech.pegasys.pantheon.chainexport; +package org.hyperledger.besu.chainexport; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.chainimport.RlpBlockImporter; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.controller.PantheonController; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider; -import tech.pegasys.pantheon.ethereum.core.MiningParametersTestBuilder; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.util.RawBlockIterator; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.testutil.BlockTestUtil; -import tech.pegasys.pantheon.testutil.TestClock; +import org.hyperledger.besu.chainimport.RlpBlockImporter; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.controller.BesuController; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider; +import org.hyperledger.besu.ethereum.core.MiningParametersTestBuilder; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.util.RawBlockIterator; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.testutil.BlockTestUtil; +import org.hyperledger.besu.testutil.TestClock; import java.io.File; import java.io.IOException; @@ -57,7 +57,7 @@ public final class RlpBlockExporterTest { @BeforeClass public static void setupBlockchain() throws IOException { - final PantheonController controller = createController(); + final BesuController controller = createController(); final Path blocks = folder.newFile("1000.blocks").toPath(); BlockTestUtil.write1000Blocks(blocks); blockchain = importBlocks(controller, blocks); @@ -65,17 +65,17 @@ public final class RlpBlockExporterTest { protocolSchedule = controller.getProtocolSchedule(); } - private static Blockchain importBlocks( - final PantheonController controller, final Path blocksFile) throws IOException { + private static Blockchain importBlocks(final BesuController controller, final Path blocksFile) + throws IOException { final RlpBlockImporter blockImporter = new RlpBlockImporter(); blockImporter.importBlockchain(blocksFile, controller); return controller.getProtocolContext().getBlockchain(); } - private static PantheonController createController() throws IOException { + private static BesuController createController() throws IOException { final Path dataDir = folder.newFolder().toPath(); - return new PantheonController.Builder() + return new BesuController.Builder() .fromGenesisConfig(GenesisConfigFile.mainnet()) .synchronizerConfiguration(SynchronizerConfiguration.builder().build()) .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig()) diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/chainimport/JsonBlockImporterTest.java b/besu/src/test/java/org/hyperledger/besu/chainimport/JsonBlockImporterTest.java similarity index 90% rename from pantheon/src/test/java/tech/pegasys/pantheon/chainimport/JsonBlockImporterTest.java rename to besu/src/test/java/org/hyperledger/besu/chainimport/JsonBlockImporterTest.java index ff286a749e..1108634ba5 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/chainimport/JsonBlockImporterTest.java +++ b/besu/src/test/java/org/hyperledger/besu/chainimport/JsonBlockImporterTest.java @@ -10,32 +10,32 @@ * 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. */ -package tech.pegasys.pantheon.chainimport; +package org.hyperledger.besu.chainimport; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.config.JsonUtil; -import tech.pegasys.pantheon.controller.PantheonController; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider; -import tech.pegasys.pantheon.ethereum.core.MiningParametersTestBuilder; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.config.JsonUtil; +import org.hyperledger.besu.controller.BesuController; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider; +import org.hyperledger.besu.ethereum.core.MiningParametersTestBuilder; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.math.BigInteger; @@ -77,7 +77,7 @@ public abstract class JsonBlockImporterTest { @Test public void importChain_unsupportedConsensusAlgorithm() throws IOException { - final PantheonController controller = createController(); + final BesuController controller = createController(); final JsonBlockImporter importer = new JsonBlockImporter<>(controller); final String jsonData = getFileContents("clique", "blocks-import-valid.json"); @@ -105,7 +105,7 @@ public abstract class JsonBlockImporterTest { @Test public void importChain_validJson_withBlockNumbers() throws IOException { - final PantheonController controller = createController(); + final BesuController controller = createController(); final JsonBlockImporter importer = new JsonBlockImporter<>(controller); final String jsonData = getFileContents("blocks-import-valid.json"); @@ -196,7 +196,7 @@ public abstract class JsonBlockImporterTest { @Test public void importChain_validJson_noBlockIdentifiers() throws IOException { - final PantheonController controller = createController(); + final BesuController controller = createController(); final JsonBlockImporter importer = new JsonBlockImporter<>(controller); final String jsonData = getFileContents("blocks-import-valid-no-block-identifiers.json"); @@ -287,7 +287,7 @@ public abstract class JsonBlockImporterTest { @Test public void importChain_validJson_withParentHashes() throws IOException { - final PantheonController controller = createController(); + final BesuController controller = createController(); final JsonBlockImporter importer = new JsonBlockImporter<>(controller); String jsonData = getFileContents("blocks-import-valid.json"); @@ -338,7 +338,7 @@ public abstract class JsonBlockImporterTest { @Test public void importChain_invalidParent() throws IOException { - final PantheonController controller = createController(); + final BesuController controller = createController(); final JsonBlockImporter importer = new JsonBlockImporter<>(controller); final String jsonData = getFileContents("blocks-import-invalid-bad-parent.json"); @@ -350,7 +350,7 @@ public abstract class JsonBlockImporterTest { @Test public void importChain_invalidTransaction() throws IOException { - final PantheonController controller = createController(); + final BesuController controller = createController(); final JsonBlockImporter importer = new JsonBlockImporter<>(controller); final String jsonData = getFileContents("blocks-import-invalid-bad-tx.json"); @@ -363,7 +363,7 @@ public abstract class JsonBlockImporterTest { @Test public void importChain_specialFields() throws IOException { - final PantheonController controller = createController(); + final BesuController controller = createController(); final JsonBlockImporter importer = new JsonBlockImporter<>(controller); final String jsonData = getFileContents("blocks-import-special-fields.json"); @@ -401,14 +401,14 @@ public abstract class JsonBlockImporterTest { return Resources.toString(fileURL, UTF_8); } - protected PantheonController createController() throws IOException { + protected BesuController createController() throws IOException { return createController(genesisConfigFile); } - protected PantheonController createController(final GenesisConfigFile genesisConfigFile) + protected BesuController createController(final GenesisConfigFile genesisConfigFile) throws IOException { final Path dataDir = folder.newFolder().toPath(); - return new PantheonController.Builder() + return new BesuController.Builder() .fromGenesisConfig(genesisConfigFile) .synchronizerConfiguration(SynchronizerConfiguration.builder().build()) .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig()) diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/chainimport/RlpBlockImporterTest.java b/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java similarity index 79% rename from pantheon/src/test/java/tech/pegasys/pantheon/chainimport/RlpBlockImporterTest.java rename to besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java index 9c4f31dc4a..8d1faa5cd2 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/chainimport/RlpBlockImporterTest.java +++ b/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.chainimport; +package org.hyperledger.besu.chainimport; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.controller.PantheonController; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider; -import tech.pegasys.pantheon.ethereum.core.MiningParametersTestBuilder; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.testutil.BlockTestUtil; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.controller.BesuController; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider; +import org.hyperledger.besu.ethereum.core.MiningParametersTestBuilder; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.testutil.BlockTestUtil; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.uint.UInt256; import java.io.IOException; import java.math.BigInteger; @@ -52,8 +52,8 @@ public final class RlpBlockImporterTest { final Path dataDir = folder.newFolder().toPath(); final Path source = dataDir.resolve("1000.blocks"); BlockTestUtil.write1000Blocks(source); - final PantheonController targetController = - new PantheonController.Builder() + final BesuController targetController = + new BesuController.Builder() .fromGenesisConfig(GenesisConfigFile.mainnet()) .synchronizerConfiguration(SynchronizerConfiguration.builder().build()) .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig()) @@ -91,8 +91,8 @@ public final class RlpBlockImporterTest { throw new IllegalStateException(ex); } - final PantheonController controller = - new PantheonController.Builder() + final BesuController controller = + new BesuController.Builder() .fromGenesisConfig(GenesisConfigFile.fromConfig(config)) .synchronizerConfiguration(SynchronizerConfiguration.builder().build()) .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig()) diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java similarity index 94% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java index 6516f554ca..e2b0a2ecec 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java @@ -10,11 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.cli; +package org.hyperledger.besu.cli; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.cli.config.NetworkName.DEV; +import static org.hyperledger.besu.cli.config.NetworkName.GOERLI; +import static org.hyperledger.besu.cli.config.NetworkName.MAINNET; +import static org.hyperledger.besu.cli.config.NetworkName.RINKEBY; +import static org.hyperledger.besu.cli.config.NetworkName.ROPSTEN; +import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.ETH; +import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.NET; +import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.PERM; +import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.WEB3; +import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.MAINNET_BOOTSTRAP_NODES; import static org.junit.Assume.assumeFalse; import static org.junit.Assume.assumeTrue; import static org.mockito.ArgumentMatchers.any; @@ -22,43 +32,32 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNotNull; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.cli.config.NetworkName.DEV; -import static tech.pegasys.pantheon.cli.config.NetworkName.GOERLI; -import static tech.pegasys.pantheon.cli.config.NetworkName.MAINNET; -import static tech.pegasys.pantheon.cli.config.NetworkName.RINKEBY; -import static tech.pegasys.pantheon.cli.config.NetworkName.ROPSTEN; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApis.ETH; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApis.NET; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApis.PERM; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApis.WEB3; -import static tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration.MAINNET_BOOTSTRAP_NODES; - -import tech.pegasys.pantheon.PantheonInfo; -import tech.pegasys.pantheon.cli.config.EthNetworkConfig; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.ethereum.api.graphql.GraphQLConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApi; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.sync.SyncMode; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.permissioning.LocalPermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.SmartContractPermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.worldstate.PruningConfiguration; -import tech.pegasys.pantheon.metrics.StandardMetricCategory; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; -import tech.pegasys.pantheon.nat.NatMethod; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.number.Fraction; -import tech.pegasys.pantheon.util.number.Percentage; + +import org.hyperledger.besu.BesuInfo; +import org.hyperledger.besu.cli.config.EthNetworkConfig; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.sync.SyncMode; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration; +import org.hyperledger.besu.ethereum.worldstate.PruningConfiguration; +import org.hyperledger.besu.metrics.StandardMetricCategory; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.nat.NatMethod; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.number.Fraction; +import org.hyperledger.besu.util.number.Percentage; import java.io.File; import java.io.IOException; @@ -86,9 +85,10 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.mockito.ArgumentCaptor; +import org.mockito.Mockito; import picocli.CommandLine; -public class PantheonCommandTest extends CommandTestAbstract { +public class BesuCommandTest extends CommandTestAbstract { private static final String ENCLAVE_URI = "http://1.2.3.4:5555"; private static final String ENCLAVE_PUBLIC_KEY = "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo="; @@ -122,7 +122,7 @@ public class PantheonCommandTest extends CommandTestAbstract { @Test public void callingHelpSubCommandMustDisplayUsage() { parseCommand("--help"); - final String expectedOutputStart = String.format("Usage:%n%npantheon [OPTIONS] [COMMAND]"); + final String expectedOutputStart = String.format("Usage:%n%nbesu [OPTIONS] [COMMAND]"); assertThat(commandOutput.toString()).startsWith(expectedOutputStart); assertThat(commandErrorOutput.toString()).isEmpty(); } @@ -135,15 +135,15 @@ public class PantheonCommandTest extends CommandTestAbstract { } @Test - public void callingVersionDisplayPantheonInfoVersion() { + public void callingVersionDisplayBesuInfoVersion() { parseCommand("--version"); - assertThat(commandOutput.toString()).isEqualToIgnoringWhitespace(PantheonInfo.version()); + assertThat(commandOutput.toString()).isEqualToIgnoringWhitespace(BesuInfo.version()); assertThat(commandErrorOutput.toString()).isEmpty(); } // Testing default values @Test - public void callingPantheonCommandWithoutOptionsMustSyncWithDefaultValues() throws Exception { + public void callingBesuCommandWithoutOptionsMustSyncWithDefaultValues() throws Exception { parseCommand(); final ArgumentCaptor ethNetworkArg = @@ -280,7 +280,7 @@ public class PantheonCommandTest extends CommandTestAbstract { final Path genesisFile = createFakeGenesisFile(GENESIS_VALID_JSON); final String updatedConfig = Resources.toString(configFile, UTF_8) - .replace("/opt/pantheon/genesis.json", escapeTomlString(genesisFile.toString())); + .replace("/opt/besu/genesis.json", escapeTomlString(genesisFile.toString())); final Path toml = createTempFile("toml", updatedConfig.getBytes(UTF_8)); final List expectedApis = asList(ETH, WEB3); @@ -332,7 +332,7 @@ public class PantheonCommandTest extends CommandTestAbstract { .setGenesisConfig(encodeJsonGenesis(GENESIS_VALID_JSON)) .setBootNodes(nodes) .build(); - verify(mockControllerBuilder).dataDirectory(eq(Paths.get("/opt/pantheon").toAbsolutePath())); + verify(mockControllerBuilder).dataDirectory(eq(Paths.get("/opt/besu").toAbsolutePath())); verify(mockControllerBuilderFactory).fromEthNetworkConfig(eq(networkConfig), any()); verify(mockControllerBuilder).synchronizerConfiguration(syncConfigurationCaptor.capture()); @@ -347,7 +347,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void nodePermissionsSmartContractWithoutOptionMustError() { parseCommand("--permissions-nodes-contract-address"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandErrorOutput.toString()) .startsWith("Missing required parameter for option '--permissions-nodes-contract-address'"); @@ -358,7 +358,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void nodePermissionsEnabledWithoutContractAddressMustError() { parseCommand("--permissions-nodes-contract-enabled"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandErrorOutput.toString()) .contains("No node permissioning contract address specified"); @@ -372,7 +372,7 @@ public class PantheonCommandTest extends CommandTestAbstract { "--permissions-nodes-contract-address", "invalid-smart-contract-address"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandErrorOutput.toString()).contains("Invalid value"); assertThat(commandOutput.toString()).isEmpty(); @@ -383,7 +383,7 @@ public class PantheonCommandTest extends CommandTestAbstract { parseCommand( "--permissions-nodes-contract-enabled", "--permissions-nodes-contract-address", "0x1234"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandErrorOutput.toString()).contains("Invalid value"); assertThat(commandOutput.toString()).isEmpty(); @@ -420,7 +420,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void accountPermissionsSmartContractWithoutOptionMustError() { parseCommand("--permissions-accounts-contract-address"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandErrorOutput.toString()) .startsWith( @@ -432,7 +432,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void accountPermissionsEnabledWithoutContractAddressMustError() { parseCommand("--permissions-accounts-contract-enabled"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandErrorOutput.toString()) .contains("No account permissioning contract address specified"); @@ -446,7 +446,7 @@ public class PantheonCommandTest extends CommandTestAbstract { "--permissions-accounts-contract-address", "invalid-smart-contract-address"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandErrorOutput.toString()).contains("Invalid value"); assertThat(commandOutput.toString()).isEmpty(); @@ -459,7 +459,7 @@ public class PantheonCommandTest extends CommandTestAbstract { "--permissions-accounts-contract-address", "0x1234"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandErrorOutput.toString()).contains("Invalid value"); assertThat(commandOutput.toString()).isEmpty(); @@ -499,7 +499,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void nodePermissioningTomlPathWithoutOptionMustDisplayUsage() { parseCommand("--permissions-nodes-config-file"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandErrorOutput.toString()) .startsWith("Missing required parameter for option '--permissions-nodes-config-file'"); @@ -510,7 +510,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void accountPermissioningTomlPathWithoutOptionMustDisplayUsage() { parseCommand("--permissions-accounts-config-file"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandErrorOutput.toString()) .startsWith("Missing required parameter for option '--permissions-accounts-config-file'"); @@ -524,7 +524,7 @@ public class PantheonCommandTest extends CommandTestAbstract { "--permissions-nodes-config-file", "file-does-not-exist"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandErrorOutput.toString()).contains("Configuration file does not exist"); assertThat(commandOutput.toString()).isEmpty(); @@ -537,7 +537,7 @@ public class PantheonCommandTest extends CommandTestAbstract { "--permissions-accounts-config-file", "file-does-not-exist"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandErrorOutput.toString()).contains("Configuration file does not exist"); assertThat(commandOutput.toString()).isEmpty(); @@ -750,7 +750,7 @@ public class PantheonCommandTest extends CommandTestAbstract { final String configFile = this.getClass().getResource("/partial_config.toml").getFile(); final String expectedCoinbase = "0x0000000000000000000000000000000000000004"; - setEnvironemntVariable("PANTHEON_MINER_COINBASE", expectedCoinbase); + setEnvironemntVariable("BESU_MINER_COINBASE", expectedCoinbase); parseCommand("--config-file", configFile); verify(mockControllerBuilder) @@ -768,7 +768,7 @@ public class PantheonCommandTest extends CommandTestAbstract { final String configFile = this.getClass().getResource("/partial_config.toml").getFile(); final String expectedCoinbase = "0x0000000000000000000000000000000000000006"; - setEnvironemntVariable("PANTHEON_MINER_COINBASE", "0x0000000000000000000000000000000000000004"); + setEnvironemntVariable("BESU_MINER_COINBASE", "0x0000000000000000000000000000000000000004"); parseCommand("--config-file", configFile, "--miner-coinbase", expectedCoinbase); verify(mockControllerBuilder) @@ -782,7 +782,7 @@ public class PantheonCommandTest extends CommandTestAbstract { @Test public void configOptionDisabledUnderDocker() { - System.setProperty("pantheon.docker", "true"); + System.setProperty("besu.docker", "true"); assumeFalse(isFullInstantiation()); @@ -811,7 +811,7 @@ public class PantheonCommandTest extends CommandTestAbstract { @Test public void nodekeyOptionDisabledUnderDocker() { - System.setProperty("pantheon.docker", "true"); + System.setProperty("besu.docker", "true"); assumeFalse(isFullInstantiation()); @@ -827,14 +827,14 @@ public class PantheonCommandTest extends CommandTestAbstract { @Test public void nodekeyDefaultedUnderDocker() throws Exception { - System.setProperty("pantheon.docker", "true"); + System.setProperty("besu.docker", "true"); assumeFalse(isFullInstantiation()); parseCommand(); verify(mockControllerBuilder).nodePrivateKeyFile(fileArgumentCaptor.capture()); - assertThat(fileArgumentCaptor.getValue()).isEqualTo(new File("/var/lib/pantheon/key")); + assertThat(fileArgumentCaptor.getValue()).isEqualTo(new File("/var/lib/besu/key")); } @Test @@ -858,7 +858,7 @@ public class PantheonCommandTest extends CommandTestAbstract { @Test public void dataDirDisabledUnderDocker() { - System.setProperty("pantheon.docker", "true"); + System.setProperty("besu.docker", "true"); assumeFalse(isFullInstantiation()); @@ -871,14 +871,14 @@ public class PantheonCommandTest extends CommandTestAbstract { @Test public void dataDirDefaultedUnderDocker() { - System.setProperty("pantheon.docker", "true"); + System.setProperty("besu.docker", "true"); assumeFalse(isFullInstantiation()); parseCommand(); verify(mockControllerBuilder).dataDirectory(pathArgumentCaptor.capture()); - assertThat(pathArgumentCaptor.getValue()).isEqualByComparingTo(Paths.get("/var/lib/pantheon")); + assertThat(pathArgumentCaptor.getValue()).isEqualByComparingTo(Paths.get("/var/lib/besu")); } @Test @@ -909,7 +909,7 @@ public class PantheonCommandTest extends CommandTestAbstract { parseCommand("--genesis-file", genesisFile.toString(), "--network", "rinkeby"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -979,7 +979,7 @@ public class PantheonCommandTest extends CommandTestAbstract { @Test public void genesisPathDisabledUnderDocker() { - System.setProperty("pantheon.docker", "true"); + System.setProperty("besu.docker", "true"); assumeFalse(isFullInstantiation()); @@ -1281,7 +1281,7 @@ public class PantheonCommandTest extends CommandTestAbstract { parseCommand( "--remote-connections-limit-enabled", "--remote-connections-max-percentage", "invalid"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) .contains( @@ -1294,7 +1294,7 @@ public class PantheonCommandTest extends CommandTestAbstract { parseCommand( "--remote-connections-limit-enabled", "--remote-connections-max-percentage", "150"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) .contains( @@ -1330,7 +1330,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void helpShouldDisplayFastSyncOptions() { parseCommand("--help"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).contains("--fast-sync-min-peers"); assertThat(commandErrorOutput.toString()).isEmpty(); @@ -1352,7 +1352,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void parsesInvalidFastSyncMinPeersOptionWrongFormatShouldFail() { parseCommand("--sync-mode", "FAST", "--fast-sync-min-peers", "ten"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) .contains("Invalid value for option '--fast-sync-min-peers': 'ten' is not an int"); @@ -1375,7 +1375,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void parsesInvalidNatMethodOptionsShouldFail() { parseCommand("--nat-method", "invalid"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) .contains( @@ -1386,7 +1386,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void helpShouldDisplayNatMethodInfo() { parseCommand("--help"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).contains("--nat-method"); assertThat(commandErrorOutput.toString()).isEmpty(); @@ -1521,7 +1521,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void rpcApisPropertyWithInvalidEntryMustDisplayError() { parseCommand("--rpc-http-api", "BOB"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); // PicoCLI uses longest option name for message when option has multiple names, so here plural. @@ -1706,7 +1706,7 @@ public class PantheonCommandTest extends CommandTestAbstract { final String[] origins = {"http://domain1.com", "none"}; parseCommand("--rpc-http-cors-origins", String.join(",", origins)); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -1718,7 +1718,7 @@ public class PantheonCommandTest extends CommandTestAbstract { final String[] origins = {"none", "http://domain1.com"}; parseCommand("--rpc-http-cors-origins", String.join(",", origins)); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -1729,7 +1729,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void rpcHttpCorsOriginsAllWithAnotherDomainMustFail() { parseCommand("--rpc-http-cors-origins=http://domain1.com,all"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -1740,7 +1740,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void rpcHttpCorsOriginsAllWithAnotherDomainMustFailAsFlags() { parseCommand("--rpc-http-cors-origins=http://domain1.com", "--rpc-http-cors-origins=all"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -1751,7 +1751,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void rpcHttpCorsOriginsWildcardWithAnotherDomainMustFail() { parseCommand("--rpc-http-cors-origins=http://domain1.com,*"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -1762,7 +1762,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void rpcHttpCorsOriginsWildcardWithAnotherDomainMustFailAsFlags() { parseCommand("--rpc-http-cors-origins=http://domain1.com", "--rpc-http-cors-origins=*"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -1774,7 +1774,7 @@ public class PantheonCommandTest extends CommandTestAbstract { final String[] origins = {"**"}; parseCommand("--rpc-http-cors-origins", String.join(",", origins)); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -1785,7 +1785,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void rpcHttpCorsOriginsEmtyValueFails() { parseCommand("--rpc-http-cors-origins="); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -1861,7 +1861,7 @@ public class PantheonCommandTest extends CommandTestAbstract { final String[] origins = {"friend", "*"}; parseCommand("--host-whitelist", String.join(",", origins)); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -1873,7 +1873,7 @@ public class PantheonCommandTest extends CommandTestAbstract { final String[] origins = {"*", "friend"}; parseCommand("--host-whitelist", String.join(",", origins)); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -1885,7 +1885,7 @@ public class PantheonCommandTest extends CommandTestAbstract { final String[] origins = {"friend", "all"}; parseCommand("--host-whitelist", String.join(",", origins)); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -1911,7 +1911,7 @@ public class PantheonCommandTest extends CommandTestAbstract { final String[] origins = {"http://domain1.com", "none"}; parseCommand("--host-whitelist", String.join(",", origins)); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -1923,7 +1923,7 @@ public class PantheonCommandTest extends CommandTestAbstract { final String[] origins = {"none", "http://domain1.com"}; parseCommand("--host-whitelist", String.join(",", origins)); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -1934,7 +1934,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void rpcHttpHostWhitelistEmptyValueFails() { parseCommand("--host-whitelist="); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -2217,14 +2217,13 @@ public class PantheonCommandTest extends CommandTestAbstract { @Test public void metricsPrometheusJobMustBeUsed() { - parseCommand( - "--metrics-push-enabled", "--metrics-push-prometheus-job", "pantheon-command-test"); + parseCommand("--metrics-push-enabled", "--metrics-push-prometheus-job", "besu-command-test"); verify(mockRunnerBuilder).metricsConfiguration(metricsConfigArgumentCaptor.capture()); verify(mockRunnerBuilder).build(); assertThat(metricsConfigArgumentCaptor.getValue().getPrometheusJob()) - .isEqualTo("pantheon-command-test"); + .isEqualTo("besu-command-test"); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()).isEmpty(); @@ -2236,7 +2235,7 @@ public class PantheonCommandTest extends CommandTestAbstract { parseCommand("--metrics-enabled", "--metrics-push-enabled"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -2244,10 +2243,10 @@ public class PantheonCommandTest extends CommandTestAbstract { } @Test - public void pantheonDoesNotStartInMiningModeIfCoinbaseNotSet() { + public void besuDoesNotStartInMiningModeIfCoinbaseNotSet() { parseCommand("--miner-enabled"); - verifyZeroInteractions(mockControllerBuilder); + Mockito.verifyZeroInteractions(mockControllerBuilder); } @Test @@ -2462,11 +2461,11 @@ public class PantheonCommandTest extends CommandTestAbstract { @Test public void fullCLIOptionsNotShownWhenInDockerContainer() { - System.setProperty("pantheon.docker", "true"); + System.setProperty("besu.docker", "true"); parseCommand("--help"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).doesNotContain("--config-file"); assertThat(commandOutput.toString()).doesNotContain("--data-path"); @@ -2478,7 +2477,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void fullCLIOptionsShownWhenNotInDockerContainer() { parseCommand("--help"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).contains("--config-file"); assertThat(commandOutput.toString()).contains("--data-path"); @@ -2578,7 +2577,7 @@ public class PantheonCommandTest extends CommandTestAbstract { } private boolean isFullInstantiation() { - return !Boolean.getBoolean("pantheon.docker"); + return !Boolean.getBoolean("besu.docker"); } private static String escapeTomlString(final String s) { @@ -2613,7 +2612,7 @@ public class PantheonCommandTest extends CommandTestAbstract { @Test public void privacyPublicKeyFileOptionDisabledUnderDocker() { - System.setProperty("pantheon.docker", "true"); + System.setProperty("besu.docker", "true"); assumeFalse(isFullInstantiation()); @@ -2626,7 +2625,7 @@ public class PantheonCommandTest extends CommandTestAbstract { @Test public void rpcHttpAuthCredentialsFileOptionDisabledUnderDocker() { - System.setProperty("pantheon.docker", "true"); + System.setProperty("besu.docker", "true"); assumeFalse(isFullInstantiation()); @@ -2639,7 +2638,7 @@ public class PantheonCommandTest extends CommandTestAbstract { @Test public void rpcWsAuthCredentialsFileOptionDisabledUnderDocker() { - System.setProperty("pantheon.docker", "true"); + System.setProperty("besu.docker", "true"); assumeFalse(isFullInstantiation()); @@ -2652,7 +2651,7 @@ public class PantheonCommandTest extends CommandTestAbstract { @Test public void permissionsConfigFileOptionDisabledUnderDocker() { - System.setProperty("pantheon.docker", "true"); + System.setProperty("besu.docker", "true"); assumeFalse(isFullInstantiation()); @@ -2720,7 +2719,7 @@ public class PantheonCommandTest extends CommandTestAbstract { public void txMessageKeepAliveSecondsWithInvalidInputShouldFail() { parseCommand("--Xincoming-tx-messages-keep-alive-seconds", "acbd"); - verifyZeroInteractions(mockRunnerBuilder); + Mockito.verifyZeroInteractions(mockRunnerBuilder); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()) @@ -2737,7 +2736,7 @@ public class PantheonCommandTest extends CommandTestAbstract { final Path genesisFile = createFakeGenesisFile(GENESIS_VALID_JSON); final String updatedConfig = Resources.toString(configFile, UTF_8) - .replace("/opt/pantheon/genesis.json", escapeTomlString(genesisFile.toString())) + .replace("/opt/besu/genesis.json", escapeTomlString(genesisFile.toString())) .replace("rpc-http-api", "rpc-http-apis") + System.lineSeparator() + "invalid_option=true" diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/CommandLineUtilsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/CommandLineUtilsTest.java similarity index 97% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/CommandLineUtilsTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/CommandLineUtilsTest.java index 54e1c850c5..d6c5a9be51 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/CommandLineUtilsTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/CommandLineUtilsTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.cli; +package org.hyperledger.besu.cli; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static picocli.CommandLine.defaultExceptionHandler; -import tech.pegasys.pantheon.cli.util.CommandLineUtils; +import org.hyperledger.besu.cli.util.CommandLineUtils; import java.util.ArrayList; import java.util.Arrays; @@ -48,7 +48,7 @@ public class CommandLineUtilsTest { commandLine = new CommandLine(this); } - // Completely disables p2p within Pantheon. + // Completely disables p2p within Besu. @Option( names = {"--option-enabled"}, arity = "1") diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/CommandTestAbstract.java b/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java similarity index 71% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/CommandTestAbstract.java rename to besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java index 7f4ded8266..8cd613425d 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/CommandTestAbstract.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli; +package org.hyperledger.besu.cli; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -21,41 +21,40 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.Runner; -import tech.pegasys.pantheon.RunnerBuilder; -import tech.pegasys.pantheon.chainexport.RlpBlockExporter; -import tech.pegasys.pantheon.chainimport.JsonBlockImporter; -import tech.pegasys.pantheon.chainimport.RlpBlockImporter; -import tech.pegasys.pantheon.cli.config.EthNetworkConfig; -import tech.pegasys.pantheon.cli.options.EthProtocolOptions; -import tech.pegasys.pantheon.cli.options.MetricsCLIOptions; -import tech.pegasys.pantheon.cli.options.NetworkingOptions; -import tech.pegasys.pantheon.cli.options.SynchronizerOptions; -import tech.pegasys.pantheon.cli.options.TransactionPoolOptions; -import tech.pegasys.pantheon.cli.subcommands.PublicKeySubCommand.KeyLoader; -import tech.pegasys.pantheon.cli.subcommands.blocks.BlocksSubCommand.JsonBlockImporterFactory; -import tech.pegasys.pantheon.cli.subcommands.blocks.BlocksSubCommand.RlpBlockExporterFactory; -import tech.pegasys.pantheon.controller.PantheonController; -import tech.pegasys.pantheon.controller.PantheonControllerBuilder; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.api.graphql.GraphQLConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.sync.BlockBroadcaster; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.storage.StorageProvider; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; -import tech.pegasys.pantheon.plugin.services.PantheonConfiguration; -import tech.pegasys.pantheon.plugin.services.PicoCLIOptions; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageFactory; -import tech.pegasys.pantheon.services.PantheonPluginContextImpl; -import tech.pegasys.pantheon.services.StorageServiceImpl; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.Runner; +import org.hyperledger.besu.RunnerBuilder; +import org.hyperledger.besu.chainexport.RlpBlockExporter; +import org.hyperledger.besu.chainimport.JsonBlockImporter; +import org.hyperledger.besu.chainimport.RlpBlockImporter; +import org.hyperledger.besu.cli.config.EthNetworkConfig; +import org.hyperledger.besu.cli.options.EthProtocolOptions; +import org.hyperledger.besu.cli.options.MetricsCLIOptions; +import org.hyperledger.besu.cli.options.NetworkingOptions; +import org.hyperledger.besu.cli.options.SynchronizerOptions; +import org.hyperledger.besu.cli.options.TransactionPoolOptions; +import org.hyperledger.besu.cli.subcommands.PublicKeySubCommand; +import org.hyperledger.besu.cli.subcommands.blocks.BlocksSubCommand; +import org.hyperledger.besu.controller.BesuController; +import org.hyperledger.besu.controller.BesuControllerBuilder; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.sync.BlockBroadcaster; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration; +import org.hyperledger.besu.ethereum.storage.StorageProvider; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.plugin.services.BesuConfiguration; +import org.hyperledger.besu.plugin.services.PicoCLIOptions; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageFactory; +import org.hyperledger.besu.services.BesuPluginContextImpl; +import org.hyperledger.besu.services.StorageServiceImpl; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.ByteArrayOutputStream; import java.io.File; @@ -99,25 +98,25 @@ public abstract class CommandTestAbstract { @Mock protected RunnerBuilder mockRunnerBuilder; @Mock protected Runner mockRunner; - @Mock protected PantheonController.Builder mockControllerBuilderFactory; + @Mock protected BesuController.Builder mockControllerBuilderFactory; - @Mock protected PantheonControllerBuilder mockControllerBuilder; + @Mock protected BesuControllerBuilder mockControllerBuilder; @Mock protected EthProtocolManager mockEthProtocolManager; @Mock protected ProtocolSchedule mockProtocolSchedule; @Mock protected ProtocolContext mockProtocolContext; @Mock protected BlockBroadcaster mockBlockBroadcaster; - @Mock protected PantheonController mockController; + @Mock protected BesuController mockController; @Mock protected RlpBlockExporter rlpBlockExporter; @Mock protected JsonBlockImporter jsonBlockImporter; @Mock protected RlpBlockImporter rlpBlockImporter; @Mock protected StorageServiceImpl storageService; - @Mock protected PantheonConfiguration commonPluginConfiguration; + @Mock protected BesuConfiguration commonPluginConfiguration; @Mock protected KeyValueStorageFactory rocksDBStorageFactory; @Mock protected KeyValueStorageFactory rocksDBSPrivacyStorageFactory; @Mock protected PicoCLIOptions cliOptions; @Mock protected Logger mockLogger; - @Mock protected PantheonPluginContextImpl mockPantheonPluginContext; + @Mock protected BesuPluginContextImpl mockBesuPluginContext; @Captor protected ArgumentCaptor> bytesValueCollectionCollector; @Captor protected ArgumentCaptor pathArgumentCaptor; @@ -143,13 +142,13 @@ public abstract class CommandTestAbstract { @Before @After public void resetSystemProps() { - System.setProperty("pantheon.docker", "false"); + System.setProperty("besu.docker", "false"); } @Before public void initMocks() throws Exception { - // doReturn used because of generic PantheonController + // doReturn used because of generic BesuController doReturn(mockControllerBuilder) .when(mockControllerBuilderFactory) .fromEthNetworkConfig(any(), any()); @@ -169,7 +168,7 @@ public abstract class CommandTestAbstract { when(mockControllerBuilder.pruningConfiguration(any())).thenReturn(mockControllerBuilder); when(mockControllerBuilder.genesisConfigOverrides(any())).thenReturn(mockControllerBuilder); - // doReturn used because of generic PantheonController + // doReturn used because of generic BesuController doReturn(mockController).when(mockControllerBuilder).build(); lenient().when(mockController.getProtocolManager()).thenReturn(mockEthProtocolManager); lenient().when(mockController.getProtocolSchedule()).thenReturn(mockProtocolSchedule); @@ -178,7 +177,7 @@ public abstract class CommandTestAbstract { when(mockEthProtocolManager.getBlockBroadcaster()).thenReturn(mockBlockBroadcaster); when(mockRunnerBuilder.vertx(any())).thenReturn(mockRunnerBuilder); - when(mockRunnerBuilder.pantheonController(any())).thenReturn(mockRunnerBuilder); + when(mockRunnerBuilder.besuController(any())).thenReturn(mockRunnerBuilder); when(mockRunnerBuilder.discovery(anyBoolean())).thenReturn(mockRunnerBuilder); when(mockRunnerBuilder.ethNetworkConfig(any())).thenReturn(mockRunnerBuilder); when(mockRunnerBuilder.networkingConfiguration(any())).thenReturn(mockRunnerBuilder); @@ -204,7 +203,7 @@ public abstract class CommandTestAbstract { when(storageService.getByName("rocksdb")).thenReturn(Optional.of(rocksDBStorageFactory)); - when(mockPantheonPluginContext.getService(PicoCLIOptions.class)) + when(mockBesuPluginContext.getService(PicoCLIOptions.class)) .thenReturn(Optional.of(cliOptions)); } @@ -225,31 +224,31 @@ public abstract class CommandTestAbstract { environment.put(name, value); } - protected TestPantheonCommand parseCommand(final String... args) { + protected TestBesuCommand parseCommand(final String... args) { return parseCommand(System.in, args); } - protected TestPantheonCommand parseCommand(final KeyLoader keyLoader, final String... args) { + protected TestBesuCommand parseCommand( + final PublicKeySubCommand.KeyLoader keyLoader, final String... args) { return parseCommand(keyLoader, System.in, args); } - protected TestPantheonCommand parseCommand(final InputStream in, final String... args) { + protected TestBesuCommand parseCommand(final InputStream in, final String... args) { return parseCommand(f -> KeyPair.generate(), in, args); } @SuppressWarnings("unchecked") - private JsonBlockImporter jsonBlockImporterFactory( - final PantheonController controller) { + private JsonBlockImporter jsonBlockImporterFactory(final BesuController controller) { return (JsonBlockImporter) jsonBlockImporter; } - private TestPantheonCommand parseCommand( - final KeyLoader keyLoader, final InputStream in, final String... args) { + private TestBesuCommand parseCommand( + final PublicKeySubCommand.KeyLoader keyLoader, final InputStream in, final String... args) { // turn off ansi usage globally in picocli System.setProperty("picocli.ansi", "false"); - final TestPantheonCommand pantheonCommand = - new TestPantheonCommand( + final TestBesuCommand besuCommand = + new TestBesuCommand( mockLogger, rlpBlockImporter, this::jsonBlockImporterFactory, @@ -257,41 +256,41 @@ public abstract class CommandTestAbstract { mockRunnerBuilder, mockControllerBuilderFactory, keyLoader, - mockPantheonPluginContext, + mockBesuPluginContext, environment, storageService); - pantheonCommand.setPantheonConfiguration(commonPluginConfiguration); + besuCommand.setBesuConfiguration(commonPluginConfiguration); // parse using Ansi.OFF to be able to assert on non formatted output results - pantheonCommand.parse( + besuCommand.parse( new RunLast().useOut(outPrintStream).useAnsi(Ansi.OFF), - pantheonCommand.exceptionHandler().useErr(errPrintStream).useAnsi(Ansi.OFF), + besuCommand.exceptionHandler().useErr(errPrintStream).useAnsi(Ansi.OFF), in, args); - return pantheonCommand; + return besuCommand; } @CommandLine.Command - public static class TestPantheonCommand extends PantheonCommand { + public static class TestBesuCommand extends BesuCommand { @CommandLine.Spec CommandLine.Model.CommandSpec spec; - private final KeyLoader keyLoader; + private final PublicKeySubCommand.KeyLoader keyLoader; @Override - protected KeyLoader getKeyLoader() { + protected PublicKeySubCommand.KeyLoader getKeyLoader() { return keyLoader; } - TestPantheonCommand( + TestBesuCommand( final Logger mockLogger, final RlpBlockImporter mockBlockImporter, - final JsonBlockImporterFactory jsonBlockImporterFactory, - final RlpBlockExporterFactory rlpBlockExporterFactory, + final BlocksSubCommand.JsonBlockImporterFactory jsonBlockImporterFactory, + final BlocksSubCommand.RlpBlockExporterFactory rlpBlockExporterFactory, final RunnerBuilder mockRunnerBuilder, - final PantheonController.Builder controllerBuilderFactory, - final KeyLoader keyLoader, - final PantheonPluginContextImpl pantheonPluginContext, + final BesuController.Builder controllerBuilderFactory, + final PublicKeySubCommand.KeyLoader keyLoader, + final BesuPluginContextImpl besuPluginContext, final Map environment, final StorageServiceImpl storageService) { super( @@ -301,7 +300,7 @@ public abstract class CommandTestAbstract { rlpBlockExporterFactory, mockRunnerBuilder, controllerBuilderFactory, - pantheonPluginContext, + besuPluginContext, environment, storageService); this.keyLoader = keyLoader; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/EnvironmentVariableDefaultProviderTest.java b/besu/src/test/java/org/hyperledger/besu/cli/EnvironmentVariableDefaultProviderTest.java similarity index 87% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/EnvironmentVariableDefaultProviderTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/EnvironmentVariableDefaultProviderTest.java index eed7137cd5..7c4d011936 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/EnvironmentVariableDefaultProviderTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/EnvironmentVariableDefaultProviderTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.cli; +package org.hyperledger.besu.cli; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.cli.util.EnvironmentVariableDefaultProvider; +import org.hyperledger.besu.cli.util.EnvironmentVariableDefaultProvider; import java.util.HashMap; import java.util.Map; @@ -36,20 +36,20 @@ public class EnvironmentVariableDefaultProviderTest { @Test public void shouldReturnValueWhenEnvironmentVariableIsSet() { - environment.put("PANTHEON_ENV_VAR_SET", "abc"); + environment.put("BESU_ENV_VAR_SET", "abc"); assertThat(provider.defaultValue(OptionSpec.builder("--env-var-set").build())).isEqualTo("abc"); } @Test public void shouldReturnValueWhenEnvironmentVariableIsSetForAlternateName() { - environment.put("PANTHEON_ENV_VAR_SET", "abc"); + environment.put("BESU_ENV_VAR_SET", "abc"); assertThat(provider.defaultValue(OptionSpec.builder("--env-var", "--env-var-set").build())) .isEqualTo("abc"); } @Test public void shouldNotReturnValueForShortOptions() { - environment.put("PANTHEON_H", "abc"); + environment.put("BESU_H", "abc"); assertThat(provider.defaultValue(OptionSpec.builder("-h").build())).isNull(); } } diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/PasswordSubCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/PasswordSubCommandTest.java similarity index 95% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/PasswordSubCommandTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/PasswordSubCommandTest.java index b4acac7bf2..7bfdeb72dc 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/PasswordSubCommandTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/PasswordSubCommandTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli; +package org.hyperledger.besu.cli; import static org.assertj.core.api.Assertions.assertThat; @@ -44,7 +44,7 @@ public class PasswordSubCommandTest extends CommandTestAbstract { assertThat(commandErrorOutput.toString()) .contains("Missing required option '--password='"); assertThat(commandErrorOutput.toString()) - .contains("Usage: pantheon password hash [-hV] --password="); + .contains("Usage: besu password hash [-hV] --password="); assertThat(commandErrorOutput.toString()) .contains("This command generates the hash of a given password"); } diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/PublicKeySubCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/PublicKeySubCommandTest.java similarity index 95% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/PublicKeySubCommandTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/PublicKeySubCommandTest.java index c8226ca4aa..c50b9e6a98 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/PublicKeySubCommandTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/PublicKeySubCommandTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.cli; +package org.hyperledger.besu.cli; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.contentOf; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Util; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Util; import java.io.File; @@ -26,7 +26,7 @@ import picocli.CommandLine.Model.CommandSpec; public class PublicKeySubCommandTest extends CommandTestAbstract { private static final String EXPECTED_PUBLIC_KEY_USAGE = - "Usage: pantheon public-key [-hV] [COMMAND]" + "Usage: besu public-key [-hV] [COMMAND]" + System.lineSeparator() + "This command provides node public key related actions." + System.lineSeparator() @@ -46,7 +46,7 @@ public class PublicKeySubCommandTest extends CommandTestAbstract { + System.lineSeparator(); private static final String EXPECTED_PUBLIC_KEY_EXPORT_USAGE = - "Usage: pantheon public-key export [-hV] [--to=]" + "Usage: besu public-key export [-hV] [--to=]" + System.lineSeparator() + "This command outputs the node public key. Default output is standard output." + System.lineSeparator() @@ -58,7 +58,7 @@ public class PublicKeySubCommandTest extends CommandTestAbstract { + System.lineSeparator(); private static final String EXPECTED_PUBLIC_KEY_EXPORT_ADDRESS_USAGE = - "Usage: pantheon public-key export-address [-hV] [--to=]" + "Usage: besu public-key export-address [-hV] [--to=]" + System.lineSeparator() + "This command outputs the node's public key address. Default output is standard" + System.lineSeparator() diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/TomlConfigFileDefaultProviderTest.java b/besu/src/test/java/org/hyperledger/besu/cli/TomlConfigFileDefaultProviderTest.java similarity index 98% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/TomlConfigFileDefaultProviderTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/TomlConfigFileDefaultProviderTest.java index aa08370788..55533611a8 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/TomlConfigFileDefaultProviderTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/TomlConfigFileDefaultProviderTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.cli; +package org.hyperledger.besu.cli; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.cli.util.TomlConfigFileDefaultProvider; -import tech.pegasys.pantheon.ethereum.core.Wei; +import org.hyperledger.besu.cli.util.TomlConfigFileDefaultProvider; +import org.hyperledger.besu.ethereum.core.Wei; import java.io.BufferedWriter; import java.io.File; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/converter/FractionConverterTest.java b/besu/src/test/java/org/hyperledger/besu/cli/converter/FractionConverterTest.java similarity index 92% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/converter/FractionConverterTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/converter/FractionConverterTest.java index da5171c953..a0307c1c6e 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/converter/FractionConverterTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/converter/FractionConverterTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.cli.converter; +package org.hyperledger.besu.cli.converter; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import tech.pegasys.pantheon.cli.converter.exception.FractionConversionException; +import org.hyperledger.besu.cli.converter.exception.FractionConversionException; import org.junit.Test; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/converter/PercentageConverterTest.java b/besu/src/test/java/org/hyperledger/besu/cli/converter/PercentageConverterTest.java similarity index 92% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/converter/PercentageConverterTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/converter/PercentageConverterTest.java index 4987988ac7..20664e7253 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/converter/PercentageConverterTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/converter/PercentageConverterTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.cli.converter; +package org.hyperledger.besu.cli.converter; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import tech.pegasys.pantheon.cli.converter.exception.PercentageConversionException; +import org.hyperledger.besu.cli.converter.exception.PercentageConversionException; import org.junit.Test; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/custom/RpcAuthFileValidatorTest.java b/besu/src/test/java/org/hyperledger/besu/cli/custom/RpcAuthFileValidatorTest.java similarity index 98% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/custom/RpcAuthFileValidatorTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/custom/RpcAuthFileValidatorTest.java index 70cbb767c9..2b6b0a4754 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/custom/RpcAuthFileValidatorTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/custom/RpcAuthFileValidatorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.custom; +package org.hyperledger.besu.cli.custom; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/operator/OperatorSubCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/operator/OperatorSubCommandTest.java similarity index 91% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/operator/OperatorSubCommandTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/operator/OperatorSubCommandTest.java index c23e4f481d..36c2504cb6 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/operator/OperatorSubCommandTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/operator/OperatorSubCommandTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.operator; +package org.hyperledger.besu.cli.operator; import static java.lang.String.format; import static java.lang.System.currentTimeMillis; @@ -22,11 +22,10 @@ import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.contentOf; -import static tech.pegasys.pantheon.cli.operator.OperatorSubCommandTest.Cmd.cmd; -import static tech.pegasys.pantheon.cli.subcommands.operator.OperatorSubCommand.COMMAND_NAME; -import static tech.pegasys.pantheon.cli.subcommands.operator.OperatorSubCommand.GENERATE_BLOCKCHAIN_CONFIG_SUBCOMMAND_NAME; +import static org.hyperledger.besu.cli.operator.OperatorSubCommandTest.Cmd.cmd; -import tech.pegasys.pantheon.cli.CommandTestAbstract; +import org.hyperledger.besu.cli.CommandTestAbstract; +import org.hyperledger.besu.cli.subcommands.operator.OperatorSubCommand; import java.io.File; import java.io.IOException; @@ -51,7 +50,7 @@ import picocli.CommandLine.Model.CommandSpec; public class OperatorSubCommandTest extends CommandTestAbstract { private static final String EXPECTED_OPERATOR_USAGE = - "Usage: pantheon operator [-hV] [COMMAND]" + "Usage: besu operator [-hV] [COMMAND]" + System.lineSeparator() + "This command provides operator related actions." + System.lineSeparator() @@ -75,23 +74,23 @@ public class OperatorSubCommandTest extends CommandTestAbstract { @Test public void operatorSubCommandExistAndHaveSubCommands() { final CommandSpec spec = parseCommand().getSpec(); - assertThat(spec.subcommands()).containsKeys(COMMAND_NAME); - assertThat(spec.subcommands().get(COMMAND_NAME).getSubcommands()) - .containsKeys(GENERATE_BLOCKCHAIN_CONFIG_SUBCOMMAND_NAME); + assertThat(spec.subcommands()).containsKeys(OperatorSubCommand.COMMAND_NAME); + assertThat(spec.subcommands().get(OperatorSubCommand.COMMAND_NAME).getSubcommands()) + .containsKeys(OperatorSubCommand.GENERATE_BLOCKCHAIN_CONFIG_SUBCOMMAND_NAME); assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()).isEmpty(); } @Test public void callingOperatorSubCommandWithoutSubSubcommandMustDisplayUsage() { - parseCommand(COMMAND_NAME); + parseCommand(OperatorSubCommand.COMMAND_NAME); assertThat(commandOutput.toString()).startsWith(EXPECTED_OPERATOR_USAGE); assertThat(commandErrorOutput.toString()).isEmpty(); } @Test public void callingOperatorCommandHelpMustDisplayUsage() { - parseCommand(COMMAND_NAME, "--help"); + parseCommand(OperatorSubCommand.COMMAND_NAME, "--help"); assertThat(commandOutput.toString()).startsWith(EXPECTED_OPERATOR_USAGE); assertThat(commandErrorOutput.toString()).isEmpty(); } @@ -205,8 +204,8 @@ public class OperatorSubCommandTest extends CommandTestAbstract { final URL configFilePath = this.getClass().getResource(configFile); parseCommand( cmd( - COMMAND_NAME, - GENERATE_BLOCKCHAIN_CONFIG_SUBCOMMAND_NAME, + OperatorSubCommand.COMMAND_NAME, + OperatorSubCommand.GENERATE_BLOCKCHAIN_CONFIG_SUBCOMMAND_NAME, "--config-file", configFilePath.getPath(), "--to", diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/options/AbstractCLIOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/AbstractCLIOptionsTest.java similarity index 86% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/options/AbstractCLIOptionsTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/options/AbstractCLIOptionsTest.java index 368026b147..69c1a1498a 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/options/AbstractCLIOptionsTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/options/AbstractCLIOptionsTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.cli.options; +package org.hyperledger.besu.cli.options; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.cli.CommandTestAbstract; +import org.hyperledger.besu.cli.CommandTestAbstract; import java.util.Collections; import java.util.List; @@ -56,8 +56,8 @@ public abstract class AbstractCLIOptionsTest> T options = optionsFromDomainObject(domainObject); final String[] cliOptions = options.getCLIOptions().toArray(new String[0]); - final TestPantheonCommand cmd = parseCommand(cliOptions); - final T optionsFromCommand = getOptionsFromPantheonCommand(cmd); + final TestBesuCommand cmd = parseCommand(cliOptions); + final T optionsFromCommand = getOptionsFromBesuCommand(cmd); assertThat(optionsFromCommand).isEqualToComparingFieldByField(options); @@ -67,11 +67,11 @@ public abstract class AbstractCLIOptionsTest> @Test public void defaultValues() { - final TestPantheonCommand cmd = parseCommand(); + final TestBesuCommand cmd = parseCommand(); final D defaultDomainObject = createDefaultDomainObject(); final T defaultOptions = optionsFromDomainObject(defaultDomainObject); - final T optionsFromCommand = getOptionsFromPantheonCommand(cmd); + final T optionsFromCommand = getOptionsFromBesuCommand(cmd); // Check default values supplied by CLI match expected default values final String[] fieldsToIgnore = getFieldsWithComputedDefaults().toArray(new String[0]); @@ -92,5 +92,5 @@ public abstract class AbstractCLIOptionsTest> abstract T optionsFromDomainObject(D domainObject); - abstract T getOptionsFromPantheonCommand(final TestPantheonCommand pantheonCommand); + abstract T getOptionsFromBesuCommand(final TestBesuCommand besuCommand); } diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/options/EthProtocolOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/EthProtocolOptionsTest.java similarity index 82% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/options/EthProtocolOptionsTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/options/EthProtocolOptionsTest.java index a49bc67d5b..36f6dd8916 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/options/EthProtocolOptionsTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/options/EthProtocolOptionsTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.cli.options; +package org.hyperledger.besu.cli.options; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verifyZeroInteractions; -import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration; -import tech.pegasys.pantheon.util.number.PositiveNumber; +import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; +import org.hyperledger.besu.util.number.PositiveNumber; import org.junit.Test; @@ -26,9 +26,9 @@ public class EthProtocolOptionsTest @Test public void parsesValidEwpMaxGetHeadersOptions() { - final TestPantheonCommand cmd = parseCommand("--Xewp-max-get-headers", "13"); + final TestBesuCommand cmd = parseCommand("--Xewp-max-get-headers", "13"); - final EthProtocolOptions options = getOptionsFromPantheonCommand(cmd); + final EthProtocolOptions options = getOptionsFromBesuCommand(cmd); final EthProtocolConfiguration config = options.toDomainObject(); assertThat(config.getMaxGetBlockHeaders()).isEqualTo(13); assertThat(commandOutput.toString()).isEmpty(); @@ -47,9 +47,9 @@ public class EthProtocolOptionsTest @Test public void parsesValidEwpMaxGetBodiesOptions() { - final TestPantheonCommand cmd = parseCommand("--Xewp-max-get-bodies", "14"); + final TestBesuCommand cmd = parseCommand("--Xewp-max-get-bodies", "14"); - final EthProtocolOptions options = getOptionsFromPantheonCommand(cmd); + final EthProtocolOptions options = getOptionsFromBesuCommand(cmd); final EthProtocolConfiguration config = options.toDomainObject(); assertThat(config.getMaxGetBlockBodies()).isEqualTo(14); @@ -69,9 +69,9 @@ public class EthProtocolOptionsTest @Test public void parsesValidEwpMaxGetReceiptsOptions() { - final TestPantheonCommand cmd = parseCommand("--Xewp-max-get-receipts", "15"); + final TestBesuCommand cmd = parseCommand("--Xewp-max-get-receipts", "15"); - final EthProtocolOptions options = getOptionsFromPantheonCommand(cmd); + final EthProtocolOptions options = getOptionsFromBesuCommand(cmd); final EthProtocolConfiguration config = options.toDomainObject(); assertThat(config.getMaxGetReceipts()).isEqualTo(15); @@ -92,9 +92,9 @@ public class EthProtocolOptionsTest @Test public void parsesValidEwpMaxGetNodeDataOptions() { - final TestPantheonCommand cmd = parseCommand("--Xewp-max-get-node-data", "16"); + final TestBesuCommand cmd = parseCommand("--Xewp-max-get-node-data", "16"); - final EthProtocolOptions options = getOptionsFromPantheonCommand(cmd); + final EthProtocolOptions options = getOptionsFromBesuCommand(cmd); final EthProtocolConfiguration config = options.toDomainObject(); assertThat(config.getMaxGetNodeData()).isEqualTo(16); @@ -137,7 +137,7 @@ public class EthProtocolOptionsTest } @Override - EthProtocolOptions getOptionsFromPantheonCommand(final TestPantheonCommand pantheonCommand) { - return pantheonCommand.getEthProtocolOptions(); + EthProtocolOptions getOptionsFromBesuCommand(final TestBesuCommand besuCommand) { + return besuCommand.getEthProtocolOptions(); } } diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/options/MetricsCLIOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/MetricsCLIOptionsTest.java similarity index 82% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/options/MetricsCLIOptionsTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/options/MetricsCLIOptionsTest.java index 4ac4f30442..89c609e280 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/options/MetricsCLIOptionsTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/options/MetricsCLIOptionsTest.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.cli.options; +package org.hyperledger.besu.cli.options; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; public class MetricsCLIOptionsTest extends AbstractCLIOptionsTest { @@ -34,7 +34,7 @@ public class MetricsCLIOptionsTest } @Override - MetricsCLIOptions getOptionsFromPantheonCommand(final TestPantheonCommand pantheonCommand) { - return pantheonCommand.getMetricsCLIOptions(); + MetricsCLIOptions getOptionsFromBesuCommand(final TestBesuCommand besuCommand) { + return besuCommand.getMetricsCLIOptions(); } } diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/options/NetworkingOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/NetworkingOptionsTest.java similarity index 84% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/options/NetworkingOptionsTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/options/NetworkingOptionsTest.java index 5a0208e437..3388de527a 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/options/NetworkingOptionsTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/options/NetworkingOptionsTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.cli.options; +package org.hyperledger.besu.cli.options; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.p2p.config.NetworkingConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; import org.junit.Test; @@ -23,8 +23,7 @@ public class NetworkingOptionsTest @Test public void checkMaintainedConnectionsFrequencyFlag_isSet() { - final TestPantheonCommand cmd = - parseCommand("--Xp2p-check-maintained-connections-frequency", "2"); + final TestBesuCommand cmd = parseCommand("--Xp2p-check-maintained-connections-frequency", "2"); final NetworkingOptions options = cmd.getNetworkingOptions(); final NetworkingConfiguration networkingConfig = options.toDomainObject(); @@ -36,7 +35,7 @@ public class NetworkingOptionsTest @Test public void checkMaintainedFrequencyConnectionsFlag_isNotSet() { - final TestPantheonCommand cmd = parseCommand(); + final TestBesuCommand cmd = parseCommand(); final NetworkingOptions options = cmd.getNetworkingOptions(); final NetworkingConfiguration networkingConfig = options.toDomainObject(); @@ -48,7 +47,7 @@ public class NetworkingOptionsTest @Test public void initiateConnectionsFrequencyFlag_isSet() { - final TestPantheonCommand cmd = parseCommand("--Xp2p-initiate-connections-frequency", "2"); + final TestBesuCommand cmd = parseCommand("--Xp2p-initiate-connections-frequency", "2"); final NetworkingOptions options = cmd.getNetworkingOptions(); final NetworkingConfiguration networkingConfig = options.toDomainObject(); @@ -60,7 +59,7 @@ public class NetworkingOptionsTest @Test public void initiateConnectionsFrequencyFlag_isNotSet() { - final TestPantheonCommand cmd = parseCommand(); + final TestBesuCommand cmd = parseCommand(); final NetworkingOptions options = cmd.getNetworkingOptions(); final NetworkingConfiguration networkingConfig = options.toDomainObject(); @@ -91,7 +90,7 @@ public class NetworkingOptionsTest } @Override - NetworkingOptions getOptionsFromPantheonCommand(final TestPantheonCommand pantheonCommand) { - return pantheonCommand.getNetworkingOptions(); + NetworkingOptions getOptionsFromBesuCommand(final TestBesuCommand besuCommand) { + return besuCommand.getNetworkingOptions(); } } diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/options/OptionParserTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/OptionParserTest.java similarity index 97% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/options/OptionParserTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/options/OptionParserTest.java index 210368c532..8e24036e9e 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/options/OptionParserTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/options/OptionParserTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.cli.options; +package org.hyperledger.besu.cli.options; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/options/SynchronizerOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/SynchronizerOptionsTest.java similarity index 93% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/options/SynchronizerOptionsTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/options/SynchronizerOptionsTest.java index 3a1e8c2f88..bd483a183c 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/options/SynchronizerOptionsTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/options/SynchronizerOptionsTest.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.cli.options; +package org.hyperledger.besu.cli.options; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; import java.util.Arrays; import java.util.List; @@ -67,8 +67,8 @@ public class SynchronizerOptionsTest } @Override - SynchronizerOptions getOptionsFromPantheonCommand(final TestPantheonCommand pantheonCommand) { - return pantheonCommand.getSynchronizerOptions(); + SynchronizerOptions getOptionsFromBesuCommand(final TestBesuCommand besuCommand) { + return besuCommand.getSynchronizerOptions(); } @Override diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/options/TransactionPoolOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/TransactionPoolOptionsTest.java similarity index 82% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/options/TransactionPoolOptionsTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/options/TransactionPoolOptionsTest.java index 426854dbf8..4681ae69e8 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/options/TransactionPoolOptionsTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/options/TransactionPoolOptionsTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.cli.options; +package org.hyperledger.besu.cli.options; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; import org.junit.Test; @@ -24,12 +24,12 @@ public class TransactionPoolOptionsTest @Test public void txMessageKeepAliveSeconds() { final int txMessageKeepAliveSeconds = 999; - final TestPantheonCommand cmd = + final TestBesuCommand cmd = parseCommand( "--Xincoming-tx-messages-keep-alive-seconds", String.valueOf(txMessageKeepAliveSeconds)); - final TransactionPoolOptions options = getOptionsFromPantheonCommand(cmd); + final TransactionPoolOptions options = getOptionsFromBesuCommand(cmd); final TransactionPoolConfiguration config = options.toDomainObject().build(); assertThat(config.getTxMessageKeepAliveSeconds()).isEqualTo(txMessageKeepAliveSeconds); @@ -55,7 +55,7 @@ public class TransactionPoolOptionsTest } @Override - TransactionPoolOptions getOptionsFromPantheonCommand(final TestPantheonCommand pantheonCommand) { - return pantheonCommand.getTransactionPoolOptions(); + TransactionPoolOptions getOptionsFromBesuCommand(final TestBesuCommand besuCommand) { + return besuCommand.getTransactionPoolOptions(); } } diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/rlp/RLPSubCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/rlp/RLPSubCommandTest.java similarity index 97% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/rlp/RLPSubCommandTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/rlp/RLPSubCommandTest.java index c5a5244fd2..b71cbb977b 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/rlp/RLPSubCommandTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/rlp/RLPSubCommandTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.cli.rlp; +package org.hyperledger.besu.cli.rlp; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.contentOf; -import tech.pegasys.pantheon.cli.CommandTestAbstract; +import org.hyperledger.besu.cli.CommandTestAbstract; import java.io.BufferedWriter; import java.io.ByteArrayInputStream; @@ -30,7 +30,7 @@ import picocli.CommandLine.Model.CommandSpec; public class RLPSubCommandTest extends CommandTestAbstract { private static final String EXPECTED_RLP_USAGE = - "Usage: pantheon rlp [-hV] [COMMAND]" + "Usage: besu rlp [-hV] [COMMAND]" + System.lineSeparator() + "This command provides RLP data related actions." + System.lineSeparator() @@ -43,7 +43,7 @@ public class RLPSubCommandTest extends CommandTestAbstract { + " encode This command encodes a JSON typed data into an RLP hex string."; private static final String EXPECTED_RLP_ENCODE_USAGE = - "Usage: pantheon rlp encode [-hV] [--from=] [--to=] [--type=]" + "Usage: besu rlp encode [-hV] [--from=] [--to=] [--type=]" + System.lineSeparator() + "This command encodes a JSON typed data into an RLP hex string." + System.lineSeparator() diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/subcommands/blocks/BlocksSubCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/subcommands/blocks/BlocksSubCommandTest.java similarity index 95% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/subcommands/blocks/BlocksSubCommandTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/subcommands/blocks/BlocksSubCommandTest.java index 7aabcb0a32..705b74739f 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/subcommands/blocks/BlocksSubCommandTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/subcommands/blocks/BlocksSubCommandTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.subcommands.blocks; +package org.hyperledger.besu.cli.subcommands.blocks; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; @@ -19,8 +19,8 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import tech.pegasys.pantheon.cli.CommandTestAbstract; -import tech.pegasys.pantheon.controller.PantheonController; +import org.hyperledger.besu.cli.CommandTestAbstract; +import org.hyperledger.besu.controller.BesuController; import java.io.File; import java.io.IOException; @@ -40,7 +40,7 @@ public class BlocksSubCommandTest extends CommandTestAbstract { @Rule public final TemporaryFolder folder = new TemporaryFolder(); private static final String EXPECTED_BLOCK_USAGE = - "Usage: pantheon blocks [-hV] [COMMAND]" + "Usage: besu blocks [-hV] [COMMAND]" + System.lineSeparator() + "This command provides blocks related actions." + System.lineSeparator() @@ -54,8 +54,8 @@ public class BlocksSubCommandTest extends CommandTestAbstract { + System.lineSeparator(); private static final String EXPECTED_BLOCK_IMPORT_USAGE = - "Usage: pantheon blocks import [-hV] --from=" - // "Usage: pantheon blocks import [-hV] [--format=] --from=" + "Usage: besu blocks import [-hV] --from=" + // "Usage: besu blocks import [-hV] [--format=] --from=" + System.lineSeparator() + "This command imports blocks from a file into the database." // Hide format for while JSON option is under development @@ -72,9 +72,9 @@ public class BlocksSubCommandTest extends CommandTestAbstract { + System.lineSeparator(); private static final String EXPECTED_BLOCK_EXPORT_USAGE = - "Usage: pantheon blocks export [-hV] [--end-block=] [--start-block=]" + "Usage: besu blocks export [-hV] [--end-block=] [--start-block=]" + System.lineSeparator() - + " --to=" + + " --to=" + System.lineSeparator() + "This command exports a specific block, or list of blocks from storage." + System.lineSeparator() @@ -224,7 +224,7 @@ public class BlocksSubCommandTest extends CommandTestAbstract { "Chain is empty. Unable to export blocks from specified data directory: " + folder.getRoot().getAbsolutePath() + File.separator - + PantheonController.DATABASE_PATH; + + BesuController.DATABASE_PATH; assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()).startsWith(expectedErrorOutputStart); @@ -245,7 +245,7 @@ public class BlocksSubCommandTest extends CommandTestAbstract { "Chain is empty. Unable to export blocks from specified data directory: " + folder.getRoot().getAbsolutePath() + File.separator - + PantheonController.DATABASE_PATH; + + BesuController.DATABASE_PATH; assertThat(commandOutput.toString()).isEmpty(); assertThat(commandErrorOutput.toString()).startsWith(expectedErrorOutputStart); @@ -402,7 +402,7 @@ public class BlocksSubCommandTest extends CommandTestAbstract { } private void createDbDirectory(final boolean createDataFiles) throws IOException { - File dbDir = folder.newFolder(PantheonController.DATABASE_PATH); + File dbDir = folder.newFolder(BesuController.DATABASE_PATH); if (createDataFiles) { Path dataFilePath = Paths.get(dbDir.getAbsolutePath(), "0000001.sst"); final boolean success = new File(dataFilePath.toString()).createNewFile(); diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/util/ConfigOptionSearchAndRunHandlerTest.java b/besu/src/test/java/org/hyperledger/besu/cli/util/ConfigOptionSearchAndRunHandlerTest.java similarity index 98% rename from pantheon/src/test/java/tech/pegasys/pantheon/cli/util/ConfigOptionSearchAndRunHandlerTest.java rename to besu/src/test/java/org/hyperledger/besu/cli/util/ConfigOptionSearchAndRunHandlerTest.java index 239ce81b68..c45bcc13a0 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/util/ConfigOptionSearchAndRunHandlerTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/util/ConfigOptionSearchAndRunHandlerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.cli.util; +package org.hyperledger.besu.cli.util; import static java.util.Collections.singletonMap; import static org.assertj.core.api.Assertions.assertThat; @@ -63,7 +63,7 @@ public class ConfigOptionSearchAndRunHandlerTest { new RunLast().useOut(outPrintStream).useAnsi(Ansi.OFF); private final DefaultExceptionHandler> exceptionHandler = new DefaultExceptionHandler>().useErr(errPrintStream).useAnsi(Ansi.OFF); - private final Map environment = singletonMap("PANTHEON_LOGGING", "ERROR"); + private final Map environment = singletonMap("BESU_LOGGING", "ERROR"); private final ConfigOptionSearchAndRunHandler configParsingHandler = new ConfigOptionSearchAndRunHandler( resultHandler, exceptionHandler, CONFIG_FILE_OPTION_NAME, environment, false); diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/plugins/TestPantheonEventsPlugin.java b/besu/src/test/java/org/hyperledger/besu/plugins/TestBesuEventsPlugin.java similarity index 75% rename from pantheon/src/test/java/tech/pegasys/pantheon/plugins/TestPantheonEventsPlugin.java rename to besu/src/test/java/org/hyperledger/besu/plugins/TestBesuEventsPlugin.java index 9aee3803e2..ac0fd2a5e1 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/plugins/TestPantheonEventsPlugin.java +++ b/besu/src/test/java/org/hyperledger/besu/plugins/TestBesuEventsPlugin.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.plugins; +package org.hyperledger.besu.plugins; -import tech.pegasys.pantheon.plugin.PantheonContext; -import tech.pegasys.pantheon.plugin.PantheonPlugin; -import tech.pegasys.pantheon.plugin.data.BlockHeader; -import tech.pegasys.pantheon.plugin.services.PantheonEvents; +import org.hyperledger.besu.plugin.BesuContext; +import org.hyperledger.besu.plugin.BesuPlugin; +import org.hyperledger.besu.plugin.data.BlockHeader; +import org.hyperledger.besu.plugin.services.BesuEvents; import java.io.File; import java.io.IOException; @@ -28,28 +28,28 @@ import com.google.auto.service.AutoService; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@AutoService(PantheonPlugin.class) -public class TestPantheonEventsPlugin implements PantheonPlugin { +@AutoService(BesuPlugin.class) +public class TestBesuEventsPlugin implements BesuPlugin { private static final Logger LOG = LogManager.getLogger(); - private PantheonContext context; + private BesuContext context; private Optional subscriptionId; private final AtomicInteger blockCounter = new AtomicInteger(); private File callbackDir; @Override - public void register(final PantheonContext context) { + public void register(final BesuContext context) { this.context = context; LOG.info("Registered"); - callbackDir = new File(System.getProperty("pantheon.plugins.dir", "plugins")); + callbackDir = new File(System.getProperty("besu.plugins.dir", "plugins")); } @Override public void start() { subscriptionId = context - .getService(PantheonEvents.class) + .getService(BesuEvents.class) .map(events -> events.addBlockPropagatedListener(this::onBlockAnnounce)); LOG.info("Listening with ID#" + subscriptionId); } @@ -59,8 +59,8 @@ public class TestPantheonEventsPlugin implements PantheonPlugin { subscriptionId.ifPresent( id -> context - .getService(PantheonEvents.class) - .ifPresent(pantheonEvents -> pantheonEvents.removeBlockPropagatedListener(id))); + .getService(BesuEvents.class) + .ifPresent(besuEvents -> besuEvents.removeBlockPropagatedListener(id))); LOG.info("No longer listening with ID#" + subscriptionId); } diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/plugins/TestPicoCLIPlugin.java b/besu/src/test/java/org/hyperledger/besu/plugins/TestPicoCLIPlugin.java similarity index 87% rename from pantheon/src/test/java/tech/pegasys/pantheon/plugins/TestPicoCLIPlugin.java rename to besu/src/test/java/org/hyperledger/besu/plugins/TestPicoCLIPlugin.java index 0cf006dee1..5a0b00a462 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/plugins/TestPicoCLIPlugin.java +++ b/besu/src/test/java/org/hyperledger/besu/plugins/TestPicoCLIPlugin.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.plugins; +package org.hyperledger.besu.plugins; -import tech.pegasys.pantheon.plugin.PantheonContext; -import tech.pegasys.pantheon.plugin.PantheonPlugin; -import tech.pegasys.pantheon.plugin.services.PicoCLIOptions; +import org.hyperledger.besu.plugin.BesuContext; +import org.hyperledger.besu.plugin.BesuPlugin; +import org.hyperledger.besu.plugin.services.PicoCLIOptions; import java.io.File; import java.io.IOException; @@ -26,8 +26,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import picocli.CommandLine.Option; -@AutoService(PantheonPlugin.class) -public class TestPicoCLIPlugin implements PantheonPlugin { +@AutoService(BesuPlugin.class) +public class TestPicoCLIPlugin implements BesuPlugin { private static final Logger LOG = LogManager.getLogger(); @Option(names = "--Xtest-option", hidden = true, defaultValue = "UNSET") @@ -37,7 +37,7 @@ public class TestPicoCLIPlugin implements PantheonPlugin { private File callbackDir; @Override - public void register(final PantheonContext context) { + public void register(final BesuContext context) { LOG.info("Registering. Test Option is '{}'", testOption); state = "registering"; @@ -52,7 +52,7 @@ public class TestPicoCLIPlugin implements PantheonPlugin { picoCLIOptions -> picoCLIOptions.addPicoCLIOptions("Test PicoCLI Plugin", TestPicoCLIPlugin.this)); - callbackDir = new File(System.getProperty("pantheon.plugins.dir", "plugins")); + callbackDir = new File(System.getProperty("besu.plugins.dir", "plugins")); writeSignal("registered"); state = "registered"; } diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/services/PantheonEventsImplTest.java b/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java similarity index 76% rename from pantheon/src/test/java/tech/pegasys/pantheon/services/PantheonEventsImplTest.java rename to besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java index 194984e79c..05feffd91f 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/services/PantheonEventsImplTest.java +++ b/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java @@ -10,42 +10,42 @@ * 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. */ -package tech.pegasys.pantheon.services; +package org.hyperledger.besu.services; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.TransactionTestFixture; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthMessages; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.ethereum.eth.sync.BlockBroadcaster; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolFactory; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.data.BlockHeader; -import tech.pegasys.pantheon.plugin.data.SyncStatus; -import tech.pegasys.pantheon.plugin.data.Transaction; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.TransactionTestFixture; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthMessages; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.ethereum.eth.sync.BlockBroadcaster; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolFactory; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.data.BlockHeader; +import org.hyperledger.besu.plugin.data.SyncStatus; +import org.hyperledger.besu.plugin.data.Transaction; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Collections; import java.util.Optional; @@ -59,11 +59,11 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) -public class PantheonEventsImplTest { +public class BesuEventsImplTest { private static final KeyPair KEY_PAIR1 = KeyPair.generate(); - private static final tech.pegasys.pantheon.ethereum.core.Transaction TX1 = createTransaction(1); - private static final tech.pegasys.pantheon.ethereum.core.Transaction TX2 = createTransaction(2); + private static final org.hyperledger.besu.ethereum.core.Transaction TX1 = createTransaction(1); + private static final org.hyperledger.besu.ethereum.core.Transaction TX2 = createTransaction(2); @Mock private ProtocolSchedule mockProtocolSchedule; @Mock private ProtocolContext mockProtocolContext; @@ -77,15 +77,15 @@ public class PantheonEventsImplTest { @Mock private ProtocolSpec mockProtocolSpec; @Mock private WorldStateArchive mockWorldStateArchive; @Mock private WorldState mockWorldState; - private tech.pegasys.pantheon.ethereum.core.BlockHeader fakeBlockHeader; + private org.hyperledger.besu.ethereum.core.BlockHeader fakeBlockHeader; private TransactionPool transactionPool; private BlockBroadcaster blockBroadcaster; - private PantheonEventsImpl serviceImpl; + private BesuEventsImpl serviceImpl; @Before public void setUp() { fakeBlockHeader = - new tech.pegasys.pantheon.ethereum.core.BlockHeader( + new org.hyperledger.besu.ethereum.core.BlockHeader( null, null, null, null, null, null, null, null, 1, 1, 1, 1, null, null, 1, null); when(mockBlockchain.getBlockHeader(any())).thenReturn(Optional.of(fakeBlockHeader)); @@ -115,7 +115,7 @@ public class PantheonEventsImplTest { TransactionPoolConfiguration.builder().txPoolMaxSize(1).build()); syncState = new SyncState(mockBlockchain, mockEthPeers); - serviceImpl = new PantheonEventsImpl(blockBroadcaster, transactionPool, syncState); + serviceImpl = new BesuEventsImpl(blockBroadcaster, transactionPool, syncState); } @Test @@ -246,7 +246,7 @@ public class PantheonEventsImplTest { return new Block(new BlockHeaderTestFixture().buildHeader(), body); } - private static tech.pegasys.pantheon.ethereum.core.Transaction createTransaction( + private static org.hyperledger.besu.ethereum.core.Transaction createTransaction( final int transactionNumber) { return new TransactionTestFixture() .nonce(transactionNumber) diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/services/PantheonPluginContextImplTest.java b/besu/src/test/java/org/hyperledger/besu/services/BesuPluginContextImplTest.java similarity index 86% rename from pantheon/src/test/java/tech/pegasys/pantheon/services/PantheonPluginContextImplTest.java rename to besu/src/test/java/org/hyperledger/besu/services/BesuPluginContextImplTest.java index 6ea6bee984..fdd0aaae58 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/services/PantheonPluginContextImplTest.java +++ b/besu/src/test/java/org/hyperledger/besu/services/BesuPluginContextImplTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.services; +package org.hyperledger.besu.services; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import tech.pegasys.pantheon.plugin.PantheonPlugin; -import tech.pegasys.pantheon.plugins.TestPicoCLIPlugin; +import org.hyperledger.besu.plugin.BesuPlugin; +import org.hyperledger.besu.plugins.TestPicoCLIPlugin; import java.io.File; import java.io.IOException; @@ -30,14 +30,14 @@ import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; -public class PantheonPluginContextImplTest { +public class BesuPluginContextImplTest { @BeforeClass public static void createFakePluginDir() throws IOException { - if (System.getProperty("pantheon.plugins.dir") == null) { - final Path pluginDir = Files.createTempDirectory("pantheonTest"); + if (System.getProperty("besu.plugins.dir") == null) { + final Path pluginDir = Files.createTempDirectory("besuTest"); pluginDir.toFile().deleteOnExit(); - System.setProperty("pantheon.plugins.dir", pluginDir.toAbsolutePath().toString()); + System.setProperty("besu.plugins.dir", pluginDir.toAbsolutePath().toString()); } } @@ -48,7 +48,7 @@ public class PantheonPluginContextImplTest { @Test public void verifyEverythingGoesSmoothly() { - final PantheonPluginContextImpl contextImpl = new PantheonPluginContextImpl(); + final BesuPluginContextImpl contextImpl = new BesuPluginContextImpl(); assertThat(contextImpl.getPlugins()).isEmpty(); contextImpl.registerPlugins(new File(".").toPath()); @@ -68,7 +68,7 @@ public class PantheonPluginContextImplTest { @Test public void registrationErrorsHandledSmoothly() { - final PantheonPluginContextImpl contextImpl = new PantheonPluginContextImpl(); + final BesuPluginContextImpl contextImpl = new BesuPluginContextImpl(); System.setProperty("testPicoCLIPlugin.testOption", "FAILREGISTER"); assertThat(contextImpl.getPlugins()).isEmpty(); @@ -84,7 +84,7 @@ public class PantheonPluginContextImplTest { @Test public void startErrorsHandledSmoothly() { - final PantheonPluginContextImpl contextImpl = new PantheonPluginContextImpl(); + final BesuPluginContextImpl contextImpl = new BesuPluginContextImpl(); System.setProperty("testPicoCLIPlugin.testOption", "FAILSTART"); assertThat(contextImpl.getPlugins()).isEmpty(); @@ -106,7 +106,7 @@ public class PantheonPluginContextImplTest { @Test public void stopErrorsHandledSmoothly() { - final PantheonPluginContextImpl contextImpl = new PantheonPluginContextImpl(); + final BesuPluginContextImpl contextImpl = new BesuPluginContextImpl(); System.setProperty("testPicoCLIPlugin.testOption", "FAILSTOP"); assertThat(contextImpl.getPlugins()).isEmpty(); @@ -127,7 +127,7 @@ public class PantheonPluginContextImplTest { @Test public void lifecycleExceptions() throws Throwable { - final PantheonPluginContextImpl contextImpl = new PantheonPluginContextImpl(); + final BesuPluginContextImpl contextImpl = new BesuPluginContextImpl(); final ThrowableAssert.ThrowingCallable registerPlugins = () -> contextImpl.registerPlugins(new File(".").toPath()); @@ -148,7 +148,7 @@ public class PantheonPluginContextImplTest { assertThatExceptionOfType(IllegalStateException.class).isThrownBy(contextImpl::stopPlugins); } - private Optional findTestPlugin(final List plugins) { + private Optional findTestPlugin(final List plugins) { return plugins.stream() .filter(p -> p instanceof TestPicoCLIPlugin) .map(p -> (TestPicoCLIPlugin) p) diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/services/PicoCLIOptionsImplTest.java b/besu/src/test/java/org/hyperledger/besu/services/PicoCLIOptionsImplTest.java similarity index 98% rename from pantheon/src/test/java/tech/pegasys/pantheon/services/PicoCLIOptionsImplTest.java rename to besu/src/test/java/org/hyperledger/besu/services/PicoCLIOptionsImplTest.java index 6a1aae7b84..5e15322127 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/services/PicoCLIOptionsImplTest.java +++ b/besu/src/test/java/org/hyperledger/besu/services/PicoCLIOptionsImplTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services; +package org.hyperledger.besu.services; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/util/KeyPairUtilTest.java b/besu/src/test/java/org/hyperledger/besu/util/KeyPairUtilTest.java similarity index 93% rename from pantheon/src/test/java/tech/pegasys/pantheon/util/KeyPairUtilTest.java rename to besu/src/test/java/org/hyperledger/besu/util/KeyPairUtilTest.java index 8796c1bd7e..daf6a3da95 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/util/KeyPairUtilTest.java +++ b/besu/src/test/java/org/hyperledger/besu/util/KeyPairUtilTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.controller.KeyPairUtil; +import org.hyperledger.besu.controller.KeyPairUtil; import java.io.File; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/util/LocalPermissioningConfigurationValidatorTest.java b/besu/src/test/java/org/hyperledger/besu/util/LocalPermissioningConfigurationValidatorTest.java similarity index 93% rename from pantheon/src/test/java/tech/pegasys/pantheon/util/LocalPermissioningConfigurationValidatorTest.java rename to besu/src/test/java/org/hyperledger/besu/util/LocalPermissioningConfigurationValidatorTest.java index 5bea571f97..0c5454f343 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/util/LocalPermissioningConfigurationValidatorTest.java +++ b/besu/src/test/java/org/hyperledger/besu/util/LocalPermissioningConfigurationValidatorTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -import tech.pegasys.pantheon.cli.config.EthNetworkConfig; -import tech.pegasys.pantheon.cli.config.NetworkName; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.permissioning.LocalPermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfigurationBuilder; +import org.hyperledger.besu.cli.config.EthNetworkConfig; +import org.hyperledger.besu.cli.config.NetworkName; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.PermissioningConfigurationBuilder; import java.net.URI; import java.net.URL; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/util/StringUtilsTest.java b/besu/src/test/java/org/hyperledger/besu/util/StringUtilsTest.java similarity index 97% rename from pantheon/src/test/java/tech/pegasys/pantheon/util/StringUtilsTest.java rename to besu/src/test/java/org/hyperledger/besu/util/StringUtilsTest.java index c07005f041..e922beae7f 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/util/StringUtilsTest.java +++ b/besu/src/test/java/org/hyperledger/besu/util/StringUtilsTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; import static org.assertj.core.api.Assertions.assertThat; diff --git a/pantheon/src/test/resources/auth_correct.toml b/besu/src/test/resources/auth_correct.toml similarity index 100% rename from pantheon/src/test/resources/auth_correct.toml rename to besu/src/test/resources/auth_correct.toml diff --git a/pantheon/src/test/resources/auth_duplicate_user.toml b/besu/src/test/resources/auth_duplicate_user.toml similarity index 100% rename from pantheon/src/test/resources/auth_duplicate_user.toml rename to besu/src/test/resources/auth_duplicate_user.toml diff --git a/pantheon/src/test/resources/auth_invalid.toml b/besu/src/test/resources/auth_invalid.toml similarity index 100% rename from pantheon/src/test/resources/auth_invalid.toml rename to besu/src/test/resources/auth_invalid.toml diff --git a/pantheon/src/test/resources/auth_invalid_value.toml b/besu/src/test/resources/auth_invalid_value.toml similarity index 100% rename from pantheon/src/test/resources/auth_invalid_value.toml rename to besu/src/test/resources/auth_invalid_value.toml diff --git a/pantheon/src/test/resources/auth_no_password.toml b/besu/src/test/resources/auth_no_password.toml similarity index 100% rename from pantheon/src/test/resources/auth_no_password.toml rename to besu/src/test/resources/auth_no_password.toml diff --git a/pantheon/src/test/resources/complete_config.toml b/besu/src/test/resources/complete_config.toml similarity index 87% rename from pantheon/src/test/resources/complete_config.toml rename to besu/src/test/resources/complete_config.toml index 56ea14a8a3..3243b05613 100644 --- a/pantheon/src/test/resources/complete_config.toml +++ b/besu/src/test/resources/complete_config.toml @@ -1,6 +1,6 @@ # this is a valid TOML config file -data-path="/opt/pantheon" # Path +data-path="/opt/besu" # Path #invalid-option=true @@ -26,7 +26,7 @@ metrics-host="8.6.7.5" metrics-port=309 # chain -genesis-file="/opt/pantheon/genesis.json" # Path +genesis-file="/opt/besu/genesis.json" # Path network-id=42 sync-mode="fast"# should be FAST or FULL (or fast or full) fast-sync-min-peers=13 diff --git a/pantheon/src/test/resources/everything_config.toml b/besu/src/test/resources/everything_config.toml similarity index 100% rename from pantheon/src/test/resources/everything_config.toml rename to besu/src/test/resources/everything_config.toml diff --git a/pantheon/src/test/resources/ibft.blocks b/besu/src/test/resources/ibft.blocks similarity index 100% rename from pantheon/src/test/resources/ibft.blocks rename to besu/src/test/resources/ibft.blocks diff --git a/pantheon/src/test/resources/ibftlegacy_genesis.json b/besu/src/test/resources/ibftlegacy_genesis.json similarity index 100% rename from pantheon/src/test/resources/ibftlegacy_genesis.json rename to besu/src/test/resources/ibftlegacy_genesis.json diff --git a/pantheon/src/test/resources/invalidPrivateKey.txt b/besu/src/test/resources/invalidPrivateKey.txt similarity index 100% rename from pantheon/src/test/resources/invalidPrivateKey.txt rename to besu/src/test/resources/invalidPrivateKey.txt diff --git a/pantheon/src/test/resources/log4j2.xml b/besu/src/test/resources/log4j2.xml similarity index 100% rename from pantheon/src/test/resources/log4j2.xml rename to besu/src/test/resources/log4j2.xml diff --git a/pantheon/src/test/resources/no_bootnodes.toml b/besu/src/test/resources/no_bootnodes.toml similarity index 100% rename from pantheon/src/test/resources/no_bootnodes.toml rename to besu/src/test/resources/no_bootnodes.toml diff --git a/pantheon/src/test/resources/operator/config_generate_keys.json b/besu/src/test/resources/operator/config_generate_keys.json similarity index 100% rename from pantheon/src/test/resources/operator/config_generate_keys.json rename to besu/src/test/resources/operator/config_generate_keys.json diff --git a/pantheon/src/test/resources/operator/config_import_keys.json b/besu/src/test/resources/operator/config_import_keys.json similarity index 100% rename from pantheon/src/test/resources/operator/config_import_keys.json rename to besu/src/test/resources/operator/config_import_keys.json diff --git a/pantheon/src/test/resources/operator/config_import_keys_invalid_keys.json b/besu/src/test/resources/operator/config_import_keys_invalid_keys.json similarity index 100% rename from pantheon/src/test/resources/operator/config_import_keys_invalid_keys.json rename to besu/src/test/resources/operator/config_import_keys_invalid_keys.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/clique/blocks-import-invalid-bad-parent.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/clique/blocks-import-invalid-bad-parent.json similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/clique/blocks-import-invalid-bad-parent.json rename to besu/src/test/resources/org/hyperledger/besu/chainimport/clique/blocks-import-invalid-bad-parent.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/clique/blocks-import-invalid-bad-tx.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/clique/blocks-import-invalid-bad-tx.json similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/clique/blocks-import-invalid-bad-tx.json rename to besu/src/test/resources/org/hyperledger/besu/chainimport/clique/blocks-import-invalid-bad-tx.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/clique/blocks-import-special-fields.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/clique/blocks-import-special-fields.json similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/clique/blocks-import-special-fields.json rename to besu/src/test/resources/org/hyperledger/besu/chainimport/clique/blocks-import-special-fields.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/clique/blocks-import-valid-addendum.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/clique/blocks-import-valid-addendum.json similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/clique/blocks-import-valid-addendum.json rename to besu/src/test/resources/org/hyperledger/besu/chainimport/clique/blocks-import-valid-addendum.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/clique/blocks-import-valid-no-block-identifiers.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/clique/blocks-import-valid-no-block-identifiers.json similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/clique/blocks-import-valid-no-block-identifiers.json rename to besu/src/test/resources/org/hyperledger/besu/chainimport/clique/blocks-import-valid-no-block-identifiers.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/clique/blocks-import-valid.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/clique/blocks-import-valid.json similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/clique/blocks-import-valid.json rename to besu/src/test/resources/org/hyperledger/besu/chainimport/clique/blocks-import-valid.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/clique/genesis.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/clique/genesis.json similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/clique/genesis.json rename to besu/src/test/resources/org/hyperledger/besu/chainimport/clique/genesis.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/ethash/blocks-import-invalid-bad-parent.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/blocks-import-invalid-bad-parent.json similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/ethash/blocks-import-invalid-bad-parent.json rename to besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/blocks-import-invalid-bad-parent.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/ethash/blocks-import-invalid-bad-tx.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/blocks-import-invalid-bad-tx.json similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/ethash/blocks-import-invalid-bad-tx.json rename to besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/blocks-import-invalid-bad-tx.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/ethash/blocks-import-special-fields.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/blocks-import-special-fields.json similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/ethash/blocks-import-special-fields.json rename to besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/blocks-import-special-fields.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/ethash/blocks-import-valid-addendum.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/blocks-import-valid-addendum.json similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/ethash/blocks-import-valid-addendum.json rename to besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/blocks-import-valid-addendum.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/ethash/blocks-import-valid-no-block-identifiers.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/blocks-import-valid-no-block-identifiers.json similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/ethash/blocks-import-valid-no-block-identifiers.json rename to besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/blocks-import-valid-no-block-identifiers.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/ethash/blocks-import-valid.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/blocks-import-valid.json similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/ethash/blocks-import-valid.json rename to besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/blocks-import-valid.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/ethash/genesis.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/genesis.json similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/ethash/genesis.json rename to besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/genesis.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/unsupported/genesis.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/unsupported/genesis.json similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/chainimport/unsupported/genesis.json rename to besu/src/test/resources/org/hyperledger/besu/chainimport/unsupported/genesis.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/util/blockchain-import-genesis-file.json b/besu/src/test/resources/org/hyperledger/besu/util/blockchain-import-genesis-file.json similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/util/blockchain-import-genesis-file.json rename to besu/src/test/resources/org/hyperledger/besu/util/blockchain-import-genesis-file.json diff --git a/pantheon/src/test/resources/tech/pegasys/pantheon/util/blockchain-import.bin b/besu/src/test/resources/org/hyperledger/besu/util/blockchain-import.bin similarity index 100% rename from pantheon/src/test/resources/tech/pegasys/pantheon/util/blockchain-import.bin rename to besu/src/test/resources/org/hyperledger/besu/util/blockchain-import.bin diff --git a/pantheon/src/test/resources/orion_publickey.pub b/besu/src/test/resources/orion_publickey.pub similarity index 100% rename from pantheon/src/test/resources/orion_publickey.pub rename to besu/src/test/resources/orion_publickey.pub diff --git a/pantheon/src/test/resources/partial_config.toml b/besu/src/test/resources/partial_config.toml similarity index 100% rename from pantheon/src/test/resources/partial_config.toml rename to besu/src/test/resources/partial_config.toml diff --git a/pantheon/src/test/resources/permissioning_config.toml b/besu/src/test/resources/permissioning_config.toml similarity index 100% rename from pantheon/src/test/resources/permissioning_config.toml rename to besu/src/test/resources/permissioning_config.toml diff --git a/pantheon/src/test/resources/permissioning_config_ropsten_bootnodes.toml b/besu/src/test/resources/permissioning_config_ropsten_bootnodes.toml similarity index 100% rename from pantheon/src/test/resources/permissioning_config_ropsten_bootnodes.toml rename to besu/src/test/resources/permissioning_config_ropsten_bootnodes.toml diff --git a/crypto/src/test/resources/tech/pegasys/pantheon/crypto/validPrivateKey.txt b/besu/src/test/resources/validPrivateKey.txt similarity index 100% rename from crypto/src/test/resources/tech/pegasys/pantheon/crypto/validPrivateKey.txt rename to besu/src/test/resources/validPrivateKey.txt diff --git a/build.gradle b/build.gradle index ae356f73aa..e19cd1be84 100644 --- a/build.gradle +++ b/build.gradle @@ -26,11 +26,11 @@ plugins { } if (!JavaVersion.current().java11Compatible) { - throw new GradleException("Java 11 or later is required to build Pantheon.\n" + + throw new GradleException("Java 11 or later is required to build Besu.\n" + " Detected version ${JavaVersion.current()}") } -group = 'tech.pegasys.pantheon' +group = 'org.hyperledger.besu' defaultTasks 'build', 'checkLicenses', 'javadoc' @@ -72,13 +72,12 @@ apply plugin: 'com.jfrog.bintray' def bintrayUser = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER') def bintrayKey = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_KEY') def bintrayPackage = bintray.pkg { - repo = 'pegasys-repo' - name = 'pantheon' - userOrg = 'consensys' + repo = 'besu-repo' + name = 'besu' + userOrg = 'hyperledger' licenses = ['Apache-2.0'] - websiteUrl = 'https://github.com/PegaSysEng/pantheon' - issueTrackerUrl = 'https://github.com/PegaSysEng/pantheon/issues' - vcsUrl = 'https://github.com/PegaSysEng/pantheon.git' + websiteUrl = 'https://github.com/hyperledger/besu' + vcsUrl = 'https://github.com/hyperledger/besu.git' version { name = project.version @@ -143,7 +142,7 @@ allprojects { } removeUnusedImports() googleJavaFormat('1.7') - importOrder 'tech.pegasys', 'java', '' + importOrder 'org.hyperledger', 'java', '' trimTrailingWhitespace() endWithNewline() licenseHeaderFile "${rootDir}/gradle/spotless.java.license" @@ -221,7 +220,7 @@ allprojects { * The properties passed are: * - 'test.ethereum.include': allows to run a single Ethereum reference tests. For instance, * running a single general state test can be done with: - * ./gradlew :ethereum:tech.pegasys.pantheon.ethereum.vm:test -Dtest.single=GeneralStateTest -Dtest.ethereum.include=callcodecallcallcode_101-Frontier + * ./gradlew :ethereum:org.hyperledger.besu.ethereum.vm:test -Dtest.single=GeneralStateTest -Dtest.ethereum.include=callcodecallcallcode_101-Frontier * The meaning being that will be run only the tests for which the value passed as "include" * (which can be a java pattern) matches parts of the test name. Knowing that tests names for * reference tests are of the form: @@ -232,7 +231,7 @@ allprojects { * multiple variant of that test are run. The variant is a simple number. * - 'test.ethereum.state.eip': for general state tests, allows to only run tests for the * milestone specified by this value. So for instance, - * ./gradlew :ethereum:tech.pegasys.pantheon.ethereum.vm:test -Dtest.single=GeneralStateTest -Dtest.ethereum.state.eip=Frontier + * ./gradlew :ethereum:org.hyperledger.besu.ethereum.vm:test -Dtest.single=GeneralStateTest -Dtest.ethereum.state.eip=Frontier * only run general state tests for Frontier. Note that this behavior could be achieved as well * with the 'include' option above since it is a pattern, but this is a slightly more convenient * option. @@ -317,7 +316,7 @@ subprojects { publishing { publications { mavenJava(MavenPublication) { - groupId "tech.pegasys.pantheon.internal" + groupId "org.hyperledger.besu.internal" version "${project.version}" if(sourceSetIsPopulated("main")) { from components.java @@ -333,8 +332,8 @@ subprojects { usage('java-runtime') { fromResolutionResult() } } pom { - name = "Pantheon - ${project.name}" - url = 'http://github.com/PegaSysEng/pantheon' + name = "Besu - ${project.name}" + url = 'http://github.com/hyperledger/besu' licenses { license { name = 'The Apache License, Version 2.0' @@ -342,9 +341,9 @@ subprojects { } } scm { - connection = 'scm:git:git://github.com/PegaSysEng/pantheon.git' - developerConnection = 'scm:git:ssh://github.com/PegaSysEng/pantheon.git' - url = 'https://github.com/PegaSysEng/pantheon' + connection = 'scm:git:git://github.com/hyperledger/besu.git' + developerConnection = 'scm:git:ssh://github.com/hyperledger/besu.git' + url = 'https://github.com/hyperledger/besu' } } } @@ -389,7 +388,7 @@ subprojects { task integrationTest(type: Test, dependsOn: ["compileTestJava"]) { group = "verification" - description = "Runs the Pantheon integration tests" + description = "Runs the Besu integration tests" testClassesDirs = sourceSets.integrationTest.output.classesDirs classpath = sourceSets.integrationTest.runtimeClasspath @@ -422,10 +421,10 @@ subprojects { jar { enabled = false } apply plugin: 'application' -mainClassName = 'tech.pegasys.pantheon.Pantheon' +mainClassName = 'org.hyperledger.besu.Besu' applicationDefaultJvmArgs = [ '-Dvertx.disableFileCPResolving=true', - '-Dpantheon.home=PANTHEON_HOME', + '-Dbesu.home=BESU_HOME', // We shutdown log4j ourselves, as otherwise this shutdown hook runs before our own and whatever // happens during shutdown is not logged. '-Dlog4j.shutdownHookEnabled=false', @@ -436,10 +435,10 @@ applicationDefaultJvmArgs = [ ] run { - args project.hasProperty("pantheon.run.args") ? project.property("pantheon.run.args").toString().split("\\s+") : [] + args project.hasProperty("besu.run.args") ? project.property("besu.run.args").toString().split("\\s+") : [] doFirst { applicationDefaultJvmArgs = applicationDefaultJvmArgs.collect { - it.replace('PANTHEON_HOME', "$buildDir/pantheon") + it.replace('BESU_HOME', "$buildDir/besu") } } } @@ -451,8 +450,8 @@ startScripts { } doLast { - unixScript.text = unixScript.text.replace('PANTHEON_HOME', '\$APP_HOME') - windowsScript.text = windowsScript.text.replace('PANTHEON_HOME', '%~dp0..') + unixScript.text = unixScript.text.replace('BESU_HOME', '\$APP_HOME') + windowsScript.text = windowsScript.text.replace('BESU_HOME', '%~dp0..') // Prevent the error originating from the 8191 chars limit on Windows windowsScript.text = @@ -464,7 +463,7 @@ startScripts { } dependencies { - compile project(':pantheon') + compile project(':besu') errorprone 'com.google.errorprone:error_prone_core' } @@ -497,12 +496,12 @@ distZip { } } -// rename the top level dir from pantheon- to pantheon and this makes it really +// rename the top level dir from besu- to besu and this makes it really // simple for use in docker tasks.register("dockerDistUntar") { dependsOn distTar dependsOn distZip - def dockerBuildDir = "build/docker-pantheon/" + def dockerBuildDir = "build/docker-besu/" def distTarFile = distTar.outputs.files.singleFile def distTarFileName = distTar.outputs.files.singleFile.name.replace(".tar.gz", "") @@ -512,15 +511,15 @@ tasks.register("dockerDistUntar") { from tarTree(distTarFile) into(dockerBuildDir) } - file("${dockerBuildDir}/${distTarFileName}").renameTo("${dockerBuildDir}/pantheon") + file("${dockerBuildDir}/${distTarFileName}").renameTo("${dockerBuildDir}/besu") } } task distDocker(type: Exec) { dependsOn dockerDistUntar def dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}" - def image = project.hasProperty('release.releaseVersion') ? "pegasyseng/pantheon:" + project.property('release.releaseVersion') : "pegasyseng/pantheon:${project.version}" - def dockerBuildDir = "build/docker-pantheon/" + def image = project.hasProperty('release.releaseVersion') ? "hyperledger/besu:" + project.property('release.releaseVersion') : "hyperledger/besu:${project.version}" + def dockerBuildDir = "build/docker-besu/" workingDir "${dockerBuildDir}" doFirst { diff --git a/config/build.gradle b/config/build.gradle index a835037cde..359e90838c 100644 --- a/config/build.gradle +++ b/config/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-config' + baseName 'besu-config' manifest { attributes( 'Specification-Title': baseName, diff --git a/config/src/main/java/tech/pegasys/pantheon/config/CliqueConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/CliqueConfigOptions.java similarity index 97% rename from config/src/main/java/tech/pegasys/pantheon/config/CliqueConfigOptions.java rename to config/src/main/java/org/hyperledger/besu/config/CliqueConfigOptions.java index 3c424ee69f..31ef0bc1f1 100644 --- a/config/src/main/java/tech/pegasys/pantheon/config/CliqueConfigOptions.java +++ b/config/src/main/java/org/hyperledger/besu/config/CliqueConfigOptions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.config; +package org.hyperledger.besu.config; import java.util.Map; diff --git a/config/src/main/java/tech/pegasys/pantheon/config/EthashConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/EthashConfigOptions.java similarity index 97% rename from config/src/main/java/tech/pegasys/pantheon/config/EthashConfigOptions.java rename to config/src/main/java/org/hyperledger/besu/config/EthashConfigOptions.java index 6d72ac31b6..e75644620c 100644 --- a/config/src/main/java/tech/pegasys/pantheon/config/EthashConfigOptions.java +++ b/config/src/main/java/org/hyperledger/besu/config/EthashConfigOptions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.config; +package org.hyperledger.besu.config; import java.util.Map; import java.util.OptionalLong; diff --git a/config/src/main/java/tech/pegasys/pantheon/config/GenesisAllocation.java b/config/src/main/java/org/hyperledger/besu/config/GenesisAllocation.java similarity index 97% rename from config/src/main/java/tech/pegasys/pantheon/config/GenesisAllocation.java rename to config/src/main/java/org/hyperledger/besu/config/GenesisAllocation.java index bcdddd331e..07a62a2b29 100644 --- a/config/src/main/java/tech/pegasys/pantheon/config/GenesisAllocation.java +++ b/config/src/main/java/org/hyperledger/besu/config/GenesisAllocation.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.config; +package org.hyperledger.besu.config; import java.util.HashMap; import java.util.Map; diff --git a/config/src/main/java/tech/pegasys/pantheon/config/GenesisConfigFile.java b/config/src/main/java/org/hyperledger/besu/config/GenesisConfigFile.java similarity index 96% rename from config/src/main/java/tech/pegasys/pantheon/config/GenesisConfigFile.java rename to config/src/main/java/org/hyperledger/besu/config/GenesisConfigFile.java index b9cf623d19..c3b0547b12 100644 --- a/config/src/main/java/tech/pegasys/pantheon/config/GenesisConfigFile.java +++ b/config/src/main/java/org/hyperledger/besu/config/GenesisConfigFile.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.config; +package org.hyperledger.besu.config; import static java.nio.charset.StandardCharsets.UTF_8; -import static tech.pegasys.pantheon.config.JsonUtil.normalizeKeys; +import static org.hyperledger.besu.config.JsonUtil.normalizeKeys; import java.io.IOException; import java.util.Collections; @@ -71,7 +71,7 @@ public class GenesisConfigFile { // if we get here comments is what broke things, warn and move on. LOG.warn( "The provided genesis file contains comments. " - + "In a future release of Pantheon this will not be supported."); + + "In a future release of Besu this will not be supported."); return fromConfig(rootNode); } else { throw re; diff --git a/config/src/main/java/tech/pegasys/pantheon/config/GenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java similarity index 97% rename from config/src/main/java/tech/pegasys/pantheon/config/GenesisConfigOptions.java rename to config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java index e860c60477..c19eb69b29 100644 --- a/config/src/main/java/tech/pegasys/pantheon/config/GenesisConfigOptions.java +++ b/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.config; +package org.hyperledger.besu.config; import java.math.BigInteger; import java.util.Map; diff --git a/config/src/main/java/tech/pegasys/pantheon/config/IbftConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/IbftConfigOptions.java similarity index 99% rename from config/src/main/java/tech/pegasys/pantheon/config/IbftConfigOptions.java rename to config/src/main/java/org/hyperledger/besu/config/IbftConfigOptions.java index 96ea0f24a3..54f989fe6e 100644 --- a/config/src/main/java/tech/pegasys/pantheon/config/IbftConfigOptions.java +++ b/config/src/main/java/org/hyperledger/besu/config/IbftConfigOptions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.config; +package org.hyperledger.besu.config; import java.util.Map; diff --git a/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java similarity index 99% rename from config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java rename to config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java index 552029fb8a..77ef19b9e6 100644 --- a/config/src/main/java/tech/pegasys/pantheon/config/JsonGenesisConfigOptions.java +++ b/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.config; +package org.hyperledger.besu.config; import static java.util.Objects.isNull; diff --git a/config/src/main/java/tech/pegasys/pantheon/config/JsonUtil.java b/config/src/main/java/org/hyperledger/besu/config/JsonUtil.java similarity index 99% rename from config/src/main/java/tech/pegasys/pantheon/config/JsonUtil.java rename to config/src/main/java/org/hyperledger/besu/config/JsonUtil.java index 3f14177a25..9add6a3479 100644 --- a/config/src/main/java/tech/pegasys/pantheon/config/JsonUtil.java +++ b/config/src/main/java/org/hyperledger/besu/config/JsonUtil.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.config; +package org.hyperledger.besu.config; import java.io.IOException; import java.util.Locale; diff --git a/config/src/test-support/java/tech/pegasys/pantheon/config/StubGenesisConfigOptions.java b/config/src/test-support/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java similarity index 99% rename from config/src/test-support/java/tech/pegasys/pantheon/config/StubGenesisConfigOptions.java rename to config/src/test-support/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java index cda81db41a..5cd5dfabc1 100644 --- a/config/src/test-support/java/tech/pegasys/pantheon/config/StubGenesisConfigOptions.java +++ b/config/src/test-support/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.config; +package org.hyperledger.besu.config; import java.math.BigInteger; import java.util.Map; diff --git a/config/src/test/java/tech/pegasys/pantheon/config/CliqueConfigOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/CliqueConfigOptionsTest.java similarity index 98% rename from config/src/test/java/tech/pegasys/pantheon/config/CliqueConfigOptionsTest.java rename to config/src/test/java/org/hyperledger/besu/config/CliqueConfigOptionsTest.java index 8cf01f2a9e..187d4bb94c 100644 --- a/config/src/test/java/tech/pegasys/pantheon/config/CliqueConfigOptionsTest.java +++ b/config/src/test/java/org/hyperledger/besu/config/CliqueConfigOptionsTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.config; +package org.hyperledger.besu.config; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; diff --git a/config/src/test/java/tech/pegasys/pantheon/config/GenesisConfigFileTest.java b/config/src/test/java/org/hyperledger/besu/config/GenesisConfigFileTest.java similarity index 99% rename from config/src/test/java/tech/pegasys/pantheon/config/GenesisConfigFileTest.java rename to config/src/test/java/org/hyperledger/besu/config/GenesisConfigFileTest.java index 7a4f747f74..3f8d62b466 100644 --- a/config/src/test/java/tech/pegasys/pantheon/config/GenesisConfigFileTest.java +++ b/config/src/test/java/org/hyperledger/besu/config/GenesisConfigFileTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.config; +package org.hyperledger.besu.config; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/config/src/test/java/tech/pegasys/pantheon/config/GenesisConfigOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/GenesisConfigOptionsTest.java similarity index 99% rename from config/src/test/java/tech/pegasys/pantheon/config/GenesisConfigOptionsTest.java rename to config/src/test/java/org/hyperledger/besu/config/GenesisConfigOptionsTest.java index cddb330a6a..3a7f2bf8ed 100644 --- a/config/src/test/java/tech/pegasys/pantheon/config/GenesisConfigOptionsTest.java +++ b/config/src/test/java/org/hyperledger/besu/config/GenesisConfigOptionsTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.config; +package org.hyperledger.besu.config; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; diff --git a/config/src/test/java/tech/pegasys/pantheon/config/IbftConfigOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/IbftConfigOptionsTest.java similarity index 99% rename from config/src/test/java/tech/pegasys/pantheon/config/IbftConfigOptionsTest.java rename to config/src/test/java/org/hyperledger/besu/config/IbftConfigOptionsTest.java index 26dbeb5b2c..60d09d990b 100644 --- a/config/src/test/java/tech/pegasys/pantheon/config/IbftConfigOptionsTest.java +++ b/config/src/test/java/org/hyperledger/besu/config/IbftConfigOptionsTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.config; +package org.hyperledger.besu.config; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; diff --git a/config/src/test/java/tech/pegasys/pantheon/config/JsonUtilTest.java b/config/src/test/java/org/hyperledger/besu/config/JsonUtilTest.java similarity index 99% rename from config/src/test/java/tech/pegasys/pantheon/config/JsonUtilTest.java rename to config/src/test/java/org/hyperledger/besu/config/JsonUtilTest.java index 4b58f09376..f3b6d609e7 100644 --- a/config/src/test/java/tech/pegasys/pantheon/config/JsonUtilTest.java +++ b/config/src/test/java/org/hyperledger/besu/config/JsonUtilTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.config; +package org.hyperledger.besu.config; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/consensus/clique/build.gradle b/consensus/clique/build.gradle index 81d17301b3..ebe211931c 100644 --- a/consensus/clique/build.gradle +++ b/consensus/clique/build.gradle @@ -14,7 +14,7 @@ plugins { id 'java' } jar { - baseName 'pantheon-clique' + baseName 'besu-clique' manifest { attributes( 'Specification-Title': baseName, diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/BlockHeaderValidationRulesetFactory.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/BlockHeaderValidationRulesetFactory.java similarity index 61% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/BlockHeaderValidationRulesetFactory.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/BlockHeaderValidationRulesetFactory.java index cdb7867a5b..d764c9e0f5 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/BlockHeaderValidationRulesetFactory.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/BlockHeaderValidationRulesetFactory.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; +package org.hyperledger.besu.consensus.clique; -import tech.pegasys.pantheon.consensus.clique.headervalidationrules.CliqueDifficultyValidationRule; -import tech.pegasys.pantheon.consensus.clique.headervalidationrules.CliqueExtraDataValidationRule; -import tech.pegasys.pantheon.consensus.clique.headervalidationrules.CoinbaseHeaderValidationRule; -import tech.pegasys.pantheon.consensus.clique.headervalidationrules.SignerRateLimitValidationRule; -import tech.pegasys.pantheon.consensus.clique.headervalidationrules.VoteValidationRule; -import tech.pegasys.pantheon.consensus.common.EpochManager; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.AncestryValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.ConstantFieldValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.GasUsageValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.TimestampBoundedByFutureParameter; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.TimestampMoreRecentThanParent; +import org.hyperledger.besu.consensus.clique.headervalidationrules.CliqueDifficultyValidationRule; +import org.hyperledger.besu.consensus.clique.headervalidationrules.CliqueExtraDataValidationRule; +import org.hyperledger.besu.consensus.clique.headervalidationrules.CoinbaseHeaderValidationRule; +import org.hyperledger.besu.consensus.clique.headervalidationrules.SignerRateLimitValidationRule; +import org.hyperledger.besu.consensus.clique.headervalidationrules.VoteValidationRule; +import org.hyperledger.besu.consensus.common.EpochManager; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.AncestryValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.ConstantFieldValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasUsageValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampBoundedByFutureParameter; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampMoreRecentThanParent; public class BlockHeaderValidationRulesetFactory { diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHashing.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockHashing.java similarity index 90% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHashing.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockHashing.java index 148ffc8487..2044a0cbb9 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHashing.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockHashing.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; +package org.hyperledger.besu.consensus.clique; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.function.Supplier; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHeaderFunctions.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockHeaderFunctions.java similarity index 75% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHeaderFunctions.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockHeaderFunctions.java index 7b09140ab3..04c9cc4d62 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHeaderFunctions.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockHeaderFunctions.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; +package org.hyperledger.besu.consensus.clique; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; public class CliqueBlockHeaderFunctions implements BlockHeaderFunctions { diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockInterface.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockInterface.java similarity index 85% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockInterface.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockInterface.java index 99ede6430f..0e71983f08 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockInterface.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockInterface.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; +package org.hyperledger.besu.consensus.clique; -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.consensus.common.ValidatorVote; -import tech.pegasys.pantheon.consensus.common.VoteType; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.consensus.common.ValidatorVote; +import org.hyperledger.besu.consensus.common.VoteType; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collection; import java.util.Optional; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueContext.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueContext.java similarity index 85% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueContext.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueContext.java index 3449ab95d5..b5dd7db81e 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueContext.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueContext.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; +package org.hyperledger.besu.consensus.clique; -import tech.pegasys.pantheon.consensus.common.EpochManager; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; +import org.hyperledger.besu.consensus.common.EpochManager; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteTallyCache; /** * Holds the data which lives "in parallel" with the importation of blocks etc. when using the diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueDifficultyCalculator.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueDifficultyCalculator.java similarity index 83% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueDifficultyCalculator.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueDifficultyCalculator.java index 2969d48acb..dd61572945 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueDifficultyCalculator.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueDifficultyCalculator.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; +package org.hyperledger.besu.consensus.clique; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.DifficultyCalculator; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.DifficultyCalculator; import java.math.BigInteger; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueExtraData.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueExtraData.java similarity index 93% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueExtraData.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueExtraData.java index 7bb852fb7c..2681b193ee 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueExtraData.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueExtraData.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; +package org.hyperledger.besu.consensus.clique; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.ParsedExtraData; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.ParsedExtraData; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.util.List; import java.util.Optional; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueHelpers.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueHelpers.java similarity index 83% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueHelpers.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueHelpers.java index 9fb008be52..8190e59513 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueHelpers.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueHelpers.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; +package org.hyperledger.besu.consensus.clique; -import tech.pegasys.pantheon.consensus.clique.blockcreation.CliqueProposerSelector; -import tech.pegasys.pantheon.consensus.common.ValidatorProvider; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.consensus.clique.blockcreation.CliqueProposerSelector; +import org.hyperledger.besu.consensus.common.ValidatorProvider; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; public class CliqueHelpers { diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueMiningTracker.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueMiningTracker.java similarity index 87% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueMiningTracker.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueMiningTracker.java index 811b2e2b35..8b7e803cdd 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueMiningTracker.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueMiningTracker.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; +package org.hyperledger.besu.consensus.clique; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; public class CliqueMiningTracker { diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolSchedule.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueProtocolSchedule.java similarity index 68% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolSchedule.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueProtocolSchedule.java index 31652f8b78..9dcf71b6bf 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolSchedule.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueProtocolSchedule.java @@ -10,24 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; +package org.hyperledger.besu.consensus.clique; -import static tech.pegasys.pantheon.consensus.clique.BlockHeaderValidationRulesetFactory.cliqueBlockHeaderValidator; - -import tech.pegasys.pantheon.config.CliqueConfigOptions; -import tech.pegasys.pantheon.config.GenesisConfigOptions; -import tech.pegasys.pantheon.consensus.common.EpochManager; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.MainnetBlockValidator; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockBodyValidator; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockImporter; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolScheduleBuilder; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpecBuilder; +import org.hyperledger.besu.config.CliqueConfigOptions; +import org.hyperledger.besu.config.GenesisConfigOptions; +import org.hyperledger.besu.consensus.common.EpochManager; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.MainnetBlockValidator; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockBodyValidator; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockImporter; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecBuilder; import java.math.BigInteger; @@ -72,8 +70,12 @@ public class CliqueProtocolSchedule { final ProtocolSpecBuilder specBuilder) { return specBuilder .changeConsensusContextType( - difficultyCalculator -> cliqueBlockHeaderValidator(secondsBetweenBlocks, epochManager), - difficultyCalculator -> cliqueBlockHeaderValidator(secondsBetweenBlocks, epochManager), + difficultyCalculator -> + BlockHeaderValidationRulesetFactory.cliqueBlockHeaderValidator( + secondsBetweenBlocks, epochManager), + difficultyCalculator -> + BlockHeaderValidationRulesetFactory.cliqueBlockHeaderValidator( + secondsBetweenBlocks, epochManager), MainnetBlockBodyValidator::new, MainnetBlockValidator::new, MainnetBlockImporter::new, diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreator.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockCreator.java similarity index 76% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreator.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockCreator.java index 77d4e9bc02..c5e749b8e9 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreator.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockCreator.java @@ -10,30 +10,30 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.blockcreation; +package org.hyperledger.besu.consensus.clique.blockcreation; -import tech.pegasys.pantheon.consensus.clique.CliqueBlockHashing; -import tech.pegasys.pantheon.consensus.clique.CliqueBlockInterface; -import tech.pegasys.pantheon.consensus.clique.CliqueContext; -import tech.pegasys.pantheon.consensus.clique.CliqueExtraData; -import tech.pegasys.pantheon.consensus.common.EpochManager; -import tech.pegasys.pantheon.consensus.common.ValidatorVote; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.blockcreation.AbstractBlockCreator; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.SealableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.consensus.clique.CliqueBlockHashing; +import org.hyperledger.besu.consensus.clique.CliqueBlockInterface; +import org.hyperledger.besu.consensus.clique.CliqueContext; +import org.hyperledger.besu.consensus.clique.CliqueExtraData; +import org.hyperledger.besu.consensus.common.EpochManager; +import org.hyperledger.besu.consensus.common.ValidatorVote; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.blockcreation.AbstractBlockCreator; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.SealableBlockHeader; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; import java.util.Optional; import java.util.function.Function; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockMiner.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockMiner.java similarity index 70% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockMiner.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockMiner.java index 533a89680c..df23935c7c 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockMiner.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockMiner.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.blockcreation; +package org.hyperledger.besu.consensus.clique.blockcreation; -import tech.pegasys.pantheon.consensus.clique.CliqueContext; -import tech.pegasys.pantheon.consensus.clique.CliqueHelpers; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.blockcreation.AbstractBlockScheduler; -import tech.pegasys.pantheon.ethereum.blockcreation.BlockMiner; -import tech.pegasys.pantheon.ethereum.chain.MinedBlockObserver; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.consensus.clique.CliqueContext; +import org.hyperledger.besu.consensus.clique.CliqueHelpers; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.blockcreation.AbstractBlockScheduler; +import org.hyperledger.besu.ethereum.blockcreation.BlockMiner; +import org.hyperledger.besu.ethereum.chain.MinedBlockObserver; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.util.Subscribers; import java.util.function.Function; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockScheduler.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockScheduler.java similarity index 86% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockScheduler.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockScheduler.java index 5997c95bb0..2c2069bc78 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockScheduler.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockScheduler.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.blockcreation; +package org.hyperledger.besu.consensus.clique.blockcreation; -import tech.pegasys.pantheon.consensus.common.ValidatorProvider; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.ethereum.blockcreation.DefaultBlockScheduler; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.consensus.common.ValidatorProvider; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.ethereum.blockcreation.DefaultBlockScheduler; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.time.Clock; import java.util.Random; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMinerExecutor.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutor.java similarity index 77% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMinerExecutor.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutor.java index 96514f3c24..2fe35765eb 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMinerExecutor.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutor.java @@ -10,26 +10,26 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.blockcreation; +package org.hyperledger.besu.consensus.clique.blockcreation; -import tech.pegasys.pantheon.consensus.clique.CliqueContext; -import tech.pegasys.pantheon.consensus.clique.CliqueExtraData; -import tech.pegasys.pantheon.consensus.common.ConsensusHelpers; -import tech.pegasys.pantheon.consensus.common.EpochManager; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.blockcreation.AbstractBlockScheduler; -import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMinerExecutor; -import tech.pegasys.pantheon.ethereum.chain.MinedBlockObserver; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.util.Subscribers; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.clique.CliqueContext; +import org.hyperledger.besu.consensus.clique.CliqueExtraData; +import org.hyperledger.besu.consensus.common.ConsensusHelpers; +import org.hyperledger.besu.consensus.common.EpochManager; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.blockcreation.AbstractBlockScheduler; +import org.hyperledger.besu.ethereum.blockcreation.AbstractMinerExecutor; +import org.hyperledger.besu.ethereum.chain.MinedBlockObserver; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.util.Subscribers; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMiningCoordinator.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMiningCoordinator.java similarity index 81% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMiningCoordinator.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMiningCoordinator.java index c3dd7c9a57..b8f09c29b5 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMiningCoordinator.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMiningCoordinator.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.blockcreation; - -import tech.pegasys.pantheon.consensus.clique.CliqueContext; -import tech.pegasys.pantheon.consensus.clique.CliqueMiningTracker; -import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; +package org.hyperledger.besu.consensus.clique.blockcreation; + +import org.hyperledger.besu.consensus.clique.CliqueContext; +import org.hyperledger.besu.consensus.clique.CliqueMiningTracker; +import org.hyperledger.besu.ethereum.blockcreation.AbstractMiningCoordinator; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; public class CliqueMiningCoordinator extends AbstractMiningCoordinator { diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueProposerSelector.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueProposerSelector.java similarity index 86% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueProposerSelector.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueProposerSelector.java index 6ad85a5040..85ae65a7dc 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueProposerSelector.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueProposerSelector.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.blockcreation; +package org.hyperledger.besu.consensus.clique.blockcreation; import static com.google.common.base.Preconditions.checkNotNull; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.ArrayList; import java.util.List; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueDifficultyValidationRule.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueDifficultyValidationRule.java similarity index 73% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueDifficultyValidationRule.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueDifficultyValidationRule.java index bbb04bc9f1..553dc8ff64 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueDifficultyValidationRule.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueDifficultyValidationRule.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.headervalidationrules; - -import tech.pegasys.pantheon.consensus.clique.CliqueContext; -import tech.pegasys.pantheon.consensus.clique.CliqueDifficultyCalculator; -import tech.pegasys.pantheon.consensus.clique.CliqueHelpers; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.AttachedBlockHeaderValidationRule; +package org.hyperledger.besu.consensus.clique.headervalidationrules; + +import org.hyperledger.besu.consensus.clique.CliqueContext; +import org.hyperledger.besu.consensus.clique.CliqueDifficultyCalculator; +import org.hyperledger.besu.consensus.clique.CliqueHelpers; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule; import java.math.BigInteger; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueExtraDataValidationRule.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueExtraDataValidationRule.java similarity index 84% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueExtraDataValidationRule.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueExtraDataValidationRule.java index 1b0906ef3a..2f1d53fed4 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueExtraDataValidationRule.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueExtraDataValidationRule.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.headervalidationrules; - -import tech.pegasys.pantheon.consensus.clique.CliqueContext; -import tech.pegasys.pantheon.consensus.clique.CliqueExtraData; -import tech.pegasys.pantheon.consensus.common.EpochManager; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.AttachedBlockHeaderValidationRule; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; +package org.hyperledger.besu.consensus.clique.headervalidationrules; + +import org.hyperledger.besu.consensus.clique.CliqueContext; +import org.hyperledger.besu.consensus.clique.CliqueExtraData; +import org.hyperledger.besu.consensus.common.EpochManager; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule; +import org.hyperledger.besu.ethereum.rlp.RLPException; import java.util.Collection; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CoinbaseHeaderValidationRule.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CoinbaseHeaderValidationRule.java similarity index 78% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CoinbaseHeaderValidationRule.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CoinbaseHeaderValidationRule.java index ef9d334c20..4b60733658 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CoinbaseHeaderValidationRule.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CoinbaseHeaderValidationRule.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.headervalidationrules; +package org.hyperledger.besu.consensus.clique.headervalidationrules; -import tech.pegasys.pantheon.consensus.clique.CliqueBlockInterface; -import tech.pegasys.pantheon.consensus.common.EpochManager; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import org.hyperledger.besu.consensus.clique.CliqueBlockInterface; +import org.hyperledger.besu.consensus.common.EpochManager; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule; public class CoinbaseHeaderValidationRule implements DetachedBlockHeaderValidationRule { diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/SignerRateLimitValidationRule.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/SignerRateLimitValidationRule.java similarity index 72% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/SignerRateLimitValidationRule.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/SignerRateLimitValidationRule.java index 8360baa62c..d09ccaa6c6 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/SignerRateLimitValidationRule.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/SignerRateLimitValidationRule.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.headervalidationrules; +package org.hyperledger.besu.consensus.clique.headervalidationrules; -import tech.pegasys.pantheon.consensus.clique.CliqueContext; -import tech.pegasys.pantheon.consensus.clique.CliqueHelpers; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.AttachedBlockHeaderValidationRule; +import org.hyperledger.besu.consensus.clique.CliqueContext; +import org.hyperledger.besu.consensus.clique.CliqueHelpers; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule; public class SignerRateLimitValidationRule implements AttachedBlockHeaderValidationRule { diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/VoteValidationRule.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/VoteValidationRule.java similarity index 83% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/VoteValidationRule.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/VoteValidationRule.java index a982a76301..508d7f92fc 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/VoteValidationRule.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/VoteValidationRule.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.headervalidationrules; +package org.hyperledger.besu.consensus.clique.headervalidationrules; -import tech.pegasys.pantheon.consensus.clique.CliqueBlockInterface; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import org.hyperledger.besu.consensus.clique.CliqueBlockInterface; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/CliqueJsonRpcMethodsFactory.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/CliqueJsonRpcMethodsFactory.java similarity index 68% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/CliqueJsonRpcMethodsFactory.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/CliqueJsonRpcMethodsFactory.java index 3fb8ff4ec6..43966c1d84 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/CliqueJsonRpcMethodsFactory.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/CliqueJsonRpcMethodsFactory.java @@ -10,28 +10,28 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.jsonrpc; +package org.hyperledger.besu.consensus.clique.jsonrpc; -import tech.pegasys.pantheon.consensus.clique.CliqueBlockInterface; -import tech.pegasys.pantheon.consensus.clique.CliqueContext; -import tech.pegasys.pantheon.consensus.clique.jsonrpc.methods.CliqueGetSignerMetrics; -import tech.pegasys.pantheon.consensus.clique.jsonrpc.methods.CliqueGetSigners; -import tech.pegasys.pantheon.consensus.clique.jsonrpc.methods.CliqueGetSignersAtHash; -import tech.pegasys.pantheon.consensus.clique.jsonrpc.methods.CliqueProposals; -import tech.pegasys.pantheon.consensus.clique.jsonrpc.methods.Discard; -import tech.pegasys.pantheon.consensus.clique.jsonrpc.methods.Propose; -import tech.pegasys.pantheon.consensus.common.EpochManager; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.consensus.common.VoteTallyUpdater; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApi; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethodFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.consensus.clique.CliqueBlockInterface; +import org.hyperledger.besu.consensus.clique.CliqueContext; +import org.hyperledger.besu.consensus.clique.jsonrpc.methods.CliqueGetSignerMetrics; +import org.hyperledger.besu.consensus.clique.jsonrpc.methods.CliqueGetSigners; +import org.hyperledger.besu.consensus.clique.jsonrpc.methods.CliqueGetSignersAtHash; +import org.hyperledger.besu.consensus.clique.jsonrpc.methods.CliqueProposals; +import org.hyperledger.besu.consensus.clique.jsonrpc.methods.Discard; +import org.hyperledger.besu.consensus.clique.jsonrpc.methods.Propose; +import org.hyperledger.besu.consensus.common.EpochManager; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.consensus.common.VoteTallyUpdater; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethodFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; import java.util.Collection; import java.util.HashMap; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/CliqueRpcApis.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/CliqueRpcApis.java similarity index 88% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/CliqueRpcApis.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/CliqueRpcApis.java index ecd924b1bb..e47c15d9a9 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/CliqueRpcApis.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/CliqueRpcApis.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.jsonrpc; +package org.hyperledger.besu.consensus.clique.jsonrpc; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApi; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi; import java.util.Optional; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignerMetrics.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignerMetrics.java similarity index 66% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignerMetrics.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignerMetrics.java index 16855b4e9f..6dbe1ef4b6 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignerMetrics.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignerMetrics.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; +package org.hyperledger.besu.consensus.clique.jsonrpc.methods; -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.consensus.common.jsonrpc.AbstractGetSignerMetricsMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.consensus.common.jsonrpc.AbstractGetSignerMetricsMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; public class CliqueGetSignerMetrics extends AbstractGetSignerMetricsMethod implements JsonRpcMethod { diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSigners.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSigners.java similarity index 68% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSigners.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSigners.java index c08020dd88..1e5cf106f7 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSigners.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSigners.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; +package org.hyperledger.besu.consensus.clique.jsonrpc.methods; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.Objects; import java.util.Optional; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHash.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHash.java similarity index 66% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHash.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHash.java index 31ac381e54..0806200d98 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHash.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHash.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; +package org.hyperledger.besu.consensus.clique.jsonrpc.methods; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.Objects; import java.util.Optional; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueProposals.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueProposals.java similarity index 71% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueProposals.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueProposals.java index 86873fa2da..11fd97a670 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueProposals.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueProposals.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; +package org.hyperledger.besu.consensus.clique.jsonrpc.methods; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.jsonrpc.AbstractVoteProposerMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.jsonrpc.AbstractVoteProposerMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; public class CliqueProposals extends AbstractVoteProposerMethod implements JsonRpcMethod { diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/Discard.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/Discard.java similarity index 65% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/Discard.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/Discard.java index 8a0e086886..5375d3e01a 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/Discard.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/Discard.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; +package org.hyperledger.besu.consensus.clique.jsonrpc.methods; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; public class Discard implements JsonRpcMethod { private final VoteProposer proposer; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/Propose.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/Propose.java similarity index 61% rename from consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/Propose.java rename to consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/Propose.java index 28d8d71ee6..a390c2cecb 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/Propose.java +++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/Propose.java @@ -10,20 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; +package org.hyperledger.besu.consensus.clique.jsonrpc.methods; -import static tech.pegasys.pantheon.consensus.clique.CliqueBlockInterface.NO_VOTE_SUBJECT; - -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.consensus.clique.CliqueBlockInterface; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; public class Propose implements JsonRpcMethod { private final VoteProposer proposer; @@ -43,7 +42,7 @@ public class Propose implements JsonRpcMethod { public JsonRpcResponse response(final JsonRpcRequest request) { final Address address = parameters.required(request.getParams(), 0, Address.class); final Boolean auth = parameters.required(request.getParams(), 1, Boolean.class); - if (address.equals(NO_VOTE_SUBJECT)) { + if (address.equals(CliqueBlockInterface.NO_VOTE_SUBJECT)) { return new JsonRpcErrorResponse(request.getId(), JsonRpcError.INVALID_REQUEST); } diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHashingTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockHashingTest.java similarity index 94% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHashingTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockHashingTest.java index 11d7bac9b6..624ca08720 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHashingTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockHashingTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; +package org.hyperledger.besu.consensus.clique; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogsBloomFilter; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.LogsBloomFilter; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Arrays; import java.util.List; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockInterfaceTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockInterfaceTest.java similarity index 87% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockInterfaceTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockInterfaceTest.java index 2bfcfd24d9..f6c0c27599 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockInterfaceTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockInterfaceTest.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; +package org.hyperledger.besu.consensus.clique; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.consensus.common.VoteType.ADD; -import static tech.pegasys.pantheon.consensus.common.VoteType.DROP; - -import tech.pegasys.pantheon.consensus.common.ValidatorVote; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Util; +import static org.hyperledger.besu.consensus.common.VoteType.ADD; +import static org.hyperledger.besu.consensus.common.VoteType.DROP; + +import org.hyperledger.besu.consensus.common.ValidatorVote; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Util; import java.util.Collection; import java.util.List; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueDifficultyCalculatorTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueDifficultyCalculatorTest.java similarity index 81% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueDifficultyCalculatorTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueDifficultyCalculatorTest.java index b22098587b..b9050d3a03 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueDifficultyCalculatorTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueDifficultyCalculatorTest.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; +package org.hyperledger.besu.consensus.clique; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Util; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Util; import java.math.BigInteger; import java.util.List; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueExtraDataTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueExtraDataTest.java similarity index 90% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueExtraDataTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueExtraDataTest.java index c2b70e5389..6db00d345f 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueExtraDataTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueExtraDataTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; +package org.hyperledger.besu.consensus.clique; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; import java.util.Arrays; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolScheduleTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueProtocolScheduleTest.java similarity index 86% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolScheduleTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueProtocolScheduleTest.java index 751ffb8fa1..51a442b3cb 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolScheduleTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueProtocolScheduleTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; +package org.hyperledger.besu.consensus.clique; import static org.assertj.core.api.Java6Assertions.assertThat; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.config.GenesisConfigOptions; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.config.GenesisConfigOptions; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; import org.junit.Test; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/NodeCanProduceNextBlockTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/NodeCanProduceNextBlockTest.java similarity index 91% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/NodeCanProduceNextBlockTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/NodeCanProduceNextBlockTest.java index ac675ce41b..da298f660a 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/NodeCanProduceNextBlockTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/NodeCanProduceNextBlockTest.java @@ -10,30 +10,30 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; +package org.hyperledger.besu.consensus.clique; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; - -import tech.pegasys.pantheon.consensus.clique.headervalidationrules.SignerRateLimitValidationRule; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Util; + +import org.hyperledger.besu.consensus.clique.headervalidationrules.SignerRateLimitValidationRule; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Util; import java.util.List; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/TestHelpers.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/TestHelpers.java similarity index 78% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/TestHelpers.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/TestHelpers.java index af080676fc..0ba8cff9c1 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/TestHelpers.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/TestHelpers.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique; - -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.consensus.clique; + +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreatorTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockCreatorTest.java similarity index 77% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreatorTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockCreatorTest.java index 3ed775bee8..97582de162 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreatorTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockCreatorTest.java @@ -10,49 +10,50 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.blockcreation; +package org.hyperledger.besu.consensus.clique.blockcreation; import static org.assertj.core.api.Java6Assertions.assertThat; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; - -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.consensus.clique.CliqueBlockInterface; -import tech.pegasys.pantheon.consensus.clique.CliqueContext; -import tech.pegasys.pantheon.consensus.clique.CliqueExtraData; -import tech.pegasys.pantheon.consensus.clique.CliqueHelpers; -import tech.pegasys.pantheon.consensus.clique.CliqueProtocolSchedule; -import tech.pegasys.pantheon.consensus.clique.TestHelpers; -import tech.pegasys.pantheon.consensus.common.EpochManager; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.GenesisState; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.bytes.BytesValue; + +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.consensus.clique.CliqueBlockInterface; +import org.hyperledger.besu.consensus.clique.CliqueContext; +import org.hyperledger.besu.consensus.clique.CliqueExtraData; +import org.hyperledger.besu.consensus.clique.CliqueHelpers; +import org.hyperledger.besu.consensus.clique.CliqueProtocolSchedule; +import org.hyperledger.besu.consensus.clique.TestHelpers; +import org.hyperledger.besu.consensus.common.EpochManager; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.GenesisState; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import com.google.common.collect.Lists; +import org.assertj.core.api.Java6Assertions; import org.junit.Before; import org.junit.Test; @@ -129,7 +130,7 @@ public class CliqueBlockCreatorTest { final Block createdBlock = blockCreator.createBlock(5L); - assertThat(CliqueHelpers.getProposerOfBlock(createdBlock.getHeader())) + Java6Assertions.assertThat(CliqueHelpers.getProposerOfBlock(createdBlock.getHeader())) .isEqualTo(proposerAddress); } diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockSchedulerTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockSchedulerTest.java similarity index 88% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockSchedulerTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockSchedulerTest.java index 830b356e0d..6034772c03 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockSchedulerTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockSchedulerTest.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.blockcreation; +package org.hyperledger.besu.consensus.clique.blockcreation; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.blockcreation.AbstractBlockScheduler.BlockCreationTimeResult; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Util; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.blockcreation.AbstractBlockScheduler.BlockCreationTimeResult; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Util; import java.time.Clock; import java.util.List; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMinerExecutorTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutorTest.java similarity index 81% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMinerExecutorTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutorTest.java index ab917aabc5..5c2418bf54 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMinerExecutorTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutorTest.java @@ -10,38 +10,38 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.blockcreation; +package org.hyperledger.besu.consensus.clique.blockcreation; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.config.GenesisConfigOptions; -import tech.pegasys.pantheon.consensus.clique.CliqueBlockHeaderFunctions; -import tech.pegasys.pantheon.consensus.clique.CliqueContext; -import tech.pegasys.pantheon.consensus.clique.CliqueExtraData; -import tech.pegasys.pantheon.consensus.clique.CliqueProtocolSchedule; -import tech.pegasys.pantheon.consensus.common.EpochManager; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.config.GenesisConfigOptions; +import org.hyperledger.besu.consensus.clique.CliqueBlockHeaderFunctions; +import org.hyperledger.besu.consensus.clique.CliqueContext; +import org.hyperledger.besu.consensus.clique.CliqueExtraData; +import org.hyperledger.besu.consensus.clique.CliqueProtocolSchedule; +import org.hyperledger.besu.consensus.common.EpochManager; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Random; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMiningCoordinatorTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMiningCoordinatorTest.java similarity index 90% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMiningCoordinatorTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMiningCoordinatorTest.java index 84789dc86c..f82f137d36 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMiningCoordinatorTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMiningCoordinatorTest.java @@ -10,9 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.blockcreation; +package org.hyperledger.besu.consensus.clique.blockcreation; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -20,24 +21,23 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; - -import tech.pegasys.pantheon.consensus.clique.CliqueContext; -import tech.pegasys.pantheon.consensus.clique.CliqueMiningTracker; -import tech.pegasys.pantheon.consensus.clique.TestHelpers; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; + +import org.hyperledger.besu.consensus.clique.CliqueContext; +import org.hyperledger.besu.consensus.clique.CliqueMiningTracker; +import org.hyperledger.besu.consensus.clique.TestHelpers; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; import java.util.List; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueProposerSelectorTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueProposerSelectorTest.java similarity index 84% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueProposerSelectorTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueProposerSelectorTest.java index 524a22ec09..df39a36098 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueProposerSelectorTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueProposerSelectorTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.blockcreation; +package org.hyperledger.besu.consensus.clique.blockcreation; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; import java.util.Arrays; import java.util.List; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueDifficultyValidationRuleTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueDifficultyValidationRuleTest.java similarity index 71% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueDifficultyValidationRuleTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueDifficultyValidationRuleTest.java index 75e1e075bb..79236e422b 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueDifficultyValidationRuleTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueDifficultyValidationRuleTest.java @@ -10,26 +10,26 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.headervalidationrules; +package org.hyperledger.besu.consensus.clique.headervalidationrules; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.consensus.clique.TestHelpers.createCliqueSignedBlockHeader; - -import tech.pegasys.pantheon.consensus.clique.CliqueContext; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.util.uint.UInt256; + +import org.hyperledger.besu.consensus.clique.CliqueContext; +import org.hyperledger.besu.consensus.clique.TestHelpers; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.util.uint.UInt256; import java.util.List; @@ -66,11 +66,13 @@ public class CliqueDifficultyValidationRuleTest { blockHeaderBuilder.number(IN_TURN_BLOCK_NUMBER - 1L); final BlockHeader parentHeader = - createCliqueSignedBlockHeader(blockHeaderBuilder, proposerKeyPair, validatorList); + TestHelpers.createCliqueSignedBlockHeader( + blockHeaderBuilder, proposerKeyPair, validatorList); blockHeaderBuilder.number(IN_TURN_BLOCK_NUMBER).difficulty(REPORTED_DIFFICULTY); final BlockHeader newBlock = - createCliqueSignedBlockHeader(blockHeaderBuilder, proposerKeyPair, validatorList); + TestHelpers.createCliqueSignedBlockHeader( + blockHeaderBuilder, proposerKeyPair, validatorList); final CliqueDifficultyValidationRule diffValidationRule = new CliqueDifficultyValidationRule(); assertThat(diffValidationRule.validate(newBlock, parentHeader, cliqueProtocolContext)).isTrue(); @@ -83,11 +85,13 @@ public class CliqueDifficultyValidationRuleTest { blockHeaderBuilder.number(OUT_OF_TURN_BLOCK_NUMBER - 1L); final BlockHeader parentHeader = - createCliqueSignedBlockHeader(blockHeaderBuilder, proposerKeyPair, validatorList); + TestHelpers.createCliqueSignedBlockHeader( + blockHeaderBuilder, proposerKeyPair, validatorList); blockHeaderBuilder.number(OUT_OF_TURN_BLOCK_NUMBER).difficulty(REPORTED_DIFFICULTY); final BlockHeader newBlock = - createCliqueSignedBlockHeader(blockHeaderBuilder, proposerKeyPair, validatorList); + TestHelpers.createCliqueSignedBlockHeader( + blockHeaderBuilder, proposerKeyPair, validatorList); final CliqueDifficultyValidationRule diffValidationRule = new CliqueDifficultyValidationRule(); assertThat(diffValidationRule.validate(newBlock, parentHeader, cliqueProtocolContext)).isTrue(); @@ -100,11 +104,13 @@ public class CliqueDifficultyValidationRuleTest { blockHeaderBuilder.number(OUT_OF_TURN_BLOCK_NUMBER - 1L); final BlockHeader parentHeader = - createCliqueSignedBlockHeader(blockHeaderBuilder, proposerKeyPair, validatorList); + TestHelpers.createCliqueSignedBlockHeader( + blockHeaderBuilder, proposerKeyPair, validatorList); blockHeaderBuilder.number(OUT_OF_TURN_BLOCK_NUMBER).difficulty(REPORTED_DIFFICULTY); final BlockHeader newBlock = - createCliqueSignedBlockHeader(blockHeaderBuilder, proposerKeyPair, validatorList); + TestHelpers.createCliqueSignedBlockHeader( + blockHeaderBuilder, proposerKeyPair, validatorList); final CliqueDifficultyValidationRule diffValidationRule = new CliqueDifficultyValidationRule(); assertThat(diffValidationRule.validate(newBlock, parentHeader, cliqueProtocolContext)) @@ -118,11 +124,13 @@ public class CliqueDifficultyValidationRuleTest { blockHeaderBuilder.number(IN_TURN_BLOCK_NUMBER - 1L); final BlockHeader parentHeader = - createCliqueSignedBlockHeader(blockHeaderBuilder, proposerKeyPair, validatorList); + TestHelpers.createCliqueSignedBlockHeader( + blockHeaderBuilder, proposerKeyPair, validatorList); blockHeaderBuilder.number(IN_TURN_BLOCK_NUMBER).difficulty(REPORTED_DIFFICULTY); final BlockHeader newBlock = - createCliqueSignedBlockHeader(blockHeaderBuilder, proposerKeyPair, validatorList); + TestHelpers.createCliqueSignedBlockHeader( + blockHeaderBuilder, proposerKeyPair, validatorList); final CliqueDifficultyValidationRule diffValidationRule = new CliqueDifficultyValidationRule(); assertThat(diffValidationRule.validate(newBlock, parentHeader, cliqueProtocolContext)) diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueExtraDataValidationRuleTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueExtraDataValidationRuleTest.java similarity index 86% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueExtraDataValidationRuleTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueExtraDataValidationRuleTest.java index 4f41176c85..6447d3b003 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueExtraDataValidationRuleTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueExtraDataValidationRuleTest.java @@ -10,27 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.headervalidationrules; +package org.hyperledger.besu.consensus.clique.headervalidationrules; import static org.assertj.core.api.Java6Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.clique.CliqueContext; -import tech.pegasys.pantheon.consensus.clique.CliqueExtraData; -import tech.pegasys.pantheon.consensus.clique.TestHelpers; -import tech.pegasys.pantheon.consensus.common.EpochManager; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.clique.CliqueContext; +import org.hyperledger.besu.consensus.clique.CliqueExtraData; +import org.hyperledger.besu.consensus.clique.TestHelpers; +import org.hyperledger.besu.consensus.common.EpochManager; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/VoteValidationRuleTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/VoteValidationRuleTest.java similarity index 86% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/VoteValidationRuleTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/VoteValidationRuleTest.java index 5c804d0d14..818770cce5 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/VoteValidationRuleTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/VoteValidationRuleTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.headervalidationrules; +package org.hyperledger.besu.consensus.clique.headervalidationrules; import static org.assertj.core.api.Java6Assertions.assertThat; -import tech.pegasys.pantheon.consensus.clique.CliqueBlockInterface; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.consensus.clique.CliqueBlockInterface; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; import java.util.Arrays; import java.util.Collection; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignerMetricsTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignerMetricsTest.java similarity index 91% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignerMetricsTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignerMetricsTest.java index 4ac8ef0447..fcf72adb68 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignerMetricsTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignerMetricsTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; +package org.hyperledger.besu.consensus.clique.jsonrpc.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.AdditionalMatchers.lt; @@ -19,16 +19,16 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.SignerMetricResult; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.SignerMetricResult; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; import java.util.ArrayList; import java.util.Collection; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHashTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHashTest.java similarity index 76% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHashTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHashTest.java index 61899095be..e119876e48 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHashTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHashTest.java @@ -10,31 +10,31 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; +package org.hyperledger.besu.consensus.clique.jsonrpc.methods; import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.ethereum.core.Address.fromHexString; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.core.Address.fromHexString; - -import tech.pegasys.pantheon.consensus.clique.CliqueBlockHeaderFunctions; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.bytes.BytesValue; + +import org.hyperledger.besu.consensus.clique.CliqueBlockHeaderFunctions; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersTest.java similarity index 79% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersTest.java index ea6ca6ccc7..951de9f6de 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersTest.java @@ -10,29 +10,29 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; +package org.hyperledger.besu.consensus.clique.jsonrpc.methods; import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.ethereum.core.Address.fromHexString; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.core.Address.fromHexString; - -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.bytes.BytesValue; + +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueProposalsTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueProposalsTest.java similarity index 83% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueProposalsTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueProposalsTest.java index 0562ce2304..e24a14e77d 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueProposalsTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueProposalsTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; +package org.hyperledger.besu.consensus.clique.jsonrpc.methods; import static org.assertj.core.api.Java6Assertions.assertThat; -import tech.pegasys.pantheon.consensus.common.jsonrpc.AbstractVoteProposerMethod; -import tech.pegasys.pantheon.consensus.common.jsonrpc.AbstractVoteProposerMethodTest; +import org.hyperledger.besu.consensus.common.jsonrpc.AbstractVoteProposerMethod; +import org.hyperledger.besu.consensus.common.jsonrpc.AbstractVoteProposerMethodTest; import org.junit.Before; import org.junit.Test; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/DiscardTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/DiscardTest.java similarity index 84% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/DiscardTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/DiscardTest.java index a121889b03..206e0bd98e 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/DiscardTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/DiscardTest.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; +package org.hyperledger.besu.consensus.clique.jsonrpc.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteType; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteType; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; import java.util.Optional; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/ProposeTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/ProposeTest.java similarity index 87% rename from consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/ProposeTest.java rename to consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/ProposeTest.java index cb55cb8b9d..06320cebab 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/ProposeTest.java +++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/ProposeTest.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; +package org.hyperledger.besu.consensus.clique.jsonrpc.methods; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteType; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteType; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; import java.util.Optional; diff --git a/consensus/common/build.gradle b/consensus/common/build.gradle index 6ddf987667..398007104a 100644 --- a/consensus/common/build.gradle +++ b/consensus/common/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-consensus-common' + baseName 'besu-consensus-common' manifest { attributes( 'Specification-Title': baseName, diff --git a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/BlockInterface.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/BlockInterface.java similarity index 84% rename from consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/BlockInterface.java rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/BlockInterface.java index d2ca818dcd..aee0096a32 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/BlockInterface.java +++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/BlockInterface.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common; +package org.hyperledger.besu.consensus.common; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.Collection; import java.util.Optional; diff --git a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/ConsensusHelpers.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ConsensusHelpers.java similarity index 85% rename from consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/ConsensusHelpers.java rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ConsensusHelpers.java index 1d5a72895c..532f8bb12f 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/ConsensusHelpers.java +++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ConsensusHelpers.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common; +package org.hyperledger.besu.consensus.common; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; public class ConsensusHelpers { diff --git a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/EpochManager.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/EpochManager.java similarity index 95% rename from consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/EpochManager.java rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/EpochManager.java index 1050cca0f0..d706335609 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/EpochManager.java +++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/EpochManager.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common; +package org.hyperledger.besu.consensus.common; public class EpochManager { diff --git a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/ValidatorProvider.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ValidatorProvider.java similarity index 88% rename from consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/ValidatorProvider.java rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ValidatorProvider.java index c9da33aa4a..1db996d713 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/ValidatorProvider.java +++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ValidatorProvider.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common; +package org.hyperledger.besu.consensus.common; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Address; import java.util.Collection; diff --git a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/ValidatorVote.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ValidatorVote.java similarity index 91% rename from consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/ValidatorVote.java rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ValidatorVote.java index 47b8df0d9d..7878039e64 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/ValidatorVote.java +++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ValidatorVote.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common; +package org.hyperledger.besu.consensus.common; import static com.google.common.base.Preconditions.checkNotNull; -import static tech.pegasys.pantheon.consensus.common.VoteType.ADD; +import static org.hyperledger.besu.consensus.common.VoteType.ADD; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Address; import java.util.Objects; diff --git a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteProposer.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteProposer.java similarity index 97% rename from consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteProposer.java rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteProposer.java index ebea214aad..034ee8d46a 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteProposer.java +++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteProposer.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common; +package org.hyperledger.besu.consensus.common; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Address; import java.util.ArrayList; import java.util.Collection; diff --git a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteTally.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTally.java similarity index 97% rename from consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteTally.java rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTally.java index 981a281471..e206023255 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteTally.java +++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTally.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common; +package org.hyperledger.besu.consensus.common; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Address; import java.util.Collection; import java.util.Collections; diff --git a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteTallyCache.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTallyCache.java similarity index 95% rename from consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteTallyCache.java rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTallyCache.java index 472e7b1835..8654303ecb 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteTallyCache.java +++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTallyCache.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common; +package org.hyperledger.besu.consensus.common; import static com.google.common.base.Preconditions.checkNotNull; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.ArrayDeque; import java.util.Deque; diff --git a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteTallyUpdater.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTallyUpdater.java similarity index 92% rename from consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteTallyUpdater.java rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTallyUpdater.java index 7f856d8d7a..1a25a7044b 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteTallyUpdater.java +++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTallyUpdater.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common; +package org.hyperledger.besu.consensus.common; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.Collection; import java.util.Optional; diff --git a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteType.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteType.java similarity index 94% rename from consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteType.java rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteType.java index a7da6e3f21..d66bc1af53 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteType.java +++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteType.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common; +package org.hyperledger.besu.consensus.common; /** * Determines if a validator vote is indicating that they should be added, or removed. This does not diff --git a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/jsonrpc/AbstractGetSignerMetricsMethod.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractGetSignerMetricsMethod.java similarity index 82% rename from consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/jsonrpc/AbstractGetSignerMetricsMethod.java rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractGetSignerMetricsMethod.java index 4a83539351..1b0bb6f402 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/jsonrpc/AbstractGetSignerMetricsMethod.java +++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractGetSignerMetricsMethod.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common.jsonrpc; - -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.SignerMetricResult; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +package org.hyperledger.besu.consensus.common.jsonrpc; + +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.SignerMetricResult; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.ArrayList; import java.util.HashMap; diff --git a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/jsonrpc/AbstractVoteProposerMethod.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethod.java similarity index 75% rename from consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/jsonrpc/AbstractVoteProposerMethod.java rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethod.java index 5001180973..81eed54411 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/jsonrpc/AbstractVoteProposerMethod.java +++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethod.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common.jsonrpc; +package org.hyperledger.besu.consensus.common.jsonrpc; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteType; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteType; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.util.Map; import java.util.stream.Collectors; diff --git a/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteProposerTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteProposerTest.java similarity index 80% rename from consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteProposerTest.java rename to consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteProposerTest.java index 5073bbb3f7..edee7facd7 100644 --- a/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteProposerTest.java +++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteProposerTest.java @@ -10,13 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common; +package org.hyperledger.besu.consensus.common; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.consensus.common.VoteType.ADD; -import static tech.pegasys.pantheon.consensus.common.VoteType.DROP; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Address; import java.util.Arrays; import java.util.Collections; @@ -55,9 +53,9 @@ public class VoteProposerTest { assertThat(proposer.getVote(localAddress, new VoteTally(Collections.emptyList()))).isEmpty(); assertThat(proposer.getVote(localAddress, new VoteTally(Collections.singletonList(a1)))) - .contains(new ValidatorVote(DROP, localAddress, a1)); + .contains(new ValidatorVote(VoteType.DROP, localAddress, a1)); assertThat(proposer.getVote(localAddress, new VoteTally(Arrays.asList(a1, a2, a3)))) - .contains(new ValidatorVote(DROP, localAddress, a1)); + .contains(new ValidatorVote(VoteType.DROP, localAddress, a1)); assertThat(proposer.getVote(localAddress, new VoteTally(Arrays.asList(a2, a3)))).isEmpty(); } @@ -71,12 +69,12 @@ public class VoteProposerTest { proposer.auth(a1); assertThat(proposer.getVote(localAddress, new VoteTally(Collections.emptyList()))) - .contains(new ValidatorVote(ADD, localAddress, a1)); + .contains(new ValidatorVote(VoteType.ADD, localAddress, a1)); assertThat(proposer.getVote(localAddress, new VoteTally(Collections.singletonList(a1)))) .isEmpty(); assertThat(proposer.getVote(localAddress, new VoteTally(Arrays.asList(a1, a2, a3)))).isEmpty(); assertThat(proposer.getVote(localAddress, new VoteTally(Arrays.asList(a2, a3)))) - .contains(new ValidatorVote(ADD, localAddress, a1)); + .contains(new ValidatorVote(VoteType.ADD, localAddress, a1)); } @Test @@ -91,12 +89,12 @@ public class VoteProposerTest { proposer.discard(a2); assertThat(proposer.getVote(localAddress, new VoteTally(Collections.emptyList()))) - .contains(new ValidatorVote(ADD, localAddress, a1)); + .contains(new ValidatorVote(VoteType.ADD, localAddress, a1)); assertThat(proposer.getVote(localAddress, new VoteTally(Collections.singletonList(a1)))) .isEmpty(); assertThat(proposer.getVote(localAddress, new VoteTally(Arrays.asList(a1, a2, a3)))).isEmpty(); assertThat(proposer.getVote(localAddress, new VoteTally(Arrays.asList(a2, a3)))) - .contains(new ValidatorVote(ADD, localAddress, a1)); + .contains(new ValidatorVote(VoteType.ADD, localAddress, a1)); } @Test @@ -111,13 +109,13 @@ public class VoteProposerTest { proposer.auth(a3); assertThat(proposer.getVote(localAddress, new VoteTally(Collections.emptyList()))) - .contains(new ValidatorVote(ADD, localAddress, a2)); + .contains(new ValidatorVote(VoteType.ADD, localAddress, a2)); assertThat(proposer.getVote(localAddress, new VoteTally(Collections.emptyList()))) - .contains(new ValidatorVote(ADD, localAddress, a3)); + .contains(new ValidatorVote(VoteType.ADD, localAddress, a3)); assertThat(proposer.getVote(localAddress, new VoteTally(Collections.emptyList()))) - .contains(new ValidatorVote(ADD, localAddress, a1)); + .contains(new ValidatorVote(VoteType.ADD, localAddress, a1)); assertThat(proposer.getVote(localAddress, new VoteTally(Collections.emptyList()))) - .contains(new ValidatorVote(ADD, localAddress, a2)); + .contains(new ValidatorVote(VoteType.ADD, localAddress, a2)); } @Test @@ -134,13 +132,13 @@ public class VoteProposerTest { proposer.drop(a4); assertThat(proposer.getVote(localAddress, new VoteTally(Collections.emptyList()))) - .contains(new ValidatorVote(ADD, localAddress, a2)); + .contains(new ValidatorVote(VoteType.ADD, localAddress, a2)); assertThat(proposer.getVote(localAddress, new VoteTally(Collections.emptyList()))) - .contains(new ValidatorVote(ADD, localAddress, a3)); + .contains(new ValidatorVote(VoteType.ADD, localAddress, a3)); assertThat(proposer.getVote(localAddress, new VoteTally(Collections.emptyList()))) - .contains(new ValidatorVote(ADD, localAddress, a1)); + .contains(new ValidatorVote(VoteType.ADD, localAddress, a1)); assertThat(proposer.getVote(localAddress, new VoteTally(Collections.emptyList()))) - .contains(new ValidatorVote(ADD, localAddress, a2)); + .contains(new ValidatorVote(VoteType.ADD, localAddress, a2)); } @Test @@ -153,10 +151,10 @@ public class VoteProposerTest { proposer.drop(a1); final VoteTally tally = new VoteTally(Arrays.asList(a2, a3)); - tally.addVote(new ValidatorVote(ADD, localAddress, a1)); + tally.addVote(new ValidatorVote(VoteType.ADD, localAddress, a1)); assertThat(proposer.getVote(localAddress, tally)) - .contains(new ValidatorVote(DROP, localAddress, a1)); + .contains(new ValidatorVote(VoteType.DROP, localAddress, a1)); } @Test @@ -169,10 +167,10 @@ public class VoteProposerTest { proposer.auth(a1); final VoteTally tally = new VoteTally(Arrays.asList(a2, a3)); - tally.addVote(new ValidatorVote(DROP, localAddress, a1)); + tally.addVote(new ValidatorVote(VoteType.DROP, localAddress, a1)); assertThat(proposer.getVote(localAddress, tally)) - .contains(new ValidatorVote(ADD, localAddress, a1)); + .contains(new ValidatorVote(VoteType.ADD, localAddress, a1)); } @Test @@ -183,12 +181,12 @@ public class VoteProposerTest { final Address a3 = Address.fromHexString("3"); final VoteTally tally = new VoteTally(Arrays.asList(a1, a2, a3)); - tally.addVote(new ValidatorVote(ADD, localAddress, a1)); + tally.addVote(new ValidatorVote(VoteType.ADD, localAddress, a1)); proposer.drop(a1); assertThat(proposer.getVote(localAddress, tally)) - .contains(new ValidatorVote(DROP, localAddress, a1)); + .contains(new ValidatorVote(VoteType.DROP, localAddress, a1)); } @Test @@ -199,11 +197,11 @@ public class VoteProposerTest { final Address a3 = Address.fromHexString("3"); final VoteTally tally = new VoteTally(Arrays.asList(a1, a2, a3)); - tally.addVote(new ValidatorVote(DROP, localAddress, a1)); + tally.addVote(new ValidatorVote(VoteType.DROP, localAddress, a1)); proposer.auth(a1); assertThat(proposer.getVote(localAddress, tally)) - .contains(new ValidatorVote(ADD, localAddress, a1)); + .contains(new ValidatorVote(VoteType.ADD, localAddress, a1)); } } diff --git a/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteTallyCacheTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyCacheTest.java similarity index 87% rename from consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteTallyCacheTest.java rename to consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyCacheTest.java index 4193ab8754..914f72fe14 100644 --- a/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteTallyCacheTest.java +++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyCacheTest.java @@ -10,10 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common; +package org.hyperledger.besu.consensus.common; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; @@ -21,18 +22,16 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.consensus.common.VoteType.DROP; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; - -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.bytes.BytesValue; + +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; import java.util.List; @@ -155,10 +154,12 @@ public class VoteTallyCacheTest { final VoteTallyUpdater tallyUpdater = new VoteTallyUpdater(epochManager, blockInterface); when(blockInterface.extractVoteFromHeader(block_1.getHeader())) - .thenReturn(Optional.of(new ValidatorVote(DROP, validators.get(0), validators.get(2)))); + .thenReturn( + Optional.of(new ValidatorVote(VoteType.DROP, validators.get(0), validators.get(2)))); when(blockInterface.extractVoteFromHeader(block_2.getHeader())) - .thenReturn(Optional.of(new ValidatorVote(DROP, validators.get(1), validators.get(2)))); + .thenReturn( + Optional.of(new ValidatorVote(VoteType.DROP, validators.get(1), validators.get(2)))); final VoteTallyCache cache = new VoteTallyCache(blockChain, tallyUpdater, epochManager, blockInterface); diff --git a/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteTallyTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyTest.java similarity index 56% rename from consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteTallyTest.java rename to consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyTest.java index 8595ab59da..4c65cceded 100644 --- a/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteTallyTest.java +++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyTest.java @@ -10,15 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common; +package org.hyperledger.besu.consensus.common; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.consensus.common.VoteType.ADD; -import static tech.pegasys.pantheon.consensus.common.VoteType.DROP; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Address; import org.junit.Test; @@ -38,8 +36,8 @@ public class VoteTallyTest { @Test public void validatorsAreNotAddedBeforeRequiredVoteCountReached() { final VoteTally voteTally = fourValidators(); - voteTally.addVote(new ValidatorVote(ADD, validator1, validator5)); - voteTally.addVote(new ValidatorVote(ADD, validator2, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator1, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator2, validator5)); assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4); @@ -48,9 +46,9 @@ public class VoteTallyTest { @Test public void validatorAddedToListWhenMoreThanHalfOfProposersVoteToAdd() { final VoteTally voteTally = fourValidators(); - voteTally.addVote(new ValidatorVote(ADD, validator1, validator5)); - voteTally.addVote(new ValidatorVote(ADD, validator2, validator5)); - voteTally.addVote(new ValidatorVote(ADD, validator3, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator1, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator2, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator3, validator5)); assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4, validator5); @@ -60,9 +58,9 @@ public class VoteTallyTest { public void validatorsAreAddedInCorrectOrder() { final VoteTally voteTally = new VoteTally(asList(validator1, validator2, validator3, validator5)); - voteTally.addVote(new ValidatorVote(ADD, validator1, validator4)); - voteTally.addVote(new ValidatorVote(ADD, validator2, validator4)); - voteTally.addVote(new ValidatorVote(ADD, validator3, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator1, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator2, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator3, validator4)); assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4, validator5); @@ -71,9 +69,9 @@ public class VoteTallyTest { @Test public void duplicateVotesFromSameProposerAreIgnored() { final VoteTally voteTally = fourValidators(); - voteTally.addVote(new ValidatorVote(ADD, validator1, validator5)); - voteTally.addVote(new ValidatorVote(ADD, validator2, validator5)); - voteTally.addVote(new ValidatorVote(ADD, validator2, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator1, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator2, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator2, validator5)); assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4); @@ -82,10 +80,10 @@ public class VoteTallyTest { @Test public void proposerChangingAddVoteToDropBeforeLimitReachedDiscardsAddVote() { final VoteTally voteTally = fourValidators(); - voteTally.addVote(new ValidatorVote(ADD, validator1, validator5)); - voteTally.addVote(new ValidatorVote(DROP, validator1, validator5)); - voteTally.addVote(new ValidatorVote(ADD, validator2, validator5)); - voteTally.addVote(new ValidatorVote(ADD, validator3, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator1, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator1, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator2, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator3, validator5)); assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4); @@ -94,10 +92,10 @@ public class VoteTallyTest { @Test public void proposerChangingAddVoteToDropAfterLimitReachedPreservesAddVote() { final VoteTally voteTally = fourValidators(); - voteTally.addVote(new ValidatorVote(ADD, validator1, validator5)); - voteTally.addVote(new ValidatorVote(ADD, validator2, validator5)); - voteTally.addVote(new ValidatorVote(ADD, validator3, validator5)); - voteTally.addVote(new ValidatorVote(DROP, validator1, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator1, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator2, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator3, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator1, validator5)); assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4, validator5); @@ -107,23 +105,23 @@ public class VoteTallyTest { public void clearVotesAboutAValidatorWhenItIsAdded() { final VoteTally voteTally = fourValidators(); // Vote to add validator5 - voteTally.addVote(new ValidatorVote(ADD, validator1, validator5)); - voteTally.addVote(new ValidatorVote(ADD, validator2, validator5)); - voteTally.addVote(new ValidatorVote(ADD, validator3, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator1, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator2, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator3, validator5)); assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4, validator5); // Then vote it back out - voteTally.addVote(new ValidatorVote(DROP, validator2, validator5)); - voteTally.addVote(new ValidatorVote(DROP, validator3, validator5)); - voteTally.addVote(new ValidatorVote(DROP, validator4, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator2, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator3, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator4, validator5)); assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4); // And then start voting to add it back in, but validator1's vote should have been discarded - voteTally.addVote(new ValidatorVote(ADD, validator2, validator5)); - voteTally.addVote(new ValidatorVote(ADD, validator3, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator2, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator3, validator5)); assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4); } @@ -131,7 +129,7 @@ public class VoteTallyTest { @Test public void requiresASingleVoteWhenThereIsOnlyOneValidator() { final VoteTally voteTally = new VoteTally(singletonList(validator1)); - voteTally.addVote(new ValidatorVote(ADD, validator1, validator2)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator1, validator2)); assertThat(voteTally.getValidators()).containsExactly(validator1, validator2); } @@ -139,21 +137,21 @@ public class VoteTallyTest { @Test public void requiresTwoVotesWhenThereAreTwoValidators() { final VoteTally voteTally = new VoteTally(asList(validator1, validator2)); - voteTally.addVote(new ValidatorVote(ADD, validator1, validator3)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator1, validator3)); assertThat(voteTally.getValidators()).containsExactly(validator1, validator2); - voteTally.addVote(new ValidatorVote(ADD, validator2, validator3)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator2, validator3)); assertThat(voteTally.getValidators()).containsExactly(validator1, validator2, validator3); } @Test public void resetVotes() { final VoteTally voteTally = fourValidators(); - voteTally.addVote(new ValidatorVote(ADD, validator1, validator5)); - voteTally.addVote(new ValidatorVote(ADD, validator2, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator1, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator2, validator5)); voteTally.discardOutstandingVotes(); - voteTally.addVote(new ValidatorVote(ADD, validator3, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator3, validator5)); assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4); @@ -162,8 +160,8 @@ public class VoteTallyTest { @Test public void validatorsAreNotRemovedBeforeRequiredVoteCountReached() { final VoteTally voteTally = fourValidators(); - voteTally.addVote(new ValidatorVote(DROP, validator1, validator4)); - voteTally.addVote(new ValidatorVote(DROP, validator2, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator1, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator2, validator4)); assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4); @@ -172,9 +170,9 @@ public class VoteTallyTest { @Test public void validatorRemovedFromListWhenMoreThanHalfOfProposersVoteToDrop() { final VoteTally voteTally = fourValidators(); - voteTally.addVote(new ValidatorVote(DROP, validator1, validator4)); - voteTally.addVote(new ValidatorVote(DROP, validator2, validator4)); - voteTally.addVote(new ValidatorVote(DROP, validator3, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator1, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator2, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator3, validator4)); assertThat(voteTally.getValidators()).containsExactly(validator1, validator2, validator3); } @@ -182,9 +180,9 @@ public class VoteTallyTest { @Test public void validatorsAreInCorrectOrderAfterRemoval() { final VoteTally voteTally = new VoteTally(asList(validator1, validator2, validator4)); - voteTally.addVote(new ValidatorVote(DROP, validator1, validator3)); - voteTally.addVote(new ValidatorVote(DROP, validator2, validator3)); - voteTally.addVote(new ValidatorVote(DROP, validator4, validator3)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator1, validator3)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator2, validator3)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator4, validator3)); assertThat(voteTally.getValidators()).containsExactly(validator1, validator2, validator4); } @@ -192,9 +190,9 @@ public class VoteTallyTest { @Test public void duplicateDropVotesFromSameProposerAreIgnored() { final VoteTally voteTally = fourValidators(); - voteTally.addVote(new ValidatorVote(DROP, validator1, validator4)); - voteTally.addVote(new ValidatorVote(DROP, validator2, validator4)); - voteTally.addVote(new ValidatorVote(DROP, validator2, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator1, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator2, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator2, validator4)); assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4); @@ -203,10 +201,10 @@ public class VoteTallyTest { @Test public void proposerChangingDropVoteToAddBeforeLimitReachedDiscardsDropVote() { final VoteTally voteTally = fourValidators(); - voteTally.addVote(new ValidatorVote(DROP, validator1, validator4)); - voteTally.addVote(new ValidatorVote(ADD, validator1, validator4)); - voteTally.addVote(new ValidatorVote(DROP, validator2, validator4)); - voteTally.addVote(new ValidatorVote(DROP, validator3, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator1, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator1, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator2, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator3, validator4)); assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4); @@ -215,10 +213,10 @@ public class VoteTallyTest { @Test public void proposerChangingDropVoteToAddAfterLimitReachedPreservesDropVote() { final VoteTally voteTally = fourValidators(); - voteTally.addVote(new ValidatorVote(DROP, validator1, validator4)); - voteTally.addVote(new ValidatorVote(DROP, validator2, validator4)); - voteTally.addVote(new ValidatorVote(DROP, validator3, validator4)); - voteTally.addVote(new ValidatorVote(ADD, validator1, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator1, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator2, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator3, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator1, validator4)); assertThat(voteTally.getValidators()).containsExactly(validator1, validator2, validator3); } @@ -226,18 +224,18 @@ public class VoteTallyTest { @Test public void removedValidatorsVotesAreDiscarded() { final VoteTally voteTally = fourValidators(); - voteTally.addVote(new ValidatorVote(ADD, validator4, validator5)); - voteTally.addVote(new ValidatorVote(DROP, validator4, validator3)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator4, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator4, validator3)); - voteTally.addVote(new ValidatorVote(DROP, validator1, validator4)); - voteTally.addVote(new ValidatorVote(DROP, validator2, validator4)); - voteTally.addVote(new ValidatorVote(DROP, validator3, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator1, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator2, validator4)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator3, validator4)); assertThat(voteTally.getValidators()).containsExactly(validator1, validator2, validator3); // Now adding only requires 2 votes (>50% of the 3 remaining validators) // but validator4's vote no longer counts - voteTally.addVote(new ValidatorVote(ADD, validator1, validator5)); - voteTally.addVote(new ValidatorVote(DROP, validator1, validator3)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator1, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator1, validator3)); assertThat(voteTally.getValidators()).containsExactly(validator1, validator2, validator3); } @@ -247,23 +245,23 @@ public class VoteTallyTest { final VoteTally voteTally = new VoteTally(asList(validator1, validator2, validator3, validator4, validator5)); // Vote to remove validator5 - voteTally.addVote(new ValidatorVote(DROP, validator1, validator5)); - voteTally.addVote(new ValidatorVote(DROP, validator2, validator5)); - voteTally.addVote(new ValidatorVote(DROP, validator3, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator1, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator2, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator3, validator5)); assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4); // Then vote it back in - voteTally.addVote(new ValidatorVote(ADD, validator2, validator5)); - voteTally.addVote(new ValidatorVote(ADD, validator3, validator5)); - voteTally.addVote(new ValidatorVote(ADD, validator4, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator2, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator3, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator4, validator5)); assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4, validator5); // And then start voting to drop it again, but validator1's vote should have been discarded - voteTally.addVote(new ValidatorVote(DROP, validator2, validator5)); - voteTally.addVote(new ValidatorVote(DROP, validator3, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator2, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator3, validator5)); assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4, validator5); } @@ -271,25 +269,25 @@ public class VoteTallyTest { @Test public void trackMultipleOngoingVotesIndependently() { final VoteTally voteTally = fourValidators(); - voteTally.addVote(new ValidatorVote(ADD, validator1, validator5)); - voteTally.addVote(new ValidatorVote(DROP, validator1, validator3)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator1, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator1, validator3)); - voteTally.addVote(new ValidatorVote(ADD, validator2, validator5)); - voteTally.addVote(new ValidatorVote(DROP, validator2, validator1)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator2, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator2, validator1)); // Neither vote has enough votes to complete. assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4); - voteTally.addVote(new ValidatorVote(ADD, validator3, validator5)); - voteTally.addVote(new ValidatorVote(DROP, validator3, validator1)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator3, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator3, validator1)); // Validator 5 now has 3 votes and is added assertThat(voteTally.getValidators()) .containsExactly(validator1, validator2, validator3, validator4, validator5); - voteTally.addVote(new ValidatorVote(ADD, validator4, validator5)); - voteTally.addVote(new ValidatorVote(DROP, validator4, validator1)); + voteTally.addVote(new ValidatorVote(VoteType.ADD, validator4, validator5)); + voteTally.addVote(new ValidatorVote(VoteType.DROP, validator4, validator1)); // Validator 1 now gets dropped. assertThat(voteTally.getValidators()) diff --git a/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteTallyUpdaterTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyUpdaterTest.java similarity index 88% rename from consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteTallyUpdaterTest.java rename to consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyUpdaterTest.java index 63d3fe3100..97482120b6 100644 --- a/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteTallyUpdaterTest.java +++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyUpdaterTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common; +package org.hyperledger.besu.consensus.common; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; @@ -20,14 +20,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.consensus.common.VoteType.ADD; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.Optional; @@ -53,7 +52,7 @@ public class VoteTallyUpdaterTest { @Test public void voteTallyUpdatedWithAddVote() { when(serialiser.extractVoteFromHeader(any())) - .thenReturn(Optional.of(new ValidatorVote(ADD, proposerAddress, subject))); + .thenReturn(Optional.of(new ValidatorVote(VoteType.ADD, proposerAddress, subject))); final BlockHeaderTestFixture headerBuilder = new BlockHeaderTestFixture(); headerBuilder.number(EPOCH_LENGTH - 1); @@ -61,7 +60,7 @@ public class VoteTallyUpdaterTest { updater.updateForBlock(header, voteTally); - verify(voteTally).addVote(new ValidatorVote(ADD, proposerAddress, subject)); + verify(voteTally).addVote(new ValidatorVote(VoteType.ADD, proposerAddress, subject)); } @Test @@ -122,7 +121,7 @@ public class VoteTallyUpdaterTest { public void addVotesFromBlocksAfterMostRecentEpoch() { when(serialiser.validatorsInBlock(any())).thenReturn(asList(validator1)); when(serialiser.extractVoteFromHeader(any())) - .thenReturn(Optional.of(new ValidatorVote(ADD, proposerAddress, subject))); + .thenReturn(Optional.of(new ValidatorVote(VoteType.ADD, proposerAddress, subject))); final BlockHeaderTestFixture headerBuilder = new BlockHeaderTestFixture(); headerBuilder.number(EPOCH_LENGTH); diff --git a/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java similarity index 81% rename from consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java rename to consensus/common/src/test/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java index b8cb2a3f87..e5f1538360 100644 --- a/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java +++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.consensus.common.jsonrpc; +package org.hyperledger.besu.consensus.common.jsonrpc; import static org.assertj.core.api.Java6Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteType; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteType; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; import com.google.common.collect.ImmutableMap; import org.junit.Test; diff --git a/consensus/ibft/build.gradle b/consensus/ibft/build.gradle index 4a97551f94..d3b928c20a 100644 --- a/consensus/ibft/build.gradle +++ b/consensus/ibft/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-ibft' + baseName 'besu-ibft' manifest { attributes( 'Specification-Title': baseName, diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/IntegrationTestHelpers.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/IntegrationTestHelpers.java similarity index 70% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/IntegrationTestHelpers.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/IntegrationTestHelpers.java index 98ded76169..1135ed366a 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/IntegrationTestHelpers.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/IntegrationTestHelpers.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.support; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockHashing; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.payload.CommitPayload; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.payload.SignedData; -import tech.pegasys.pantheon.consensus.ibft.statemachine.PreparedRoundArtifacts; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Block; +package org.hyperledger.besu.consensus.ibft.support; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftBlockHashing; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.payload.CommitPayload; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.payload.SignedData; +import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Block; import java.util.Optional; import java.util.stream.Collectors; diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/NetworkLayout.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/NetworkLayout.java similarity index 91% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/NetworkLayout.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/NetworkLayout.java index 321e16fc61..5df4d59ea1 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/NetworkLayout.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/NetworkLayout.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.support; +package org.hyperledger.besu.consensus.ibft.support; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Util; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Util; import java.util.ArrayList; import java.util.List; diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/NodeParams.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/NodeParams.java similarity index 85% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/NodeParams.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/NodeParams.java index 58e720448f..d40847b3d6 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/NodeParams.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/NodeParams.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.support; +package org.hyperledger.besu.consensus.ibft.support; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Address; public class NodeParams { private final Address address; diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/RoundSpecificPeers.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/RoundSpecificPeers.java similarity index 86% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/RoundSpecificPeers.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/RoundSpecificPeers.java index 7435198a47..1e4f587028 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/RoundSpecificPeers.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/RoundSpecificPeers.java @@ -10,28 +10,28 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.support; +package org.hyperledger.besu.consensus.ibft.support; import static java.util.Optional.empty; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagedata.CommitMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.IbftV2; -import tech.pegasys.pantheon.consensus.ibft.messagedata.PrepareMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.ProposalMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.RoundChangeMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.IbftMessage; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.consensus.ibft.payload.Payload; -import tech.pegasys.pantheon.consensus.ibft.payload.PreparePayload; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangePayload; -import tech.pegasys.pantheon.consensus.ibft.payload.SignedData; -import tech.pegasys.pantheon.consensus.ibft.statemachine.PreparedRoundArtifacts; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.messagedata.CommitMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; +import org.hyperledger.besu.consensus.ibft.messagedata.PrepareMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.ProposalMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.RoundChangeMessageData; +import org.hyperledger.besu.consensus.ibft.messagewrappers.IbftMessage; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.consensus.ibft.payload.Payload; +import org.hyperledger.besu.consensus.ibft.payload.PreparePayload; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload; +import org.hyperledger.besu.consensus.ibft.payload.SignedData; +import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; import java.util.Arrays; import java.util.Collection; diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/StubValidatorMulticaster.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubValidatorMulticaster.java similarity index 84% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/StubValidatorMulticaster.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubValidatorMulticaster.java index d0cb1f9fe1..b19b5bf59a 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/StubValidatorMulticaster.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubValidatorMulticaster.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.support; +package org.hyperledger.besu.consensus.ibft.support; -import tech.pegasys.pantheon.consensus.ibft.network.ValidatorMulticaster; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.consensus.ibft.network.ValidatorMulticaster; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; import java.util.Collection; import java.util.List; diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/StubbedPeerConnection.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubbedPeerConnection.java similarity index 81% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/StubbedPeerConnection.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubbedPeerConnection.java index de8145b6e0..c99b11a699 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/StubbedPeerConnection.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubbedPeerConnection.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.support; +package org.hyperledger.besu.consensus.ibft.support; import static java.util.Collections.emptyList; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.util.bytes.BytesValue; public class StubbedPeerConnection { diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/StubbedSynchronizerUpdater.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubbedSynchronizerUpdater.java similarity index 87% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/StubbedSynchronizerUpdater.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubbedSynchronizerUpdater.java index 0d5cf714aa..6b273f414e 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/StubbedSynchronizerUpdater.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubbedSynchronizerUpdater.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.support; +package org.hyperledger.besu.consensus.ibft.support; import static java.util.function.Function.identity; -import tech.pegasys.pantheon.consensus.ibft.SynchronizerUpdater; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.consensus.ibft.SynchronizerUpdater; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; import java.util.Collection; import java.util.HashMap; diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/TestContext.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/TestContext.java similarity index 83% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/TestContext.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/TestContext.java index 745945399c..3fa713ac75 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/TestContext.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/TestContext.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.support; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.EventMultiplexer; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.statemachine.IbftController; -import tech.pegasys.pantheon.consensus.ibft.statemachine.IbftFinalState; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +package org.hyperledger.besu.consensus.ibft.support; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.EventMultiplexer; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.statemachine.IbftController; +import org.hyperledger.besu.consensus.ibft.statemachine.IbftFinalState; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.ArrayList; import java.util.List; diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/TestContextBuilder.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/TestContextBuilder.java similarity index 73% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/TestContextBuilder.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/TestContextBuilder.java index 655982a4a1..dedfd56f70 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/TestContextBuilder.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/TestContextBuilder.java @@ -10,67 +10,67 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.support; +package org.hyperledger.besu.consensus.ibft.support; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; import static org.mockito.Mockito.mock; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; - -import tech.pegasys.pantheon.config.StubGenesisConfigOptions; -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.consensus.common.EpochManager; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.consensus.common.VoteTallyUpdater; -import tech.pegasys.pantheon.consensus.ibft.BlockTimer; -import tech.pegasys.pantheon.consensus.ibft.EventMultiplexer; -import tech.pegasys.pantheon.consensus.ibft.Gossiper; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockHeaderFunctions; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockInterface; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.IbftEventQueue; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.consensus.ibft.IbftGossip; -import tech.pegasys.pantheon.consensus.ibft.IbftHelpers; -import tech.pegasys.pantheon.consensus.ibft.IbftProtocolSchedule; -import tech.pegasys.pantheon.consensus.ibft.MessageTracker; -import tech.pegasys.pantheon.consensus.ibft.RoundTimer; -import tech.pegasys.pantheon.consensus.ibft.SynchronizerUpdater; -import tech.pegasys.pantheon.consensus.ibft.UniqueMessageMulticaster; -import tech.pegasys.pantheon.consensus.ibft.blockcreation.IbftBlockCreatorFactory; -import tech.pegasys.pantheon.consensus.ibft.blockcreation.ProposerSelector; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.statemachine.FutureMessageBuffer; -import tech.pegasys.pantheon.consensus.ibft.statemachine.IbftBlockHeightManagerFactory; -import tech.pegasys.pantheon.consensus.ibft.statemachine.IbftController; -import tech.pegasys.pantheon.consensus.ibft.statemachine.IbftFinalState; -import tech.pegasys.pantheon.consensus.ibft.statemachine.IbftRoundFactory; -import tech.pegasys.pantheon.consensus.ibft.validation.MessageValidatorFactory; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MinedBlockObserver; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.Subscribers; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; + +import org.hyperledger.besu.config.StubGenesisConfigOptions; +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.consensus.common.EpochManager; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.consensus.common.VoteTallyUpdater; +import org.hyperledger.besu.consensus.ibft.BlockTimer; +import org.hyperledger.besu.consensus.ibft.EventMultiplexer; +import org.hyperledger.besu.consensus.ibft.Gossiper; +import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions; +import org.hyperledger.besu.consensus.ibft.IbftBlockInterface; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.IbftEventQueue; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.consensus.ibft.IbftGossip; +import org.hyperledger.besu.consensus.ibft.IbftHelpers; +import org.hyperledger.besu.consensus.ibft.IbftProtocolSchedule; +import org.hyperledger.besu.consensus.ibft.MessageTracker; +import org.hyperledger.besu.consensus.ibft.RoundTimer; +import org.hyperledger.besu.consensus.ibft.SynchronizerUpdater; +import org.hyperledger.besu.consensus.ibft.UniqueMessageMulticaster; +import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreatorFactory; +import org.hyperledger.besu.consensus.ibft.blockcreation.ProposerSelector; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.statemachine.FutureMessageBuffer; +import org.hyperledger.besu.consensus.ibft.statemachine.IbftBlockHeightManagerFactory; +import org.hyperledger.besu.consensus.ibft.statemachine.IbftController; +import org.hyperledger.besu.consensus.ibft.statemachine.IbftFinalState; +import org.hyperledger.besu.consensus.ibft.statemachine.IbftRoundFactory; +import org.hyperledger.besu.consensus.ibft.validation.MessageValidatorFactory; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MinedBlockObserver; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.Subscribers; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.time.Clock; import java.time.Instant; @@ -266,7 +266,7 @@ public class TestContextBuilder { IbftProtocolSchedule.create(genesisConfigOptions); ///////////////////////////////////////////////////////////////////////////////////// - // From here down is BASICALLY taken from IbftPantheonController + // From here down is BASICALLY taken from IbftBesuController final EpochManager epochManager = new EpochManager(EPOCH_LENGTH); final BlockInterface blockInterface = new IbftBlockInterface(); @@ -291,7 +291,7 @@ public class TestContextBuilder { final IbftBlockCreatorFactory blockCreatorFactory = new IbftBlockCreatorFactory( (gasLimit) -> gasLimit, - pendingTransactions, // changed from IbftPantheonController + pendingTransactions, // changed from IbftBesuController protocolContext, protocolSchedule, miningParams, @@ -349,7 +349,7 @@ public class TestContextBuilder { synchronizerUpdater); final EventMultiplexer eventMultiplexer = new EventMultiplexer(ibftController); - //////////////////////////// END IBFT PantheonController //////////////////////////// + //////////////////////////// END IBFT BesuController //////////////////////////// return new ControllerAndState(ibftController, finalState, eventMultiplexer); } diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/ValidatorPeer.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/ValidatorPeer.java similarity index 74% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/ValidatorPeer.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/ValidatorPeer.java index 3192861d35..198fc9ca33 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/support/ValidatorPeer.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/ValidatorPeer.java @@ -10,34 +10,34 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.support; +package org.hyperledger.besu.consensus.ibft.support; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.EventMultiplexer; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvents; -import tech.pegasys.pantheon.consensus.ibft.messagedata.CommitMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.PrepareMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.ProposalMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.RoundChangeMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangeCertificate; -import tech.pegasys.pantheon.consensus.ibft.statemachine.PreparedRoundArtifacts; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.DefaultMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.EventMultiplexer; +import org.hyperledger.besu.consensus.ibft.ibftevent.IbftEvents; +import org.hyperledger.besu.consensus.ibft.messagedata.CommitMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.PrepareMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.ProposalMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.RoundChangeMessageData; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; +import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collections; import java.util.List; diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/FutureHeightTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/FutureHeightTest.java similarity index 91% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/FutureHeightTest.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/FutureHeightTest.java index 4561459ce2..2997de74b8 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/FutureHeightTest.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/FutureHeightTest.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.tests; +package org.hyperledger.besu.consensus.ibft.tests; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.util.Lists.emptyList; -import static tech.pegasys.pantheon.consensus.ibft.support.IntegrationTestHelpers.createSignedCommitPayload; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftHelpers; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.NewChainHead; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.support.RoundSpecificPeers; -import tech.pegasys.pantheon.consensus.ibft.support.TestContext; -import tech.pegasys.pantheon.consensus.ibft.support.TestContextBuilder; -import tech.pegasys.pantheon.ethereum.core.Block; +import static org.hyperledger.besu.consensus.ibft.support.IntegrationTestHelpers.createSignedCommitPayload; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftHelpers; +import org.hyperledger.besu.consensus.ibft.ibftevent.NewChainHead; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.support.RoundSpecificPeers; +import org.hyperledger.besu.consensus.ibft.support.TestContext; +import org.hyperledger.besu.consensus.ibft.support.TestContextBuilder; +import org.hyperledger.besu.ethereum.core.Block; import java.time.Clock; import java.time.Instant; diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/FutureRoundTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/FutureRoundTest.java similarity index 88% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/FutureRoundTest.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/FutureRoundTest.java index 84ecf6aba9..0ffc48d324 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/FutureRoundTest.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/FutureRoundTest.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.tests; +package org.hyperledger.besu.consensus.ibft.tests; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftHelpers; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangeCertificate; -import tech.pegasys.pantheon.consensus.ibft.support.RoundSpecificPeers; -import tech.pegasys.pantheon.consensus.ibft.support.TestContext; -import tech.pegasys.pantheon.consensus.ibft.support.TestContextBuilder; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.core.Block; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftHelpers; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; +import org.hyperledger.besu.consensus.ibft.support.RoundSpecificPeers; +import org.hyperledger.besu.consensus.ibft.support.TestContext; +import org.hyperledger.besu.consensus.ibft.support.TestContextBuilder; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.core.Block; import java.time.Clock; import java.time.Instant; diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/GossipTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/GossipTest.java similarity index 83% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/GossipTest.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/GossipTest.java index 131f906e3c..e2d4a65da0 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/GossipTest.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/GossipTest.java @@ -10,27 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.tests; +package org.hyperledger.besu.consensus.ibft.tests; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftHelpers; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.NewChainHead; -import tech.pegasys.pantheon.consensus.ibft.messagedata.ProposalMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangeCertificate; -import tech.pegasys.pantheon.consensus.ibft.support.RoundSpecificPeers; -import tech.pegasys.pantheon.consensus.ibft.support.TestContext; -import tech.pegasys.pantheon.consensus.ibft.support.TestContextBuilder; -import tech.pegasys.pantheon.consensus.ibft.support.ValidatorPeer; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Block; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftHelpers; +import org.hyperledger.besu.consensus.ibft.ibftevent.NewChainHead; +import org.hyperledger.besu.consensus.ibft.messagedata.ProposalMessageData; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; +import org.hyperledger.besu.consensus.ibft.support.RoundSpecificPeers; +import org.hyperledger.besu.consensus.ibft.support.TestContext; +import org.hyperledger.besu.consensus.ibft.support.TestContextBuilder; +import org.hyperledger.besu.consensus.ibft.support.ValidatorPeer; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Block; import java.time.Clock; import java.time.Instant; diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/LocalNodeIsProposerTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/LocalNodeIsProposerTest.java similarity index 83% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/LocalNodeIsProposerTest.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/LocalNodeIsProposerTest.java index ef2677c8de..89432c5c74 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/LocalNodeIsProposerTest.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/LocalNodeIsProposerTest.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.tests; +package org.hyperledger.besu.consensus.ibft.tests; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.consensus.ibft.support.IntegrationTestHelpers.createSignedCommitPayload; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.BlockTimerExpiry; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.support.RoundSpecificPeers; -import tech.pegasys.pantheon.consensus.ibft.support.TestContext; -import tech.pegasys.pantheon.consensus.ibft.support.TestContextBuilder; -import tech.pegasys.pantheon.ethereum.core.Block; +import static org.hyperledger.besu.consensus.ibft.support.IntegrationTestHelpers.createSignedCommitPayload; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.ibftevent.BlockTimerExpiry; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.support.RoundSpecificPeers; +import org.hyperledger.besu.consensus.ibft.support.TestContext; +import org.hyperledger.besu.consensus.ibft.support.TestContextBuilder; +import org.hyperledger.besu.ethereum.core.Block; import java.time.Clock; import java.time.Instant; diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/LocalNodeNotProposerTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/LocalNodeNotProposerTest.java similarity index 89% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/LocalNodeNotProposerTest.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/LocalNodeNotProposerTest.java index 668a643ddc..42e8c1f55e 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/LocalNodeNotProposerTest.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/LocalNodeNotProposerTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.tests; +package org.hyperledger.besu.consensus.ibft.tests; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.consensus.ibft.support.IntegrationTestHelpers.createSignedCommitPayload; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.support.RoundSpecificPeers; -import tech.pegasys.pantheon.consensus.ibft.support.TestContext; -import tech.pegasys.pantheon.consensus.ibft.support.TestContextBuilder; -import tech.pegasys.pantheon.ethereum.core.Block; +import static org.hyperledger.besu.consensus.ibft.support.IntegrationTestHelpers.createSignedCommitPayload; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.support.RoundSpecificPeers; +import org.hyperledger.besu.consensus.ibft.support.TestContext; +import org.hyperledger.besu.consensus.ibft.support.TestContextBuilder; +import org.hyperledger.besu.ethereum.core.Block; import org.junit.Before; import org.junit.Test; diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/ReceivedFutureProposalTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/ReceivedFutureProposalTest.java similarity index 85% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/ReceivedFutureProposalTest.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/ReceivedFutureProposalTest.java index 1ac1f207bc..cc28bd0f88 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/ReceivedFutureProposalTest.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/ReceivedFutureProposalTest.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.tests; - -import static tech.pegasys.pantheon.consensus.ibft.support.IntegrationTestHelpers.createValidPreparedRoundArtifacts; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangeCertificate; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangePayload; -import tech.pegasys.pantheon.consensus.ibft.payload.SignedData; -import tech.pegasys.pantheon.consensus.ibft.statemachine.PreparedRoundArtifacts; -import tech.pegasys.pantheon.consensus.ibft.support.IntegrationTestHelpers; -import tech.pegasys.pantheon.consensus.ibft.support.RoundSpecificPeers; -import tech.pegasys.pantheon.consensus.ibft.support.TestContext; -import tech.pegasys.pantheon.consensus.ibft.support.TestContextBuilder; -import tech.pegasys.pantheon.consensus.ibft.support.ValidatorPeer; -import tech.pegasys.pantheon.ethereum.core.Block; +package org.hyperledger.besu.consensus.ibft.tests; + +import static org.hyperledger.besu.consensus.ibft.support.IntegrationTestHelpers.createValidPreparedRoundArtifacts; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload; +import org.hyperledger.besu.consensus.ibft.payload.SignedData; +import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts; +import org.hyperledger.besu.consensus.ibft.support.IntegrationTestHelpers; +import org.hyperledger.besu.consensus.ibft.support.RoundSpecificPeers; +import org.hyperledger.besu.consensus.ibft.support.TestContext; +import org.hyperledger.besu.consensus.ibft.support.TestContextBuilder; +import org.hyperledger.besu.consensus.ibft.support.ValidatorPeer; +import org.hyperledger.besu.ethereum.core.Block; import java.util.List; diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/RoundChangeTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/RoundChangeTest.java similarity index 91% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/RoundChangeTest.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/RoundChangeTest.java index 55a1f5bd86..3b882c1d17 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/RoundChangeTest.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/RoundChangeTest.java @@ -10,28 +10,28 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.tests; +package org.hyperledger.besu.consensus.ibft.tests; import static java.util.Collections.emptyList; import static java.util.Optional.empty; -import static tech.pegasys.pantheon.consensus.ibft.support.IntegrationTestHelpers.createValidPreparedRoundArtifacts; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftHelpers; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.RoundExpiry; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangeCertificate; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangePayload; -import tech.pegasys.pantheon.consensus.ibft.payload.SignedData; -import tech.pegasys.pantheon.consensus.ibft.statemachine.PreparedRoundArtifacts; -import tech.pegasys.pantheon.consensus.ibft.support.RoundSpecificPeers; -import tech.pegasys.pantheon.consensus.ibft.support.TestContext; -import tech.pegasys.pantheon.consensus.ibft.support.TestContextBuilder; -import tech.pegasys.pantheon.consensus.ibft.support.ValidatorPeer; -import tech.pegasys.pantheon.ethereum.core.Block; +import static org.hyperledger.besu.consensus.ibft.support.IntegrationTestHelpers.createValidPreparedRoundArtifacts; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftHelpers; +import org.hyperledger.besu.consensus.ibft.ibftevent.RoundExpiry; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload; +import org.hyperledger.besu.consensus.ibft.payload.SignedData; +import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts; +import org.hyperledger.besu.consensus.ibft.support.RoundSpecificPeers; +import org.hyperledger.besu.consensus.ibft.support.TestContext; +import org.hyperledger.besu.consensus.ibft.support.TestContextBuilder; +import org.hyperledger.besu.consensus.ibft.support.ValidatorPeer; +import org.hyperledger.besu.ethereum.core.Block; import java.time.Clock; import java.time.Instant; diff --git a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/SpuriousBehaviourTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/SpuriousBehaviourTest.java similarity index 78% rename from consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/SpuriousBehaviourTest.java rename to consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/SpuriousBehaviourTest.java index 653b9b0c90..21e371291d 100644 --- a/consensus/ibft/src/integration-test/java/tech/pegasys/pantheon/consensus/ibft/tests/SpuriousBehaviourTest.java +++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/SpuriousBehaviourTest.java @@ -10,30 +10,30 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.tests; +package org.hyperledger.besu.consensus.ibft.tests; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.consensus.ibft.support.IntegrationTestHelpers.createSignedCommitPayload; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagedata.IbftV2; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.support.NodeParams; -import tech.pegasys.pantheon.consensus.ibft.support.RoundSpecificPeers; -import tech.pegasys.pantheon.consensus.ibft.support.TestContext; -import tech.pegasys.pantheon.consensus.ibft.support.TestContextBuilder; -import tech.pegasys.pantheon.consensus.ibft.support.ValidatorPeer; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import static org.hyperledger.besu.consensus.ibft.support.IntegrationTestHelpers.createSignedCommitPayload; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.support.NodeParams; +import org.hyperledger.besu.consensus.ibft.support.RoundSpecificPeers; +import org.hyperledger.besu.consensus.ibft.support.TestContext; +import org.hyperledger.besu.consensus.ibft.support.TestContextBuilder; +import org.hyperledger.besu.consensus.ibft.support.ValidatorPeer; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.util.bytes.BytesValue; import java.time.Clock; import java.time.Instant; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/BlockTimer.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/BlockTimer.java similarity index 94% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/BlockTimer.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/BlockTimer.java index 636116061f..0b603e332d 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/BlockTimer.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/BlockTimer.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.BlockTimerExpiry; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.consensus.ibft.ibftevent.BlockTimerExpiry; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.time.Clock; import java.util.Optional; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ConsensusRoundIdentifier.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ConsensusRoundIdentifier.java similarity index 95% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ConsensusRoundIdentifier.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ConsensusRoundIdentifier.java index 36e520b55d..fb176ca4e3 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ConsensusRoundIdentifier.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ConsensusRoundIdentifier.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; import java.util.Objects; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/EthSynchronizerUpdater.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/EthSynchronizerUpdater.java similarity index 84% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/EthSynchronizerUpdater.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/EthSynchronizerUpdater.java index f95320c026..f4d97a6160 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/EthSynchronizerUpdater.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/EthSynchronizerUpdater.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; import org.apache.logging.log4j.Logger; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/EventMultiplexer.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/EventMultiplexer.java similarity index 80% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/EventMultiplexer.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/EventMultiplexer.java index 5f43f959d0..2e159ec4a7 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/EventMultiplexer.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/EventMultiplexer.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.BlockTimerExpiry; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvent; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftReceivedMessageEvent; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.NewChainHead; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.RoundExpiry; -import tech.pegasys.pantheon.consensus.ibft.statemachine.IbftController; +import org.hyperledger.besu.consensus.ibft.ibftevent.BlockTimerExpiry; +import org.hyperledger.besu.consensus.ibft.ibftevent.IbftEvent; +import org.hyperledger.besu.consensus.ibft.ibftevent.IbftReceivedMessageEvent; +import org.hyperledger.besu.consensus.ibft.ibftevent.NewChainHead; +import org.hyperledger.besu.consensus.ibft.ibftevent.RoundExpiry; +import org.hyperledger.besu.consensus.ibft.statemachine.IbftController; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/Gossiper.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/Gossiper.java similarity index 85% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/Gossiper.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/Gossiper.java index 8bf984680f..23fd281e28 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/Gossiper.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/Gossiper.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; public interface Gossiper { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHashing.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHashing.java similarity index 90% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHashing.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHashing.java index baa9eb26cf..69fdf0e632 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHashing.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHashing.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.function.Supplier; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHeaderFunctions.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderFunctions.java similarity index 88% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHeaderFunctions.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderFunctions.java index d0a4a14958..000bac35b9 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHeaderFunctions.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderFunctions.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.function.Function; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHeaderValidationRulesetFactory.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderValidationRulesetFactory.java similarity index 65% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHeaderValidationRulesetFactory.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderValidationRulesetFactory.java index c45f8168e0..6e2b7b7efa 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHeaderValidationRulesetFactory.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderValidationRulesetFactory.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.consensus.ibft.headervalidationrules.IbftCoinbaseValidationRule; -import tech.pegasys.pantheon.consensus.ibft.headervalidationrules.IbftCommitSealsValidationRule; -import tech.pegasys.pantheon.consensus.ibft.headervalidationrules.IbftValidatorsValidationRule; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.AncestryValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.ConstantFieldValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.GasUsageValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.TimestampBoundedByFutureParameter; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.TimestampMoreRecentThanParent; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.consensus.ibft.headervalidationrules.IbftCoinbaseValidationRule; +import org.hyperledger.besu.consensus.ibft.headervalidationrules.IbftCommitSealsValidationRule; +import org.hyperledger.besu.consensus.ibft.headervalidationrules.IbftValidatorsValidationRule; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.AncestryValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.ConstantFieldValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasUsageValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampBoundedByFutureParameter; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampMoreRecentThanParent; +import org.hyperledger.besu.util.uint.UInt256; public class IbftBlockHeaderValidationRulesetFactory { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockInterface.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockInterface.java similarity index 82% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockInterface.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockInterface.java index 686b5d6f15..3d6ac62752 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockInterface.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockInterface.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.consensus.common.ValidatorVote; -import tech.pegasys.pantheon.consensus.common.VoteType; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.consensus.common.ValidatorVote; +import org.hyperledger.besu.consensus.common.VoteType; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; import java.util.Collection; import java.util.Optional; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftChainObserver.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftChainObserver.java similarity index 81% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftChainObserver.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftChainObserver.java index fac61bd39e..c34d492a3f 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftChainObserver.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftChainObserver.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.NewChainHead; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedObserver; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; +import org.hyperledger.besu.consensus.ibft.ibftevent.NewChainHead; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.BlockAddedObserver; +import org.hyperledger.besu.ethereum.chain.Blockchain; /** * Blockchain observer that adds {@link NewChainHead} events to the event queue when a new block is diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftContext.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftContext.java similarity index 86% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftContext.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftContext.java index dd1db10b65..4adbbc17ac 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftContext.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftContext.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteTallyCache; /** Holds the IBFT specific mutable state. */ public class IbftContext { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEventQueue.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftEventQueue.java similarity index 95% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEventQueue.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftEventQueue.java index 0260b70e0d..cdf5ebdc38 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEventQueue.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftEventQueue.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvent; +import org.hyperledger.besu.consensus.ibft.ibftevent.IbftEvent; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftExtraData.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftExtraData.java similarity index 91% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftExtraData.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftExtraData.java index 13400b5e0c..9f49714f8b 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftExtraData.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftExtraData.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static com.google.common.base.Preconditions.checkNotNull; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.ParsedExtraData; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.ParsedExtraData; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collection; import java.util.Collections; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftGossip.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftGossip.java similarity index 76% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftGossip.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftGossip.java index d9a0524def..524831880d 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftGossip.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftGossip.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.consensus.ibft.messagedata.CommitMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.IbftV2; -import tech.pegasys.pantheon.consensus.ibft.messagedata.PrepareMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.ProposalMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.RoundChangeMessageData; -import tech.pegasys.pantheon.consensus.ibft.network.ValidatorMulticaster; -import tech.pegasys.pantheon.consensus.ibft.payload.Authored; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.CommitMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; +import org.hyperledger.besu.consensus.ibft.messagedata.PrepareMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.ProposalMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.RoundChangeMessageData; +import org.hyperledger.besu.consensus.ibft.network.ValidatorMulticaster; +import org.hyperledger.besu.consensus.ibft.payload.Authored; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; import java.util.List; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftHelpers.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftHelpers.java similarity index 83% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftHelpers.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftHelpers.java index 33ee311ea5..39a6cfb9ed 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftHelpers.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftHelpers.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.consensus.ibft.payload.PreparedCertificate; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangePayload; -import tech.pegasys.pantheon.consensus.ibft.payload.SignedData; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Util; +import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload; +import org.hyperledger.besu.consensus.ibft.payload.SignedData; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Util; import java.util.Collection; import java.util.Optional; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProcessor.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftProcessor.java similarity index 95% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProcessor.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftProcessor.java index bbf77450d2..d3027881a9 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProcessor.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftProcessor.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvent; +import org.hyperledger.besu.consensus.ibft.ibftevent.IbftEvent; import java.util.Optional; import java.util.concurrent.TimeUnit; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolSchedule.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftProtocolSchedule.java similarity index 75% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolSchedule.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftProtocolSchedule.java index 57f399d6ea..a119316a57 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolSchedule.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftProtocolSchedule.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import static tech.pegasys.pantheon.consensus.ibft.IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator; +import static org.hyperledger.besu.consensus.ibft.IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator; -import tech.pegasys.pantheon.config.GenesisConfigOptions; -import tech.pegasys.pantheon.config.IbftConfigOptions; -import tech.pegasys.pantheon.ethereum.MainnetBlockValidator; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockBodyValidator; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockImporter; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolScheduleBuilder; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpecBuilder; +import org.hyperledger.besu.config.GenesisConfigOptions; +import org.hyperledger.besu.config.IbftConfigOptions; +import org.hyperledger.besu.ethereum.MainnetBlockValidator; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockBodyValidator; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockImporter; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecBuilder; import java.math.BigInteger; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/MessageTracker.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/MessageTracker.java similarity index 88% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/MessageTracker.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/MessageTracker.java index 3603375ef3..72e1a74a0c 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/MessageTracker.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/MessageTracker.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static java.util.Collections.newSetFromMap; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; import java.util.Set; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/RoundTimer.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/RoundTimer.java similarity index 96% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/RoundTimer.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/RoundTimer.java index 50f6a74543..9dbb07d2f4 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/RoundTimer.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/RoundTimer.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.RoundExpiry; +import org.hyperledger.besu.consensus.ibft.ibftevent.RoundExpiry; import java.util.Optional; import java.util.concurrent.ScheduledExecutorService; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/SizeLimitedMap.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/SizeLimitedMap.java similarity index 95% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/SizeLimitedMap.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/SizeLimitedMap.java index bae3a04456..e4900eafae 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/SizeLimitedMap.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/SizeLimitedMap.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import java.util.LinkedHashMap; import java.util.Map.Entry; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/SynchronizerUpdater.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/SynchronizerUpdater.java similarity index 85% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/SynchronizerUpdater.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/SynchronizerUpdater.java index 75180e05ab..416fe90174 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/SynchronizerUpdater.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/SynchronizerUpdater.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; public interface SynchronizerUpdater { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/UniqueMessageMulticaster.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/UniqueMessageMulticaster.java similarity index 89% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/UniqueMessageMulticaster.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/UniqueMessageMulticaster.java index 830607ad2a..24f1c8e761 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/UniqueMessageMulticaster.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/UniqueMessageMulticaster.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.consensus.ibft.network.ValidatorMulticaster; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.consensus.ibft.network.ValidatorMulticaster; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; import java.util.Collection; import java.util.Collections; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/Vote.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/Vote.java similarity index 89% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/Vote.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/Vote.java index 0591caf6c3..78338eab5f 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/Vote.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/Vote.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; -import tech.pegasys.pantheon.consensus.common.VoteType; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.consensus.common.VoteType; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; import java.util.Objects; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreator.java similarity index 70% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreator.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreator.java index e98eb5d440..8a0dc73f63 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreator.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreator.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.blockcreation; +package org.hyperledger.besu.consensus.ibft.blockcreation; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockHeaderFunctions; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.IbftHelpers; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.blockcreation.AbstractBlockCreator; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.SealableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.IbftHelpers; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.blockcreation.AbstractBlockCreator; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.SealableBlockHeader; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; import java.util.function.Function; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreatorFactory.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreatorFactory.java similarity index 80% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreatorFactory.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreatorFactory.java index cff5de54b4..0489aca2cd 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreatorFactory.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreatorFactory.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.blockcreation; - -import tech.pegasys.pantheon.consensus.common.ConsensusHelpers; -import tech.pegasys.pantheon.consensus.common.ValidatorVote; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.consensus.ibft.Vote; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.consensus.ibft.blockcreation; + +import org.hyperledger.besu.consensus.common.ConsensusHelpers; +import org.hyperledger.besu.consensus.common.ValidatorVote; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.consensus.ibft.Vote; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Collections; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftMiningCoordinator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftMiningCoordinator.java similarity index 75% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftMiningCoordinator.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftMiningCoordinator.java index e56054a608..f35c993fd5 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftMiningCoordinator.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftMiningCoordinator.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.blockcreation; +package org.hyperledger.besu.consensus.ibft.blockcreation; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.consensus.ibft.IbftEventQueue; -import tech.pegasys.pantheon.consensus.ibft.IbftProcessor; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.NewChainHead; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedObserver; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.IbftEventQueue; +import org.hyperledger.besu.consensus.ibft.IbftProcessor; +import org.hyperledger.besu.consensus.ibft.ibftevent.NewChainHead; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.BlockAddedObserver; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/ProposerSelector.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/ProposerSelector.java similarity index 93% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/ProposerSelector.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/ProposerSelector.java index 5fd2d23ff8..44e96bdabc 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/ProposerSelector.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/ProposerSelector.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.blockcreation; +package org.hyperledger.besu.consensus.ibft.blockcreation; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.consensus.common.ValidatorProvider; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.consensus.common.ValidatorProvider; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.ArrayList; import java.util.Collection; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRule.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRule.java similarity index 79% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRule.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRule.java index 7281106e3c..5c47dacae6 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRule.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRule.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.headervalidationrules; - -import tech.pegasys.pantheon.consensus.common.ValidatorProvider; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.AttachedBlockHeaderValidationRule; +package org.hyperledger.besu.consensus.ibft.headervalidationrules; + +import org.hyperledger.besu.consensus.common.ValidatorProvider; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule; import java.util.Collection; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRule.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRule.java similarity index 81% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRule.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRule.java index 6e5b5381fe..67f97b4130 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRule.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRule.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.headervalidationrules; +package org.hyperledger.besu.consensus.ibft.headervalidationrules; -import static tech.pegasys.pantheon.consensus.ibft.IbftHelpers.calculateRequiredValidatorQuorum; +import static org.hyperledger.besu.consensus.ibft.IbftHelpers.calculateRequiredValidatorQuorum; -import tech.pegasys.pantheon.consensus.common.ValidatorProvider; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockHashing; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.AttachedBlockHeaderValidationRule; +import org.hyperledger.besu.consensus.common.ValidatorProvider; +import org.hyperledger.besu.consensus.ibft.IbftBlockHashing; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule; import java.util.ArrayList; import java.util.Collection; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftValidatorsValidationRule.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftValidatorsValidationRule.java similarity index 82% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftValidatorsValidationRule.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftValidatorsValidationRule.java index 1617193571..adfd3af1da 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftValidatorsValidationRule.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftValidatorsValidationRule.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.headervalidationrules; +package org.hyperledger.besu.consensus.ibft.headervalidationrules; -import tech.pegasys.pantheon.consensus.common.ValidatorProvider; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.AttachedBlockHeaderValidationRule; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; +import org.hyperledger.besu.consensus.common.ValidatorProvider; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule; +import org.hyperledger.besu.ethereum.rlp.RLPException; import java.util.Collection; import java.util.SortedSet; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftVanityDataValidationRule.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftVanityDataValidationRule.java similarity index 77% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftVanityDataValidationRule.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftVanityDataValidationRule.java index b5e4bd11c9..2dd8be91bb 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftVanityDataValidationRule.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftVanityDataValidationRule.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.headervalidationrules; +package org.hyperledger.besu.consensus.ibft.headervalidationrules; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.AttachedBlockHeaderValidationRule; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/BlockTimerExpiry.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/BlockTimerExpiry.java similarity index 90% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/BlockTimerExpiry.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/BlockTimerExpiry.java index 26b61b13d5..a96b0cde31 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/BlockTimerExpiry.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/BlockTimerExpiry.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.ibftevent; +package org.hyperledger.besu.consensus.ibft.ibftevent; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvents.Type; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.ibftevent.IbftEvents.Type; import java.util.Objects; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/IbftEvent.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/IbftEvent.java similarity index 83% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/IbftEvent.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/IbftEvent.java index ec7e168a21..d7dd673a27 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/IbftEvent.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/IbftEvent.java @@ -10,11 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.ibftevent; - -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvents.Type; +package org.hyperledger.besu.consensus.ibft.ibftevent; /** Category of events that will effect and are interpretable by the Ibft processing mechanism */ public interface IbftEvent { - Type getType(); + IbftEvents.Type getType(); } diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/IbftEvents.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/IbftEvents.java similarity index 88% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/IbftEvents.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/IbftEvents.java index 72eaf1a6bf..99f6bcdada 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/IbftEvents.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/IbftEvents.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.ibftevent; +package org.hyperledger.besu.consensus.ibft.ibftevent; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; /** Static helper functions for producing and working with IbftEvent objects */ public class IbftEvents { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/IbftReceivedMessageEvent.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/IbftReceivedMessageEvent.java similarity index 78% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/IbftReceivedMessageEvent.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/IbftReceivedMessageEvent.java index 854d9b902a..13be17c068 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/IbftReceivedMessageEvent.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/IbftReceivedMessageEvent.java @@ -10,10 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.ibftevent; +package org.hyperledger.besu.consensus.ibft.ibftevent; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvents.Type; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; public class IbftReceivedMessageEvent implements IbftEvent { @@ -28,7 +27,7 @@ public class IbftReceivedMessageEvent implements IbftEvent { } @Override - public Type getType() { - return Type.MESSAGE; + public IbftEvents.Type getType() { + return IbftEvents.Type.MESSAGE; } } diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/NewChainHead.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/NewChainHead.java similarity index 90% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/NewChainHead.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/NewChainHead.java index 25f3115edd..12b4d18660 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/NewChainHead.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/NewChainHead.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.ibftevent; +package org.hyperledger.besu.consensus.ibft.ibftevent; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvents.Type; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.consensus.ibft.ibftevent.IbftEvents.Type; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.Objects; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/RoundExpiry.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/RoundExpiry.java similarity index 86% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/RoundExpiry.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/RoundExpiry.java index 87b6b0afbc..a2f1644aba 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/RoundExpiry.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/ibftevent/RoundExpiry.java @@ -10,10 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.ibftevent; +package org.hyperledger.besu.consensus.ibft.ibftevent; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvents.Type; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; import java.util.Objects; @@ -33,8 +32,8 @@ public final class RoundExpiry implements IbftEvent { } @Override - public Type getType() { - return Type.ROUND_EXPIRY; + public IbftEvents.Type getType() { + return IbftEvents.Type.ROUND_EXPIRY; } public ConsensusRoundIdentifier getView() { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/IbftJsonRpcMethodsFactory.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/IbftJsonRpcMethodsFactory.java similarity index 64% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/IbftJsonRpcMethodsFactory.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/IbftJsonRpcMethodsFactory.java index 1a7d9d027f..8e9649b57a 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/IbftJsonRpcMethodsFactory.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/IbftJsonRpcMethodsFactory.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.jsonrpc; +package org.hyperledger.besu.consensus.ibft.jsonrpc; -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockInterface; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods.IbftDiscardValidatorVote; -import tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods.IbftGetPendingVotes; -import tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods.IbftGetSignerMetrics; -import tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods.IbftGetValidatorsByBlockHash; -import tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods.IbftGetValidatorsByBlockNumber; -import tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods.IbftProposeValidatorVote; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApi; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethodFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.ibft.IbftBlockInterface; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.jsonrpc.methods.IbftDiscardValidatorVote; +import org.hyperledger.besu.consensus.ibft.jsonrpc.methods.IbftGetPendingVotes; +import org.hyperledger.besu.consensus.ibft.jsonrpc.methods.IbftGetSignerMetrics; +import org.hyperledger.besu.consensus.ibft.jsonrpc.methods.IbftGetValidatorsByBlockHash; +import org.hyperledger.besu.consensus.ibft.jsonrpc.methods.IbftGetValidatorsByBlockNumber; +import org.hyperledger.besu.consensus.ibft.jsonrpc.methods.IbftProposeValidatorVote; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethodFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; import java.util.Collection; import java.util.HashMap; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/IbftRpcApis.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/IbftRpcApis.java similarity index 88% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/IbftRpcApis.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/IbftRpcApis.java index 75698fee60..cfc4fdfe3d 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/IbftRpcApis.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/IbftRpcApis.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.jsonrpc; +package org.hyperledger.besu.consensus.ibft.jsonrpc; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApi; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi; import java.util.Optional; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVote.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVote.java similarity index 70% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVote.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVote.java index 0ab2b5d1d2..da6ea5dbd4 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVote.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVote.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods; +package org.hyperledger.besu.consensus.ibft.jsonrpc.methods; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetPendingVotes.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetPendingVotes.java similarity index 71% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetPendingVotes.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetPendingVotes.java index d5b58c83ab..93d6ca9ab8 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetPendingVotes.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetPendingVotes.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods; +package org.hyperledger.besu.consensus.ibft.jsonrpc.methods; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.jsonrpc.AbstractVoteProposerMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.jsonrpc.AbstractVoteProposerMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; public class IbftGetPendingVotes extends AbstractVoteProposerMethod implements JsonRpcMethod { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetSignerMetrics.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetSignerMetrics.java similarity index 65% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetSignerMetrics.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetSignerMetrics.java index fa6beeb9fa..0c14dcdc9d 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetSignerMetrics.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetSignerMetrics.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods; +package org.hyperledger.besu.consensus.ibft.jsonrpc.methods; -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.consensus.common.jsonrpc.AbstractGetSignerMetricsMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.consensus.common.jsonrpc.AbstractGetSignerMetricsMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; public class IbftGetSignerMetrics extends AbstractGetSignerMetricsMethod implements JsonRpcMethod { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHash.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHash.java similarity index 73% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHash.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHash.java index f85f5e80c6..fbaf87b6c4 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHash.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHash.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods; +package org.hyperledger.besu.consensus.ibft.jsonrpc.methods; -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.Optional; import java.util.stream.Collectors; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumber.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumber.java similarity index 73% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumber.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumber.java index 39e44df8ec..3063edf659 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumber.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumber.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods; +package org.hyperledger.besu.consensus.ibft.jsonrpc.methods; -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.AbstractBlockParameterMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.AbstractBlockParameterMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.Optional; import java.util.stream.Collectors; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVote.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVote.java similarity index 71% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVote.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVote.java index 4cae9d5d8c..6f6ec2ea9d 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVote.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVote.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods; - -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteType; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; +package org.hyperledger.besu.consensus.ibft.jsonrpc.methods; + +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteType; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/AbstractIbftMessageData.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/AbstractIbftMessageData.java similarity index 85% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/AbstractIbftMessageData.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/AbstractIbftMessageData.java index ba303089b3..28429803af 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/AbstractIbftMessageData.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/AbstractIbftMessageData.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.messagedata; +package org.hyperledger.besu.consensus.ibft.messagedata; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.AbstractMessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.function.Function; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/CommitMessageData.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/CommitMessageData.java similarity index 83% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/CommitMessageData.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/CommitMessageData.java index dcc7efbf3d..60f75b0a99 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/CommitMessageData.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/CommitMessageData.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.messagedata; +package org.hyperledger.besu.consensus.ibft.messagedata; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.util.bytes.BytesValue; public class CommitMessageData extends AbstractIbftMessageData { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/IbftV2.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/IbftV2.java similarity index 93% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/IbftV2.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/IbftV2.java index d3ab022daa..095958b00f 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/IbftV2.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/IbftV2.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.messagedata; +package org.hyperledger.besu.consensus.ibft.messagedata; /** Message codes for iBFT v2 messages */ public class IbftV2 { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/PrepareMessageData.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/PrepareMessageData.java similarity index 83% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/PrepareMessageData.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/PrepareMessageData.java index ef86308f3f..b383a4fbd7 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/PrepareMessageData.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/PrepareMessageData.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.messagedata; +package org.hyperledger.besu.consensus.ibft.messagedata; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.util.bytes.BytesValue; public class PrepareMessageData extends AbstractIbftMessageData { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/ProposalMessageData.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/ProposalMessageData.java similarity index 83% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/ProposalMessageData.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/ProposalMessageData.java index a8c7e14649..e9dbd5a441 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/ProposalMessageData.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/ProposalMessageData.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.messagedata; +package org.hyperledger.besu.consensus.ibft.messagedata; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.util.bytes.BytesValue; public class ProposalMessageData extends AbstractIbftMessageData { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/RoundChangeMessageData.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/RoundChangeMessageData.java similarity index 84% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/RoundChangeMessageData.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/RoundChangeMessageData.java index 7b480f9ad7..fc982ec9d6 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagedata/RoundChangeMessageData.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/RoundChangeMessageData.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.messagedata; +package org.hyperledger.besu.consensus.ibft.messagedata; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.util.bytes.BytesValue; public class RoundChangeMessageData extends AbstractIbftMessageData { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagewrappers/Commit.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Commit.java similarity index 71% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagewrappers/Commit.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Commit.java index a591a75b0f..366560323e 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagewrappers/Commit.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Commit.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.messagewrappers; +package org.hyperledger.besu.consensus.ibft.messagewrappers; -import tech.pegasys.pantheon.consensus.ibft.payload.CommitPayload; -import tech.pegasys.pantheon.consensus.ibft.payload.SignedData; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.payload.CommitPayload; +import org.hyperledger.besu.consensus.ibft.payload.SignedData; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.BytesValue; public class Commit extends IbftMessage { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagewrappers/IbftMessage.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/IbftMessage.java similarity index 74% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagewrappers/IbftMessage.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/IbftMessage.java index 55787faade..3e2de83796 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagewrappers/IbftMessage.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/IbftMessage.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.messagewrappers; +package org.hyperledger.besu.consensus.ibft.messagewrappers; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.payload.Authored; -import tech.pegasys.pantheon.consensus.ibft.payload.Payload; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundSpecific; -import tech.pegasys.pantheon.consensus.ibft.payload.SignedData; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.payload.Authored; +import org.hyperledger.besu.consensus.ibft.payload.Payload; +import org.hyperledger.besu.consensus.ibft.payload.RoundSpecific; +import org.hyperledger.besu.consensus.ibft.payload.SignedData; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.StringJoiner; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagewrappers/Prepare.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Prepare.java similarity index 73% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagewrappers/Prepare.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Prepare.java index 7e256a79b3..12ab914645 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagewrappers/Prepare.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Prepare.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.messagewrappers; +package org.hyperledger.besu.consensus.ibft.messagewrappers; -import tech.pegasys.pantheon.consensus.ibft.payload.PreparePayload; -import tech.pegasys.pantheon.consensus.ibft.payload.SignedData; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.payload.PreparePayload; +import org.hyperledger.besu.consensus.ibft.payload.SignedData; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.BytesValue; public class Prepare extends IbftMessage { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagewrappers/Proposal.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Proposal.java similarity index 79% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagewrappers/Proposal.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Proposal.java index afd3b444bc..b56b5f2e7c 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagewrappers/Proposal.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Proposal.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.messagewrappers; +package org.hyperledger.besu.consensus.ibft.messagewrappers; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockHeaderFunctions; -import tech.pegasys.pantheon.consensus.ibft.payload.ProposalPayload; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangeCertificate; -import tech.pegasys.pantheon.consensus.ibft.payload.SignedData; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions; +import org.hyperledger.besu.consensus.ibft.payload.ProposalPayload; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; +import org.hyperledger.besu.consensus.ibft.payload.SignedData; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagewrappers/RoundChange.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/RoundChange.java similarity index 76% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagewrappers/RoundChange.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/RoundChange.java index 8b2b1572e5..1a380547e5 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/messagewrappers/RoundChange.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/RoundChange.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.messagewrappers; +package org.hyperledger.besu.consensus.ibft.messagewrappers; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockHeaderFunctions; -import tech.pegasys.pantheon.consensus.ibft.payload.PreparedCertificate; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangePayload; -import tech.pegasys.pantheon.consensus.ibft.payload.SignedData; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions; +import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload; +import org.hyperledger.besu.consensus.ibft.payload.SignedData; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/network/IbftMessageTransmitter.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/IbftMessageTransmitter.java similarity index 69% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/network/IbftMessageTransmitter.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/IbftMessageTransmitter.java index 61871b4042..c963df56f1 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/network/IbftMessageTransmitter.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/IbftMessageTransmitter.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.network; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagedata.CommitMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.PrepareMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.ProposalMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.RoundChangeMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangeCertificate; -import tech.pegasys.pantheon.consensus.ibft.statemachine.PreparedRoundArtifacts; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; +package org.hyperledger.besu.consensus.ibft.network; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.messagedata.CommitMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.PrepareMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.ProposalMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.RoundChangeMessageData; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; +import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.Optional; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/network/PeerConnectionTracker.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/PeerConnectionTracker.java similarity index 85% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/network/PeerConnectionTracker.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/PeerConnectionTracker.java index 694d590d74..2b0dcf3149 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/network/PeerConnectionTracker.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/PeerConnectionTracker.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.network; +package org.hyperledger.besu.consensus.ibft.network; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; public interface PeerConnectionTracker { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/network/ValidatorMulticaster.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/ValidatorMulticaster.java similarity index 81% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/network/ValidatorMulticaster.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/ValidatorMulticaster.java index 640930b296..b8c9c3403c 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/network/ValidatorMulticaster.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/ValidatorMulticaster.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.network; +package org.hyperledger.besu.consensus.ibft.network; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; import java.util.Collection; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/network/ValidatorPeers.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/ValidatorPeers.java similarity index 90% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/network/ValidatorPeers.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/ValidatorPeers.java index 800d751283..028b0d00a8 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/network/ValidatorPeers.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/ValidatorPeers.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.network; +package org.hyperledger.besu.consensus.ibft.network; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; import java.util.Collection; import java.util.Collections; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/Authored.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/Authored.java similarity index 85% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/Authored.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/Authored.java index f57eb59b47..d99828f6e2 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/Authored.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/Authored.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; +package org.hyperledger.besu.consensus.ibft.payload; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Address; public interface Authored { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/CommitPayload.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayload.java similarity index 87% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/CommitPayload.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayload.java index a0776fdbfd..75d10202b9 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/CommitPayload.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayload.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; +package org.hyperledger.besu.consensus.ibft.payload; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagedata.IbftV2; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; import java.util.Objects; import java.util.StringJoiner; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/MessageFactory.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/MessageFactory.java similarity index 77% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/MessageFactory.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/MessageFactory.java index 3204b744f0..94634d8a05 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/MessageFactory.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/MessageFactory.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.consensus.ibft.statemachine.PreparedRoundArtifacts; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.util.bytes.BytesValues; +package org.hyperledger.besu.consensus.ibft.payload; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.util.bytes.BytesValues; import java.util.Optional; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/Payload.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/Payload.java similarity index 75% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/Payload.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/Payload.java index 14bc63b62c..2e2c1d744f 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/Payload.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/Payload.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; +package org.hyperledger.besu.consensus.ibft.payload; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; public interface Payload extends RoundSpecific { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/PreparePayload.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayload.java similarity index 87% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/PreparePayload.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayload.java index 7f2f744de0..1246bf2eef 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/PreparePayload.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayload.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; +package org.hyperledger.besu.consensus.ibft.payload; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagedata.IbftV2; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; import java.util.Objects; import java.util.StringJoiner; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/PreparedCertificate.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificate.java similarity index 94% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/PreparedCertificate.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificate.java index 2781bf3edf..fbc8e47ff5 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/PreparedCertificate.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificate.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; +package org.hyperledger.besu.consensus.ibft.payload; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; import java.util.Collection; import java.util.List; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/ProposalPayload.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayload.java similarity index 87% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/ProposalPayload.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayload.java index 9ca6b2b8f8..4d18d91f83 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/ProposalPayload.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayload.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; +package org.hyperledger.besu.consensus.ibft.payload; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagedata.IbftV2; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; import java.util.Objects; import java.util.StringJoiner; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/RoundChangeCertificate.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificate.java similarity index 92% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/RoundChangeCertificate.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificate.java index 1c22a18686..fcc98d27cf 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/RoundChangeCertificate.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificate.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; +package org.hyperledger.besu.consensus.ibft.payload; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; import java.util.Collection; import java.util.List; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/RoundChangePayload.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayload.java similarity index 91% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/RoundChangePayload.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayload.java index 024390c043..2d94188790 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/RoundChangePayload.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayload.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; +package org.hyperledger.besu.consensus.ibft.payload; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagedata.IbftV2; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; import java.util.Objects; import java.util.Optional; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/RoundSpecific.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundSpecific.java similarity index 84% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/RoundSpecific.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundSpecific.java index 16ce20bca3..eff5e371d0 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/RoundSpecific.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundSpecific.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; +package org.hyperledger.besu.consensus.ibft.payload; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; public interface RoundSpecific { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/SignedData.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/SignedData.java similarity index 90% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/SignedData.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/SignedData.java index ec68e399d5..5f5691c4da 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/payload/SignedData.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/SignedData.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; - -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.consensus.ibft.payload; + +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Objects; import java.util.StringJoiner; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftProtocolManager.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/protocol/IbftProtocolManager.java similarity index 80% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftProtocolManager.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/protocol/IbftProtocolManager.java index 1648c2fdeb..e4132dc6c2 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftProtocolManager.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/protocol/IbftProtocolManager.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.protocol; +package org.hyperledger.besu.consensus.ibft.protocol; -import tech.pegasys.pantheon.consensus.ibft.IbftEventQueue; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvent; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvents; -import tech.pegasys.pantheon.consensus.ibft.network.PeerConnectionTracker; -import tech.pegasys.pantheon.ethereum.p2p.network.ProtocolManager; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.consensus.ibft.IbftEventQueue; +import org.hyperledger.besu.consensus.ibft.ibftevent.IbftEvent; +import org.hyperledger.besu.consensus.ibft.ibftevent.IbftEvents; +import org.hyperledger.besu.consensus.ibft.network.PeerConnectionTracker; +import org.hyperledger.besu.ethereum.p2p.network.ProtocolManager; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; import java.util.Arrays; import java.util.List; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftSubProtocol.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/protocol/IbftSubProtocol.java similarity index 87% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftSubProtocol.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/protocol/IbftSubProtocol.java index 52fa4b5f94..1d68cdd9ab 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftSubProtocol.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/protocol/IbftSubProtocol.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.protocol; +package org.hyperledger.besu.consensus.ibft.protocol; -import tech.pegasys.pantheon.consensus.ibft.messagedata.IbftV2; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.SubProtocol; +import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol; public class IbftSubProtocol implements SubProtocol { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/BlockHeightManager.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/BlockHeightManager.java similarity index 65% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/BlockHeightManager.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/BlockHeightManager.java index 2740033e55..59b3b1319e 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/BlockHeightManager.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/BlockHeightManager.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.RoundExpiry; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +package org.hyperledger.besu.consensus.ibft.statemachine; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.ibftevent.RoundExpiry; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.ethereum.core.BlockHeader; public interface BlockHeightManager { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/FutureMessageBuffer.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/FutureMessageBuffer.java similarity index 96% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/FutureMessageBuffer.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/FutureMessageBuffer.java index a10d2c65b9..074349791e 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/FutureMessageBuffer.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/FutureMessageBuffer.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; +package org.hyperledger.besu.consensus.ibft.statemachine; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; import java.util.ArrayList; import java.util.Collections; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftBlockHeightManager.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManager.java similarity index 87% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftBlockHeightManager.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManager.java index d1e9577d69..e211ae43b1 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftBlockHeightManager.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManager.java @@ -10,26 +10,26 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; - -import static tech.pegasys.pantheon.consensus.ibft.statemachine.IbftBlockHeightManager.MessageAge.CURRENT_ROUND; -import static tech.pegasys.pantheon.consensus.ibft.statemachine.IbftBlockHeightManager.MessageAge.FUTURE_ROUND; -import static tech.pegasys.pantheon.consensus.ibft.statemachine.IbftBlockHeightManager.MessageAge.PRIOR_ROUND; - -import tech.pegasys.pantheon.consensus.ibft.BlockTimer; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.RoundExpiry; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.IbftMessage; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.consensus.ibft.network.IbftMessageTransmitter; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.payload.Payload; -import tech.pegasys.pantheon.consensus.ibft.validation.FutureRoundProposalMessageValidator; -import tech.pegasys.pantheon.consensus.ibft.validation.MessageValidatorFactory; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +package org.hyperledger.besu.consensus.ibft.statemachine; + +import static org.hyperledger.besu.consensus.ibft.statemachine.IbftBlockHeightManager.MessageAge.CURRENT_ROUND; +import static org.hyperledger.besu.consensus.ibft.statemachine.IbftBlockHeightManager.MessageAge.FUTURE_ROUND; +import static org.hyperledger.besu.consensus.ibft.statemachine.IbftBlockHeightManager.MessageAge.PRIOR_ROUND; + +import org.hyperledger.besu.consensus.ibft.BlockTimer; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.ibftevent.RoundExpiry; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.IbftMessage; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.consensus.ibft.network.IbftMessageTransmitter; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.payload.Payload; +import org.hyperledger.besu.consensus.ibft.validation.FutureRoundProposalMessageValidator; +import org.hyperledger.besu.consensus.ibft.validation.MessageValidatorFactory; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.time.Clock; import java.util.Collection; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftBlockHeightManagerFactory.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManagerFactory.java similarity index 88% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftBlockHeightManagerFactory.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManagerFactory.java index a71afd6ec0..ad1226453d 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftBlockHeightManagerFactory.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManagerFactory.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; +package org.hyperledger.besu.consensus.ibft.statemachine; -import tech.pegasys.pantheon.consensus.ibft.IbftHelpers; -import tech.pegasys.pantheon.consensus.ibft.validation.MessageValidatorFactory; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.consensus.ibft.IbftHelpers; +import org.hyperledger.besu.consensus.ibft.validation.MessageValidatorFactory; +import org.hyperledger.besu.ethereum.core.BlockHeader; public class IbftBlockHeightManagerFactory { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftController.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftController.java similarity index 86% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftController.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftController.java index 343701bde1..a4f35b829a 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftController.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftController.java @@ -10,27 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.Gossiper; -import tech.pegasys.pantheon.consensus.ibft.MessageTracker; -import tech.pegasys.pantheon.consensus.ibft.SynchronizerUpdater; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.BlockTimerExpiry; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftReceivedMessageEvent; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.NewChainHead; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.RoundExpiry; -import tech.pegasys.pantheon.consensus.ibft.messagedata.CommitMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.IbftV2; -import tech.pegasys.pantheon.consensus.ibft.messagedata.PrepareMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.ProposalMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.RoundChangeMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.IbftMessage; -import tech.pegasys.pantheon.consensus.ibft.payload.Authored; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; +package org.hyperledger.besu.consensus.ibft.statemachine; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.Gossiper; +import org.hyperledger.besu.consensus.ibft.MessageTracker; +import org.hyperledger.besu.consensus.ibft.SynchronizerUpdater; +import org.hyperledger.besu.consensus.ibft.ibftevent.BlockTimerExpiry; +import org.hyperledger.besu.consensus.ibft.ibftevent.IbftReceivedMessageEvent; +import org.hyperledger.besu.consensus.ibft.ibftevent.NewChainHead; +import org.hyperledger.besu.consensus.ibft.ibftevent.RoundExpiry; +import org.hyperledger.besu.consensus.ibft.messagedata.CommitMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; +import org.hyperledger.besu.consensus.ibft.messagedata.PrepareMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.ProposalMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.RoundChangeMessageData; +import org.hyperledger.besu.consensus.ibft.messagewrappers.IbftMessage; +import org.hyperledger.besu.consensus.ibft.payload.Authored; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; import java.util.function.Consumer; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftFinalState.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftFinalState.java similarity index 77% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftFinalState.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftFinalState.java index 4a9e4af3af..9a64bdf9c0 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftFinalState.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftFinalState.java @@ -10,21 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; - -import static tech.pegasys.pantheon.consensus.ibft.IbftHelpers.calculateRequiredValidatorQuorum; - -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.consensus.ibft.BlockTimer; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.RoundTimer; -import tech.pegasys.pantheon.consensus.ibft.blockcreation.IbftBlockCreatorFactory; -import tech.pegasys.pantheon.consensus.ibft.blockcreation.ProposerSelector; -import tech.pegasys.pantheon.consensus.ibft.network.IbftMessageTransmitter; -import tech.pegasys.pantheon.consensus.ibft.network.ValidatorMulticaster; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Address; +package org.hyperledger.besu.consensus.ibft.statemachine; + +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.consensus.ibft.BlockTimer; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftHelpers; +import org.hyperledger.besu.consensus.ibft.RoundTimer; +import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreatorFactory; +import org.hyperledger.besu.consensus.ibft.blockcreation.ProposerSelector; +import org.hyperledger.besu.consensus.ibft.network.IbftMessageTransmitter; +import org.hyperledger.besu.consensus.ibft.network.ValidatorMulticaster; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Address; import java.time.Clock; import java.util.Collection; @@ -66,7 +65,7 @@ public class IbftFinalState { } public int getQuorum() { - return calculateRequiredValidatorQuorum(getValidators().size()); + return IbftHelpers.calculateRequiredValidatorQuorum(getValidators().size()); } public Collection
getValidators() { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftRound.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRound.java similarity index 83% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftRound.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRound.java index c39ff3eba5..90e5474a3a 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftRound.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRound.java @@ -10,34 +10,34 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockHashing; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockHeaderFunctions; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockInterface; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.consensus.ibft.IbftHelpers; -import tech.pegasys.pantheon.consensus.ibft.RoundTimer; -import tech.pegasys.pantheon.consensus.ibft.blockcreation.IbftBlockCreator; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.network.IbftMessageTransmitter; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangeCertificate; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MinedBlockObserver; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.util.Subscribers; +package org.hyperledger.besu.consensus.ibft.statemachine; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftBlockHashing; +import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions; +import org.hyperledger.besu.consensus.ibft.IbftBlockInterface; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.consensus.ibft.IbftHelpers; +import org.hyperledger.besu.consensus.ibft.RoundTimer; +import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreator; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.network.IbftMessageTransmitter; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MinedBlockObserver; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.util.Subscribers; import java.util.Optional; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftRoundFactory.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRoundFactory.java similarity index 80% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftRoundFactory.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRoundFactory.java index 1ef30d8216..094c2b69b2 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftRoundFactory.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRoundFactory.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; +package org.hyperledger.besu.consensus.ibft.statemachine; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.blockcreation.IbftBlockCreator; -import tech.pegasys.pantheon.consensus.ibft.blockcreation.IbftBlockCreatorFactory; -import tech.pegasys.pantheon.consensus.ibft.validation.MessageValidatorFactory; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MinedBlockObserver; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreator; +import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreatorFactory; +import org.hyperledger.besu.consensus.ibft.validation.MessageValidatorFactory; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MinedBlockObserver; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.util.Subscribers; public class IbftRoundFactory { private final IbftFinalState finalState; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/NoOpBlockHeightManager.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/NoOpBlockHeightManager.java similarity index 73% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/NoOpBlockHeightManager.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/NoOpBlockHeightManager.java index 1df97e9dd4..dc975df035 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/NoOpBlockHeightManager.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/NoOpBlockHeightManager.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.RoundExpiry; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +package org.hyperledger.besu.consensus.ibft.statemachine; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.ibftevent.RoundExpiry; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.ethereum.core.BlockHeader; public class NoOpBlockHeightManager implements BlockHeightManager { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/PreparedRoundArtifacts.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/PreparedRoundArtifacts.java similarity index 79% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/PreparedRoundArtifacts.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/PreparedRoundArtifacts.java index e01ae95a61..98b76397c5 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/PreparedRoundArtifacts.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/PreparedRoundArtifacts.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; +package org.hyperledger.besu.consensus.ibft.statemachine; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.payload.PreparedCertificate; -import tech.pegasys.pantheon.ethereum.core.Block; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate; +import org.hyperledger.besu.ethereum.core.Block; import java.util.Collection; import java.util.stream.Collectors; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundChangeArtifacts.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifacts.java similarity index 85% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundChangeArtifacts.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifacts.java index a3f4742fa5..8d705f23ba 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundChangeArtifacts.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifacts.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; +package org.hyperledger.besu.consensus.ibft.statemachine; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangeCertificate; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangePayload; -import tech.pegasys.pantheon.consensus.ibft.payload.SignedData; -import tech.pegasys.pantheon.ethereum.core.Block; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload; +import org.hyperledger.besu.consensus.ibft.payload.SignedData; +import org.hyperledger.besu.ethereum.core.Block; import java.util.Collection; import java.util.Comparator; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundChangeManager.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeManager.java similarity index 93% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundChangeManager.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeManager.java index edc9f8f38e..b0f3811f62 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundChangeManager.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeManager.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; +package org.hyperledger.besu.consensus.ibft.statemachine; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.consensus.ibft.validation.RoundChangeMessageValidator; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.consensus.ibft.validation.RoundChangeMessageValidator; +import org.hyperledger.besu.ethereum.core.Address; import java.util.Collection; import java.util.Map; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundState.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundState.java similarity index 85% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundState.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundState.java index 1207001383..9ac140a990 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundState.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundState.java @@ -10,17 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; +package org.hyperledger.besu.consensus.ibft.statemachine; -import static tech.pegasys.pantheon.consensus.ibft.IbftHelpers.prepareMessageCountForQuorum; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.validation.MessageValidator; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Block; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftHelpers; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.validation.MessageValidator; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Block; import java.util.Collection; import java.util.Optional; @@ -97,7 +96,7 @@ public class RoundState { private void updateState() { // NOTE: The quorum for Prepare messages is 1 less than the quorum size as the proposer // does not supply a prepare message - final long prepareQuorum = prepareMessageCountForQuorum(quorum); + final long prepareQuorum = IbftHelpers.prepareMessageCountForQuorum(quorum); prepared = (prepareMessages.size() >= prepareQuorum) && proposalMessage.isPresent(); committed = (commitMessages.size() >= quorum) && proposalMessage.isPresent(); LOG.trace( diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/FutureRoundProposalMessageValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/FutureRoundProposalMessageValidator.java similarity index 91% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/FutureRoundProposalMessageValidator.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/FutureRoundProposalMessageValidator.java index dd99af5f8f..21d954372c 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/FutureRoundProposalMessageValidator.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/FutureRoundProposalMessageValidator.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.validation; +package org.hyperledger.besu.consensus.ibft.validation; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.ethereum.core.BlockHeader; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/MessageValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidator.java similarity index 86% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/MessageValidator.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidator.java index 1db1a18bdb..39ce80c23c 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/MessageValidator.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidator.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.validation; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangeCertificate; -import tech.pegasys.pantheon.ethereum.BlockValidator; -import tech.pegasys.pantheon.ethereum.BlockValidator.BlockProcessingOutputs; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; +package org.hyperledger.besu.consensus.ibft.validation; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; +import org.hyperledger.besu.ethereum.BlockValidator; +import org.hyperledger.besu.ethereum.BlockValidator.BlockProcessingOutputs; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; import java.util.Optional; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/MessageValidatorFactory.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidatorFactory.java similarity index 81% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/MessageValidatorFactory.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidatorFactory.java index 83fae657e4..67ae156dcc 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/MessageValidatorFactory.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidatorFactory.java @@ -10,19 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.validation; +package org.hyperledger.besu.consensus.ibft.validation; -import static tech.pegasys.pantheon.consensus.ibft.IbftHelpers.prepareMessageCountForQuorum; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.IbftHelpers; -import tech.pegasys.pantheon.consensus.ibft.blockcreation.ProposerSelector; -import tech.pegasys.pantheon.ethereum.BlockValidator; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.IbftHelpers; +import org.hyperledger.besu.consensus.ibft.blockcreation.ProposerSelector; +import org.hyperledger.besu.ethereum.BlockValidator; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; import java.util.Collection; @@ -83,7 +81,7 @@ public class MessageValidatorFactory { new RoundChangePayloadValidator( (roundIdentifier) -> createSignedDataValidator(roundIdentifier, parentHeader), validators, - prepareMessageCountForQuorum( + IbftHelpers.prepareMessageCountForQuorum( IbftHelpers.calculateRequiredValidatorQuorum(validators.size())), chainHeight), new ProposalBlockConsistencyValidator()); diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/ProposalBlockConsistencyValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidator.java similarity index 84% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/ProposalBlockConsistencyValidator.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidator.java index 47c5c53f6b..9dc5c089dd 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/ProposalBlockConsistencyValidator.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidator.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.validation; +package org.hyperledger.besu.consensus.ibft.validation; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.consensus.ibft.payload.ProposalPayload; -import tech.pegasys.pantheon.consensus.ibft.payload.SignedData; -import tech.pegasys.pantheon.ethereum.core.Block; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.consensus.ibft.payload.ProposalPayload; +import org.hyperledger.besu.consensus.ibft.payload.SignedData; +import org.hyperledger.besu.ethereum.core.Block; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeCertificateValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidator.java similarity index 79% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeCertificateValidator.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidator.java index 30c283a318..240a121178 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeCertificateValidator.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidator.java @@ -10,22 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.validation; - -import static tech.pegasys.pantheon.consensus.ibft.IbftHelpers.findLatestPreparedCertificate; -import static tech.pegasys.pantheon.consensus.ibft.IbftHelpers.prepareMessageCountForQuorum; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockHeaderFunctions; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockInterface; -import tech.pegasys.pantheon.consensus.ibft.IbftHelpers; -import tech.pegasys.pantheon.consensus.ibft.payload.PreparedCertificate; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangeCertificate; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangePayload; -import tech.pegasys.pantheon.consensus.ibft.payload.SignedData; -import tech.pegasys.pantheon.consensus.ibft.validation.RoundChangePayloadValidator.MessageValidatorForHeightFactory; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; +package org.hyperledger.besu.consensus.ibft.validation; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions; +import org.hyperledger.besu.consensus.ibft.IbftBlockInterface; +import org.hyperledger.besu.consensus.ibft.IbftHelpers; +import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload; +import org.hyperledger.besu.consensus.ibft.payload.SignedData; +import org.hyperledger.besu.consensus.ibft.validation.RoundChangePayloadValidator.MessageValidatorForHeightFactory; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; import java.util.Collection; import java.util.Optional; @@ -77,7 +74,10 @@ public class RoundChangeCertificateValidator { final RoundChangePayloadValidator roundChangeValidator = new RoundChangePayloadValidator( - messageValidatorFactory, validators, prepareMessageCountForQuorum(quorum), chainHeight); + messageValidatorFactory, + validators, + IbftHelpers.prepareMessageCountForQuorum(quorum), + chainHeight); if (!roundChangeCert.getRoundChangePayloads().stream() .allMatch(roundChangeValidator::validateRoundChange)) { @@ -107,7 +107,7 @@ public class RoundChangeCertificateValidator { roundChangeCert.getRoundChangePayloads(); final Optional latestPreparedCertificate = - findLatestPreparedCertificate(roundChangePayloads); + IbftHelpers.findLatestPreparedCertificate(roundChangePayloads); if (!latestPreparedCertificate.isPresent()) { LOG.debug( diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeMessageValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeMessageValidator.java similarity index 94% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeMessageValidator.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeMessageValidator.java index b0c04e1c44..a081ceee22 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeMessageValidator.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeMessageValidator.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.validation; +package org.hyperledger.besu.consensus.ibft.validation; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangePayloadValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangePayloadValidator.java similarity index 89% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangePayloadValidator.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangePayloadValidator.java index 6449a21289..c77dfa0735 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangePayloadValidator.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangePayloadValidator.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.validation; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.payload.PreparePayload; -import tech.pegasys.pantheon.consensus.ibft.payload.PreparedCertificate; -import tech.pegasys.pantheon.consensus.ibft.payload.ProposalPayload; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangePayload; -import tech.pegasys.pantheon.consensus.ibft.payload.SignedData; -import tech.pegasys.pantheon.ethereum.core.Address; +package org.hyperledger.besu.consensus.ibft.validation; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.payload.PreparePayload; +import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate; +import org.hyperledger.besu.consensus.ibft.payload.ProposalPayload; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload; +import org.hyperledger.besu.consensus.ibft.payload.SignedData; +import org.hyperledger.besu.ethereum.core.Address; import java.util.Collection; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/SignedDataValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidator.java similarity index 90% rename from consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/SignedDataValidator.java rename to consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidator.java index d15dded489..28f9757ca8 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/SignedDataValidator.java +++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidator.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.validation; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.payload.CommitPayload; -import tech.pegasys.pantheon.consensus.ibft.payload.Payload; -import tech.pegasys.pantheon.consensus.ibft.payload.PreparePayload; -import tech.pegasys.pantheon.consensus.ibft.payload.ProposalPayload; -import tech.pegasys.pantheon.consensus.ibft.payload.SignedData; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Util; +package org.hyperledger.besu.consensus.ibft.validation; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.payload.CommitPayload; +import org.hyperledger.besu.consensus.ibft.payload.Payload; +import org.hyperledger.besu.consensus.ibft.payload.PreparePayload; +import org.hyperledger.besu.consensus.ibft.payload.ProposalPayload; +import org.hyperledger.besu.consensus.ibft.payload.SignedData; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Util; import java.util.Collection; import java.util.Optional; diff --git a/consensus/ibft/src/test-support/java/tech/pegasys/pantheon/consensus/ibft/IbftContextBuilder.java b/consensus/ibft/src/test-support/java/org/hyperledger/besu/consensus/ibft/IbftContextBuilder.java similarity index 84% rename from consensus/ibft/src/test-support/java/tech/pegasys/pantheon/consensus/ibft/IbftContextBuilder.java rename to consensus/ibft/src/test-support/java/org/hyperledger/besu/consensus/ibft/IbftContextBuilder.java index e9c0aea359..52252c8008 100644 --- a/consensus/ibft/src/test-support/java/tech/pegasys/pantheon/consensus/ibft/IbftContextBuilder.java +++ b/consensus/ibft/src/test-support/java/org/hyperledger/besu/consensus/ibft/IbftContextBuilder.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.mockito.Mockito.withSettings; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.ethereum.core.Address; import java.util.Collection; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/BlockTimerTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/BlockTimerTest.java similarity index 96% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/BlockTimerTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/BlockTimerTest.java index 70533ba29a..1a81fab671 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/BlockTimerTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/BlockTimerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -22,10 +22,10 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.BlockTimerExpiry; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvent; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.consensus.ibft.ibftevent.BlockTimerExpiry; +import org.hyperledger.besu.consensus.ibft.ibftevent.IbftEvent; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; import java.time.Clock; import java.util.concurrent.ScheduledExecutorService; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/EthSynchronizerUpdaterTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/EthSynchronizerUpdaterTest.java similarity index 86% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/EthSynchronizerUpdaterTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/EthSynchronizerUpdaterTest.java index 83a01612f6..379a94daf3 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/EthSynchronizerUpdaterTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/EthSynchronizerUpdaterTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -20,10 +20,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.eth.manager.ChainState; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.eth.manager.ChainState; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHashingTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftBlockHashingTest.java similarity index 90% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHashingTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftBlockHashingTest.java index 550f765acd..03591c14e2 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHashingTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftBlockHashingTest.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static java.util.Collections.emptyList; import static org.assertj.core.api.Java6Assertions.assertThat; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.PrivateKey; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogsBloomFilter; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.PrivateKey; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.LogsBloomFilter; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Arrays; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHeaderValidationRulesetFactoryTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderValidationRulesetFactoryTest.java similarity index 94% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHeaderValidationRulesetFactoryTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderValidationRulesetFactoryTest.java index 80649af434..c0e46f6d12 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHeaderValidationRulesetFactoryTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderValidationRulesetFactoryTest.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.consensus.ibft.IbftContextBuilder.setupContextWithValidators; - -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators; + +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Collection; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftChainObserverTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftChainObserverTest.java similarity index 84% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftChainObserverTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftChainObserverTest.java index 3953bc0735..439aaee476 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftChainObserverTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftChainObserverTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; @@ -18,16 +18,16 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvent; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.NewChainHead; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.consensus.ibft.ibftevent.IbftEvent; +import org.hyperledger.besu.consensus.ibft.ibftevent.NewChainHead; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftEventQueueTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftEventQueueTest.java similarity index 93% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftEventQueueTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftEventQueueTest.java index 8fbd40d085..0212cd6d7d 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftEventQueueTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftEventQueueTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvent; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftEvents.Type; +import org.hyperledger.besu.consensus.ibft.ibftevent.IbftEvent; +import org.hyperledger.besu.consensus.ibft.ibftevent.IbftEvents.Type; import java.util.ArrayList; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftExtraDataFixture.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataFixture.java similarity index 89% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftExtraDataFixture.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataFixture.java index 9bad5630cc..08c3b8e14d 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftExtraDataFixture.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataFixture.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static java.util.Collections.emptyList; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftExtraDataTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataTest.java similarity index 97% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftExtraDataTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataTest.java index 9b57e23048..62864ec3c7 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftExtraDataTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.consensus.common.VoteType; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.common.VoteType; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; import java.util.Arrays; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftGossipTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftGossipTest.java similarity index 73% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftGossipTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftGossipTest.java index 6297bb2546..7dd5a9f1ea 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftGossipTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftGossipTest.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static com.google.common.collect.Lists.newArrayList; import static org.mockito.Mockito.verify; -import tech.pegasys.pantheon.consensus.ibft.messagedata.ProposalMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.RoundChangeMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.IbftMessage; -import tech.pegasys.pantheon.consensus.ibft.network.MockPeerFactory; -import tech.pegasys.pantheon.consensus.ibft.network.ValidatorMulticaster; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.DefaultMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.ProposalMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.RoundChangeMessageData; +import org.hyperledger.besu.consensus.ibft.messagewrappers.IbftMessage; +import org.hyperledger.besu.consensus.ibft.network.MockPeerFactory; +import org.hyperledger.besu.consensus.ibft.network.ValidatorMulticaster; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; import java.util.function.Function; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftHelpersTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftHelpersTest.java similarity index 79% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftHelpersTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftHelpersTest.java index 9f43f38e85..60e22af2fb 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftHelpersTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftHelpersTest.java @@ -10,71 +10,71 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.consensus.ibft.IbftHelpers.calculateRequiredValidatorQuorum; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.payload.PreparedCertificate; -import tech.pegasys.pantheon.consensus.ibft.statemachine.PreparedRoundArtifacts; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate; +import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.Optional; import com.google.common.collect.Lists; +import org.assertj.core.api.Assertions; import org.junit.Test; public class IbftHelpersTest { @Test public void calculateRequiredValidatorQuorum1Validator() { - assertThat(calculateRequiredValidatorQuorum(1)).isEqualTo(1); + Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(1)).isEqualTo(1); } @Test public void calculateRequiredValidatorQuorum2Validator() { - assertThat(calculateRequiredValidatorQuorum(2)).isEqualTo(2); + Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(2)).isEqualTo(2); } @Test public void calculateRequiredValidatorQuorum3Validator() { - assertThat(calculateRequiredValidatorQuorum(3)).isEqualTo(2); + Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(3)).isEqualTo(2); } @Test public void calculateRequiredValidatorQuorum4Validator() { - assertThat(calculateRequiredValidatorQuorum(4)).isEqualTo(3); + Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(4)).isEqualTo(3); } @Test public void calculateRequiredValidatorQuorum5Validator() { - assertThat(calculateRequiredValidatorQuorum(5)).isEqualTo(4); + Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(5)).isEqualTo(4); } @Test public void calculateRequiredValidatorQuorum7Validator() { - assertThat(calculateRequiredValidatorQuorum(7)).isEqualTo(5); + Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(7)).isEqualTo(5); } @Test public void calculateRequiredValidatorQuorum10Validator() { - assertThat(calculateRequiredValidatorQuorum(10)).isEqualTo(7); + Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(10)).isEqualTo(7); } @Test public void calculateRequiredValidatorQuorum15Validator() { - assertThat(calculateRequiredValidatorQuorum(15)).isEqualTo(10); + Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(15)).isEqualTo(10); } @Test public void calculateRequiredValidatorQuorum20Validator() { - assertThat(calculateRequiredValidatorQuorum(20)).isEqualTo(14); + Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(20)).isEqualTo(14); } @Test diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftProcessorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftProcessorTest.java similarity index 98% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftProcessorTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftProcessorTest.java index 6229a86be1..3fe6a5f554 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftProcessorTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftProcessorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -22,7 +22,7 @@ import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.RoundExpiry; +import org.hyperledger.besu.consensus.ibft.ibftevent.RoundExpiry; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/MessageTrackerTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/MessageTrackerTest.java similarity index 91% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/MessageTrackerTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/MessageTrackerTest.java index abf61ebfe9..97256abc03 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/MessageTrackerTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/MessageTrackerTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/RoundTimerTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/RoundTimerTest.java similarity index 97% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/RoundTimerTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/RoundTimerTest.java index 68a08daf22..5088c6ccbd 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/RoundTimerTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/RoundTimerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -21,7 +21,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.RoundExpiry; +import org.hyperledger.besu.consensus.ibft.ibftevent.RoundExpiry; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/SizeLimitedMapTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/SizeLimitedMapTest.java similarity index 97% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/SizeLimitedMapTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/SizeLimitedMapTest.java index c6f90dc93d..92a2fb01ba 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/SizeLimitedMapTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/SizeLimitedMapTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static org.assertj.core.api.Assertions.assertThat; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/TestHelpers.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/TestHelpers.java similarity index 80% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/TestHelpers.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/TestHelpers.java index de1fb38f48..2e455ad847 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/TestHelpers.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/TestHelpers.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static java.util.Collections.singletonList; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator.BlockOptions; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; import java.util.Collections; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/UniqueMessageMulticasterTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/UniqueMessageMulticasterTest.java similarity index 89% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/UniqueMessageMulticasterTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/UniqueMessageMulticasterTest.java index a65b2142d3..27d5ed96c9 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/UniqueMessageMulticasterTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/UniqueMessageMulticasterTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static java.util.Collections.emptyList; import static org.mockito.Mockito.mock; @@ -20,11 +20,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.network.ValidatorMulticaster; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.network.ValidatorMulticaster; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/VoteTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/VoteTest.java similarity index 91% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/VoteTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/VoteTest.java index 81f297e86d..b9f6f0c99e 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/VoteTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/VoteTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft; +package org.hyperledger.besu.consensus.ibft; import static org.assertj.core.api.Java6Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Address; import org.junit.Test; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreatorTest.java similarity index 70% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreatorTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreatorTest.java index 31e2a7c6c6..c93564418c 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreatorTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreatorTest.java @@ -10,38 +10,38 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.blockcreation; +package org.hyperledger.besu.consensus.ibft.blockcreation; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.consensus.ibft.IbftContextBuilder.setupContextWithValidators; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; - -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockHashing; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockHeaderValidationRulesetFactory; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.consensus.ibft.IbftProtocolSchedule; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.bytes.BytesValue; + +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.consensus.ibft.IbftBlockHashing; +import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderValidationRulesetFactory; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.consensus.ibft.IbftProtocolSchedule; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collections; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftMiningCoordinatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftMiningCoordinatorTest.java similarity index 83% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftMiningCoordinatorTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftMiningCoordinatorTest.java index acab58aeb0..fd2c24da6f 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftMiningCoordinatorTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftMiningCoordinatorTest.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.blockcreation; +package org.hyperledger.besu.consensus.ibft.blockcreation; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.IbftEventQueue; -import tech.pegasys.pantheon.consensus.ibft.IbftProcessor; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.NewChainHead; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.IbftEventQueue; +import org.hyperledger.besu.consensus.ibft.IbftProcessor; +import org.hyperledger.besu.consensus.ibft.ibftevent.NewChainHead; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.concurrent.TimeUnit; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/ProposerSelectorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/ProposerSelectorTest.java similarity index 94% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/ProposerSelectorTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/ProposerSelectorTest.java index 3ed50210fa..66116553dc 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/ProposerSelectorTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/ProposerSelectorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.blockcreation; +package org.hyperledger.besu.consensus.ibft.blockcreation; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -18,14 +18,14 @@ import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; import java.util.Collection; import java.util.LinkedList; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/HeaderValidationTestHelpers.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/HeaderValidationTestHelpers.java similarity index 75% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/HeaderValidationTestHelpers.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/HeaderValidationTestHelpers.java index 28f571f4a5..9012d9ccdc 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/HeaderValidationTestHelpers.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/HeaderValidationTestHelpers.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.headervalidationrules; +package org.hyperledger.besu.consensus.ibft.headervalidationrules; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraDataFixture; -import tech.pegasys.pantheon.consensus.ibft.Vote; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.consensus.ibft.IbftExtraDataFixture; +import org.hyperledger.besu.consensus.ibft.Vote; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRuleTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRuleTest.java similarity index 80% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRuleTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRuleTest.java index 2d70e38502..8b87a654cc 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRuleTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRuleTest.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.headervalidationrules; +package org.hyperledger.besu.consensus.ibft.headervalidationrules; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.consensus.ibft.IbftContextBuilder.setupContextWithValidators; - -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraDataFixture; -import tech.pegasys.pantheon.consensus.ibft.Vote; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators; + +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.consensus.ibft.IbftExtraDataFixture; +import org.hyperledger.besu.consensus.ibft.Vote; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRuleTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRuleTest.java similarity index 90% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRuleTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRuleTest.java index ed6da5d980..36f41338d6 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRuleTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRuleTest.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.headervalidationrules; +package org.hyperledger.besu.consensus.ibft.headervalidationrules; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.consensus.ibft.IbftContextBuilder.setupContextWithValidators; -import static tech.pegasys.pantheon.consensus.ibft.headervalidationrules.HeaderValidationTestHelpers.createProposedBlockHeader; - -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Util; +import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators; +import static org.hyperledger.besu.consensus.ibft.headervalidationrules.HeaderValidationTestHelpers.createProposedBlockHeader; + +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Util; import java.util.Collections; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftValidatorsValidationRuleTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftValidatorsValidationRuleTest.java similarity index 75% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftValidatorsValidationRuleTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftValidatorsValidationRuleTest.java index 51147542ab..da2581f95f 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftValidatorsValidationRuleTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftValidatorsValidationRuleTest.java @@ -10,18 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.headervalidationrules; +package org.hyperledger.besu.consensus.ibft.headervalidationrules; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.consensus.ibft.IbftContextBuilder.setupContextWithValidators; -import static tech.pegasys.pantheon.consensus.ibft.headervalidationrules.HeaderValidationTestHelpers.createProposedBlockHeader; +import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.List; @@ -42,7 +41,8 @@ public class IbftValidatorsValidationRuleTest { final ProtocolContext context = new ProtocolContext<>(null, null, setupContextWithValidators(validators)); - final BlockHeader header = createProposedBlockHeader(validators, emptyList(), false); + final BlockHeader header = + HeaderValidationTestHelpers.createProposedBlockHeader(validators, emptyList(), false); assertThat(validatorsValidationRule.validate(header, null, context)).isTrue(); } @@ -58,7 +58,8 @@ public class IbftValidatorsValidationRuleTest { new ProtocolContext<>(null, null, setupContextWithValidators(validators)); final BlockHeader header = - createProposedBlockHeader(Lists.reverse(validators), emptyList(), false); + HeaderValidationTestHelpers.createProposedBlockHeader( + Lists.reverse(validators), emptyList(), false); assertThat(validatorsValidationRule.validate(header, null, context)).isFalse(); } @@ -76,7 +77,9 @@ public class IbftValidatorsValidationRuleTest { final ProtocolContext context = new ProtocolContext<>(null, null, setupContextWithValidators(storedValidators)); - final BlockHeader header = createProposedBlockHeader(reportedValidators, emptyList(), false); + final BlockHeader header = + HeaderValidationTestHelpers.createProposedBlockHeader( + reportedValidators, emptyList(), false); assertThat(validatorsValidationRule.validate(header, null, context)).isFalse(); } diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftVanityDataValidationRuleTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftVanityDataValidationRuleTest.java similarity index 83% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftVanityDataValidationRuleTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftVanityDataValidationRuleTest.java index 43e32bb9b3..3059163602 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftVanityDataValidationRuleTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftVanityDataValidationRuleTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.headervalidationrules; +package org.hyperledger.besu.consensus.ibft.headervalidationrules; import static java.util.Collections.emptyList; import static java.util.Optional.empty; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVoteTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVoteTest.java similarity index 81% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVoteTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVoteTest.java index 8469207185..8439bb8ffa 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVoteTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVoteTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods; +package org.hyperledger.besu.consensus.ibft.jsonrpc.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; import org.junit.Before; import org.junit.Rule; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetPendingVotesTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetPendingVotesTest.java similarity index 84% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetPendingVotesTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetPendingVotesTest.java index 8a21b388af..d6b85b26ec 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetPendingVotesTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetPendingVotesTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods; +package org.hyperledger.besu.consensus.ibft.jsonrpc.methods; import static org.assertj.core.api.Java6Assertions.assertThat; -import tech.pegasys.pantheon.consensus.common.jsonrpc.AbstractVoteProposerMethod; -import tech.pegasys.pantheon.consensus.common.jsonrpc.AbstractVoteProposerMethodTest; +import org.hyperledger.besu.consensus.common.jsonrpc.AbstractVoteProposerMethod; +import org.hyperledger.besu.consensus.common.jsonrpc.AbstractVoteProposerMethodTest; import org.junit.Before; import org.junit.Test; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetSignerMetricsTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetSignerMetricsTest.java similarity index 91% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetSignerMetricsTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetSignerMetricsTest.java index 4f781bcb65..65d97463ac 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetSignerMetricsTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetSignerMetricsTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods; +package org.hyperledger.besu.consensus.ibft.jsonrpc.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.AdditionalMatchers.lt; @@ -19,16 +19,16 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.SignerMetricResult; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.SignerMetricResult; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; import java.util.ArrayList; import java.util.Collection; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHashTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHashTest.java similarity index 80% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHashTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHashTest.java index 8990debeac..bd38216efd 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHashTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHashTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods; +package org.hyperledger.besu.consensus.ibft.jsonrpc.methods; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockInterface; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.consensus.ibft.IbftBlockInterface; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.Collections; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumberTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumberTest.java similarity index 80% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumberTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumberTest.java index 6fb45e6979..0a94d4f4c0 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumberTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumberTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods; +package org.hyperledger.besu.consensus.ibft.jsonrpc.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockInterface; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.consensus.ibft.IbftBlockInterface; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.Collections; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVoteTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVoteTest.java similarity index 86% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVoteTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVoteTest.java index b163e0c21b..151854902e 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVoteTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVoteTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods; +package org.hyperledger.besu.consensus.ibft.jsonrpc.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import tech.pegasys.pantheon.consensus.common.VoteProposer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.consensus.common.VoteProposer; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; import org.junit.Before; import org.junit.Rule; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/messagedata/CommitMessageTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/CommitMessageTest.java similarity index 91% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/messagedata/CommitMessageTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/CommitMessageTest.java index bc0ab5b591..6f1f74111e 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/messagedata/CommitMessageTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/CommitMessageTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.messagedata; +package org.hyperledger.besu.consensus.ibft.messagedata; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/messagedata/PrepareMessageTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/PrepareMessageTest.java similarity index 91% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/messagedata/PrepareMessageTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/PrepareMessageTest.java index e1544b4a48..f998085e8b 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/messagedata/PrepareMessageTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/PrepareMessageTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.messagedata; +package org.hyperledger.besu.consensus.ibft.messagedata; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/messagedata/ProposalMessageTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/ProposalMessageTest.java similarity index 91% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/messagedata/ProposalMessageTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/ProposalMessageTest.java index 0f51a1591b..2ce8c1d792 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/messagedata/ProposalMessageTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/ProposalMessageTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.messagedata; +package org.hyperledger.besu.consensus.ibft.messagedata; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/messagedata/RoundChangeMessageTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/RoundChangeMessageTest.java similarity index 91% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/messagedata/RoundChangeMessageTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/RoundChangeMessageTest.java index f008898fb4..e36c155730 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/messagedata/RoundChangeMessageTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/RoundChangeMessageTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.messagedata; +package org.hyperledger.besu.consensus.ibft.messagedata; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/network/MockPeerFactory.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/network/MockPeerFactory.java similarity index 82% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/network/MockPeerFactory.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/network/MockPeerFactory.java index a47d0a8c55..179f96e221 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/network/MockPeerFactory.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/network/MockPeerFactory.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.network; +package org.hyperledger.besu.consensus.ibft.network; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; public class MockPeerFactory { diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/network/ValidatorPeersTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/network/ValidatorPeersTest.java similarity index 90% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/network/ValidatorPeersTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/network/ValidatorPeersTest.java index 4125b7423b..d4605d5135 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/network/ValidatorPeersTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/network/ValidatorPeersTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.network; +package org.hyperledger.besu.consensus.ibft.network; import static com.google.common.collect.Lists.newArrayList; import static org.mockito.ArgumentMatchers.any; @@ -20,17 +20,17 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.crypto.SECP256K1.PublicKey; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.crypto.SECP256K1.PublicKey; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/CommitPayloadTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayloadTest.java similarity index 78% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/CommitPayloadTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayloadTest.java index 9d83320233..9da8f47cae 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/CommitPayloadTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayloadTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; +package org.hyperledger.besu.consensus.ibft.payload; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagedata.IbftV2; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; import java.math.BigInteger; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/PreparePayloadTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayloadTest.java similarity index 78% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/PreparePayloadTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayloadTest.java index 5201fead9c..9a42acd1d8 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/PreparePayloadTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayloadTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; +package org.hyperledger.besu.consensus.ibft.payload; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagedata.IbftV2; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/PreparedCertificateTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificateTest.java similarity index 85% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/PreparedCertificateTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificateTest.java index 2f9c086f2d..98f439dbec 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/PreparedCertificateTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificateTest.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; +package org.hyperledger.besu.consensus.ibft.payload; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.TestHelpers; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.TestHelpers; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; import java.math.BigInteger; import java.util.Collections; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/ProposalPayloadTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayloadTest.java similarity index 76% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/ProposalPayloadTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayloadTest.java index cbd2f7fbed..df8feed949 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/ProposalPayloadTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayloadTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; +package org.hyperledger.besu.consensus.ibft.payload; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.TestHelpers; -import tech.pegasys.pantheon.consensus.ibft.messagedata.IbftV2; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.TestHelpers; +import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; import org.junit.Test; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/RoundChangeCertificateTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificateTest.java similarity index 83% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/RoundChangeCertificateTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificateTest.java index d5f12d22e9..b0ef89e184 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/RoundChangeCertificateTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificateTest.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; +package org.hyperledger.besu.consensus.ibft.payload; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.TestHelpers; -import tech.pegasys.pantheon.consensus.ibft.messagedata.IbftV2; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.TestHelpers; +import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; import java.math.BigInteger; import java.util.Optional; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/RoundChangePayloadTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayloadTest.java similarity index 87% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/RoundChangePayloadTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayloadTest.java index 91f8a00be5..bf45ebff3c 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/payload/RoundChangePayloadTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayloadTest.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.payload; +package org.hyperledger.besu.consensus.ibft.payload; import static java.util.Collections.singletonList; import static java.util.Optional.empty; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.TestHelpers; -import tech.pegasys.pantheon.consensus.ibft.messagedata.IbftV2; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.TestHelpers; +import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; import java.math.BigInteger; import java.util.Collections; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftSubProtocolTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/protocol/IbftSubProtocolTest.java similarity index 96% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftSubProtocolTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/protocol/IbftSubProtocolTest.java index b969560aef..48e5ff79c4 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftSubProtocolTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/protocol/IbftSubProtocolTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.protocol; +package org.hyperledger.besu.consensus.ibft.protocol; import static org.assertj.core.api.Assertions.assertThat; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/FutureMessageBufferTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/FutureMessageBufferTest.java similarity index 92% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/FutureMessageBufferTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/FutureMessageBufferTest.java index e018c19952..d6121a1c09 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/FutureMessageBufferTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/FutureMessageBufferTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; +package org.hyperledger.besu.consensus.ibft.statemachine; import static java.util.Arrays.copyOfRange; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.consensus.ibft.network.MockPeerFactory; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.DefaultMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.ibft.network.MockPeerFactory; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.stream.Collectors; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftBlockHeightManagerTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManagerTest.java similarity index 86% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftBlockHeightManagerTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManagerTest.java index 4aa6cfb38c..cd9d2bce3a 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftBlockHeightManagerTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManagerTest.java @@ -10,11 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; +package org.hyperledger.besu.consensus.ibft.statemachine; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators; +import static org.hyperledger.besu.consensus.ibft.TestHelpers.createFrom; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; @@ -25,39 +27,37 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.consensus.ibft.IbftContextBuilder.setupContextWithValidators; -import static tech.pegasys.pantheon.consensus.ibft.TestHelpers.createFrom; - -import tech.pegasys.pantheon.consensus.ibft.BlockTimer; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.consensus.ibft.RoundTimer; -import tech.pegasys.pantheon.consensus.ibft.blockcreation.IbftBlockCreator; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.RoundExpiry; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.consensus.ibft.network.IbftMessageTransmitter; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangeCertificate; -import tech.pegasys.pantheon.consensus.ibft.validation.FutureRoundProposalMessageValidator; -import tech.pegasys.pantheon.consensus.ibft.validation.MessageValidator; -import tech.pegasys.pantheon.consensus.ibft.validation.MessageValidatorFactory; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.util.Subscribers; -import tech.pegasys.pantheon.util.bytes.BytesValue; + +import org.hyperledger.besu.consensus.ibft.BlockTimer; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.consensus.ibft.RoundTimer; +import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreator; +import org.hyperledger.besu.consensus.ibft.ibftevent.RoundExpiry; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.consensus.ibft.network.IbftMessageTransmitter; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; +import org.hyperledger.besu.consensus.ibft.validation.FutureRoundProposalMessageValidator; +import org.hyperledger.besu.consensus.ibft.validation.MessageValidator; +import org.hyperledger.besu.consensus.ibft.validation.MessageValidatorFactory; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.util.Subscribers; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; import java.time.Clock; @@ -66,6 +66,7 @@ import java.util.List; import java.util.Optional; import com.google.common.collect.Lists; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -352,7 +353,7 @@ public class IbftBlockHeightManagerTest { .multicastRoundChange(eq(nextRound), preparedRoundArtifactsCaptor.capture()); final Optional preparedCert = preparedRoundArtifactsCaptor.getValue(); - assertThat(preparedCert).isNotEmpty(); + Assertions.assertThat(preparedCert).isNotEmpty(); assertThat(preparedCert.get().getPreparedCertificate().getPreparePayloads()) .containsOnly(firstPrepare.getSignedPayload(), secondPrepare.getSignedPayload()); diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftControllerTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftControllerTest.java similarity index 91% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftControllerTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftControllerTest.java index e8a68cadc7..7e4861bccb 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftControllerTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftControllerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; +package org.hyperledger.besu.consensus.ibft.statemachine; import static org.assertj.core.util.Lists.emptyList; import static org.assertj.core.util.Lists.newArrayList; @@ -24,29 +24,29 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.EthSynchronizerUpdater; -import tech.pegasys.pantheon.consensus.ibft.IbftGossip; -import tech.pegasys.pantheon.consensus.ibft.MessageTracker; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.BlockTimerExpiry; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.IbftReceivedMessageEvent; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.NewChainHead; -import tech.pegasys.pantheon.consensus.ibft.ibftevent.RoundExpiry; -import tech.pegasys.pantheon.consensus.ibft.messagedata.CommitMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.IbftV2; -import tech.pegasys.pantheon.consensus.ibft.messagedata.PrepareMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.ProposalMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagedata.RoundChangeMessageData; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.DefaultMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.EthSynchronizerUpdater; +import org.hyperledger.besu.consensus.ibft.IbftGossip; +import org.hyperledger.besu.consensus.ibft.MessageTracker; +import org.hyperledger.besu.consensus.ibft.ibftevent.BlockTimerExpiry; +import org.hyperledger.besu.consensus.ibft.ibftevent.IbftReceivedMessageEvent; +import org.hyperledger.besu.consensus.ibft.ibftevent.NewChainHead; +import org.hyperledger.besu.consensus.ibft.ibftevent.RoundExpiry; +import org.hyperledger.besu.consensus.ibft.messagedata.CommitMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2; +import org.hyperledger.besu.consensus.ibft.messagedata.PrepareMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.ProposalMessageData; +import org.hyperledger.besu.consensus.ibft.messagedata.RoundChangeMessageData; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftRoundTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRoundTest.java similarity index 90% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftRoundTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRoundTest.java index b596a7cad4..68e6f636e8 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftRoundTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRoundTest.java @@ -10,11 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; +package org.hyperledger.besu.consensus.ibft.statemachine; import static java.util.Collections.emptyList; import static java.util.Optional.empty; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; @@ -22,33 +23,32 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.consensus.ibft.IbftContextBuilder.setupContextWithValidators; - -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockHashing; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; -import tech.pegasys.pantheon.consensus.ibft.RoundTimer; -import tech.pegasys.pantheon.consensus.ibft.blockcreation.IbftBlockCreator; -import tech.pegasys.pantheon.consensus.ibft.network.IbftMessageTransmitter; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangeCertificate; -import tech.pegasys.pantheon.consensus.ibft.validation.MessageValidator; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MinedBlockObserver; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.Subscribers; -import tech.pegasys.pantheon.util.bytes.BytesValue; + +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftBlockHashing; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.IbftExtraData; +import org.hyperledger.besu.consensus.ibft.RoundTimer; +import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreator; +import org.hyperledger.besu.consensus.ibft.network.IbftMessageTransmitter; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; +import org.hyperledger.besu.consensus.ibft.validation.MessageValidator; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MinedBlockObserver; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.Subscribers; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; import java.util.Collections; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundChangeArtifactsTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifactsTest.java similarity index 89% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundChangeArtifactsTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifactsTest.java index 873e7c3999..08b77f0876 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundChangeArtifactsTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifactsTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; +package org.hyperledger.besu.consensus.ibft.statemachine; import static java.util.Collections.emptyList; import static java.util.Optional.empty; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.TestHelpers; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Block; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.TestHelpers; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Block; import java.util.List; import java.util.Optional; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundChangeManagerTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeManagerTest.java similarity index 89% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundChangeManagerTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeManagerTest.java index 208807c975..b3d1a24b62 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundChangeManagerTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeManagerTest.java @@ -10,31 +10,31 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; +package org.hyperledger.besu.consensus.ibft.statemachine; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.IbftHelpers; -import tech.pegasys.pantheon.consensus.ibft.TestHelpers; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.validation.ProposalBlockConsistencyValidator; -import tech.pegasys.pantheon.consensus.ibft.validation.RoundChangeMessageValidator; -import tech.pegasys.pantheon.consensus.ibft.validation.RoundChangePayloadValidator; -import tech.pegasys.pantheon.consensus.ibft.validation.SignedDataValidator; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.BlockValidator; -import tech.pegasys.pantheon.ethereum.BlockValidator.BlockProcessingOutputs; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Util; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.IbftHelpers; +import org.hyperledger.besu.consensus.ibft.TestHelpers; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.validation.ProposalBlockConsistencyValidator; +import org.hyperledger.besu.consensus.ibft.validation.RoundChangeMessageValidator; +import org.hyperledger.besu.consensus.ibft.validation.RoundChangePayloadValidator; +import org.hyperledger.besu.consensus.ibft.validation.SignedDataValidator; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.BlockValidator; +import org.hyperledger.besu.ethereum.BlockValidator.BlockProcessingOutputs; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Util; import java.util.Collections; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundStateTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundStateTest.java similarity index 92% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundStateTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundStateTest.java index 0dcb580370..cd94edb590 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/RoundStateTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundStateTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.statemachine; +package org.hyperledger.besu.consensus.ibft.statemachine; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -18,18 +18,18 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.validation.MessageValidator; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Util; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.validation.MessageValidator; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Util; import java.math.BigInteger; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/FutureRoundProposalMessageValidatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/FutureRoundProposalMessageValidatorTest.java similarity index 86% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/FutureRoundProposalMessageValidatorTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/FutureRoundProposalMessageValidatorTest.java index 8dc3846b49..13af17771f 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/FutureRoundProposalMessageValidatorTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/FutureRoundProposalMessageValidatorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.validation; +package org.hyperledger.besu.consensus.ibft.validation; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; @@ -18,13 +18,13 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.TestHelpers; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.TestHelpers; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.Optional; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/MessageValidatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidatorTest.java similarity index 86% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/MessageValidatorTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidatorTest.java index 30fe9367a4..6f4b5ac1e1 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/MessageValidatorTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidatorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.validation; +package org.hyperledger.besu.consensus.ibft.validation; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; @@ -21,24 +21,24 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibft.TestHelpers; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangeCertificate; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.BlockValidator; -import tech.pegasys.pantheon.ethereum.BlockValidator.BlockProcessingOutputs; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibft.TestHelpers; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.BlockValidator; +import org.hyperledger.besu.ethereum.BlockValidator.BlockProcessingOutputs; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; import java.util.List; import java.util.Optional; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/ProposalBlockConsistencyValidatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidatorTest.java similarity index 83% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/ProposalBlockConsistencyValidatorTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidatorTest.java index 2cf0def12c..f032c2c3a8 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/ProposalBlockConsistencyValidatorTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidatorTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.validation; +package org.hyperledger.besu.consensus.ibft.validation; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockHeaderFunctions; -import tech.pegasys.pantheon.consensus.ibft.IbftBlockInterface; -import tech.pegasys.pantheon.consensus.ibft.TestHelpers; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Block; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions; +import org.hyperledger.besu.consensus.ibft.IbftBlockInterface; +import org.hyperledger.besu.consensus.ibft.TestHelpers; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Block; import java.util.Collections; import java.util.Optional; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeCertificateValidatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidatorTest.java similarity index 91% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeCertificateValidatorTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidatorTest.java index 770e83aec2..47cf746836 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeCertificateValidatorTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidatorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.validation; +package org.hyperledger.besu.consensus.ibft.validation; import static java.util.Collections.singletonList; import static java.util.Optional.empty; @@ -19,17 +19,17 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.TestHelpers; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.payload.RoundChangeCertificate; -import tech.pegasys.pantheon.consensus.ibft.statemachine.PreparedRoundArtifacts; -import tech.pegasys.pantheon.consensus.ibft.validation.RoundChangePayloadValidator.MessageValidatorForHeightFactory; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Util; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.TestHelpers; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate; +import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts; +import org.hyperledger.besu.consensus.ibft.validation.RoundChangePayloadValidator.MessageValidatorForHeightFactory; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Util; import java.util.Collections; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeMessageValidatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeMessageValidatorTest.java similarity index 84% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeMessageValidatorTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeMessageValidatorTest.java index 0b386bced2..da956180f8 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeMessageValidatorTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeMessageValidatorTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.validation; +package org.hyperledger.besu.consensus.ibft.validation; import static java.util.Optional.empty; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; import org.junit.Test; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeSignedDataValidatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeSignedDataValidatorTest.java similarity index 90% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeSignedDataValidatorTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeSignedDataValidatorTest.java index 6c7327e906..1e0d0dfd7f 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeSignedDataValidatorTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeSignedDataValidatorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.validation; +package org.hyperledger.besu.consensus.ibft.validation; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -20,18 +20,18 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.RoundChange; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.consensus.ibft.payload.PreparedCertificate; -import tech.pegasys.pantheon.consensus.ibft.statemachine.PreparedRoundArtifacts; -import tech.pegasys.pantheon.consensus.ibft.validation.RoundChangePayloadValidator.MessageValidatorForHeightFactory; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Util; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate; +import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts; +import org.hyperledger.besu.consensus.ibft.validation.RoundChangePayloadValidator.MessageValidatorForHeightFactory; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Util; import java.util.Collections; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/SignedDataValidatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidatorTest.java similarity index 91% rename from consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/SignedDataValidatorTest.java rename to consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidatorTest.java index bbd2e8d0a7..2712baa3a6 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/validation/SignedDataValidatorTest.java +++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidatorTest.java @@ -10,25 +10,25 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibft.validation; +package org.hyperledger.besu.consensus.ibft.validation; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import tech.pegasys.pantheon.consensus.ibft.TestHelpers; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Commit; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Prepare; -import tech.pegasys.pantheon.consensus.ibft.messagewrappers.Proposal; -import tech.pegasys.pantheon.consensus.ibft.payload.MessageFactory; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Util; +import org.hyperledger.besu.consensus.ibft.ConsensusRoundIdentifier; +import org.hyperledger.besu.consensus.ibft.TestHelpers; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare; +import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal; +import org.hyperledger.besu.consensus.ibft.payload.MessageFactory; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Util; import java.util.List; import java.util.Optional; diff --git a/consensus/ibftlegacy/build.gradle b/consensus/ibftlegacy/build.gradle index fe44c5bf74..552550a187 100644 --- a/consensus/ibftlegacy/build.gradle +++ b/consensus/ibftlegacy/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-ibftlegacy' + baseName 'besu-ibftlegacy' manifest { attributes( 'Specification-Title': baseName, diff --git a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftBlockHashing.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHashing.java similarity index 93% rename from consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftBlockHashing.java rename to consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHashing.java index 7973bdddab..3cd6d0e9f7 100644 --- a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftBlockHashing.java +++ b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHashing.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy; - -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.consensus.ibftlegacy; + +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.function.Supplier; diff --git a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactory.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactory.java similarity index 71% rename from consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactory.java rename to consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactory.java index 68dc7ab542..dcff6c0969 100644 --- a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactory.java +++ b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactory.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy; +package org.hyperledger.besu.consensus.ibftlegacy; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibftlegacy.headervalidationrules.IbftExtraDataValidationRule; -import tech.pegasys.pantheon.consensus.ibftlegacy.headervalidationrules.VoteValidationRule; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.AncestryValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.ConstantFieldValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.GasUsageValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.TimestampBoundedByFutureParameter; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.TimestampMoreRecentThanParent; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibftlegacy.headervalidationrules.IbftExtraDataValidationRule; +import org.hyperledger.besu.consensus.ibftlegacy.headervalidationrules.VoteValidationRule; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.AncestryValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.ConstantFieldValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasUsageValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampBoundedByFutureParameter; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampMoreRecentThanParent; +import org.hyperledger.besu.util.uint.UInt256; public class IbftBlockHeaderValidationRulesetFactory { diff --git a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftExtraData.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftExtraData.java similarity index 88% rename from consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftExtraData.java rename to consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftExtraData.java index a0cc3f43e3..05bb186627 100644 --- a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftExtraData.java +++ b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftExtraData.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy; +package org.hyperledger.besu.consensus.ibftlegacy; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.ParsedExtraData; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.ParsedExtraData; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collection; diff --git a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftHelpers.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftHelpers.java similarity index 90% rename from consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftHelpers.java rename to consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftHelpers.java index e9acf83490..6396785cc1 100644 --- a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftHelpers.java +++ b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftHelpers.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy; +package org.hyperledger.besu.consensus.ibftlegacy; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Hash; public class IbftHelpers { diff --git a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftLegacyBlockInterface.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftLegacyBlockInterface.java similarity index 85% rename from consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftLegacyBlockInterface.java rename to consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftLegacyBlockInterface.java index 310a60dd5a..2d04d96eab 100644 --- a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftLegacyBlockInterface.java +++ b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftLegacyBlockInterface.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy; +package org.hyperledger.besu.consensus.ibftlegacy; -import tech.pegasys.pantheon.consensus.common.BlockInterface; -import tech.pegasys.pantheon.consensus.common.ValidatorVote; -import tech.pegasys.pantheon.consensus.common.VoteType; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.consensus.common.BlockInterface; +import org.hyperledger.besu.consensus.common.ValidatorVote; +import org.hyperledger.besu.consensus.common.VoteType; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collection; import java.util.Optional; diff --git a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftProtocolSchedule.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftProtocolSchedule.java similarity index 73% rename from consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftProtocolSchedule.java rename to consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftProtocolSchedule.java index 57a56957e7..b7f6adb39e 100644 --- a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftProtocolSchedule.java +++ b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftProtocolSchedule.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy; +package org.hyperledger.besu.consensus.ibftlegacy; -import static tech.pegasys.pantheon.consensus.ibftlegacy.IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator; +import static org.hyperledger.besu.consensus.ibftlegacy.IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator; -import tech.pegasys.pantheon.config.GenesisConfigOptions; -import tech.pegasys.pantheon.config.IbftConfigOptions; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.ethereum.MainnetBlockValidator; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockBodyValidator; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockImporter; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolScheduleBuilder; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpecBuilder; +import org.hyperledger.besu.config.GenesisConfigOptions; +import org.hyperledger.besu.config.IbftConfigOptions; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.ethereum.MainnetBlockValidator; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockBodyValidator; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockImporter; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecBuilder; import java.math.BigInteger; diff --git a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/LegacyIbftBlockHeaderFunctions.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/LegacyIbftBlockHeaderFunctions.java similarity index 80% rename from consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/LegacyIbftBlockHeaderFunctions.java rename to consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/LegacyIbftBlockHeaderFunctions.java index aba6f401be..24e6c60986 100644 --- a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/LegacyIbftBlockHeaderFunctions.java +++ b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/LegacyIbftBlockHeaderFunctions.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy; +package org.hyperledger.besu.consensus.ibftlegacy; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.Hash; public class LegacyIbftBlockHeaderFunctions implements BlockHeaderFunctions { diff --git a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/blockcreation/IbftBlockCreator.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/blockcreation/IbftBlockCreator.java similarity index 76% rename from consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/blockcreation/IbftBlockCreator.java rename to consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/blockcreation/IbftBlockCreator.java index cf2c0f872e..84fdb4ac82 100644 --- a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/blockcreation/IbftBlockCreator.java +++ b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/blockcreation/IbftBlockCreator.java @@ -10,27 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy.blockcreation; +package org.hyperledger.besu.consensus.ibftlegacy.blockcreation; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibftlegacy.IbftBlockHashing; -import tech.pegasys.pantheon.consensus.ibftlegacy.IbftExtraData; -import tech.pegasys.pantheon.consensus.ibftlegacy.IbftHelpers; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.blockcreation.AbstractBlockCreator; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.SealableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibftlegacy.IbftBlockHashing; +import org.hyperledger.besu.consensus.ibftlegacy.IbftExtraData; +import org.hyperledger.besu.consensus.ibftlegacy.IbftHelpers; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.blockcreation.AbstractBlockCreator; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.SealableBlockHeader; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; import java.util.function.Function; diff --git a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRule.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRule.java similarity index 85% rename from consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRule.java rename to consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRule.java index bf6e56a1e6..23d870eb3d 100644 --- a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRule.java +++ b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRule.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy.headervalidationrules; - -import tech.pegasys.pantheon.consensus.common.ValidatorProvider; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibftlegacy.IbftBlockHashing; -import tech.pegasys.pantheon.consensus.ibftlegacy.IbftExtraData; -import tech.pegasys.pantheon.consensus.ibftlegacy.IbftHelpers; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.AttachedBlockHeaderValidationRule; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; +package org.hyperledger.besu.consensus.ibftlegacy.headervalidationrules; + +import org.hyperledger.besu.consensus.common.ValidatorProvider; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibftlegacy.IbftBlockHashing; +import org.hyperledger.besu.consensus.ibftlegacy.IbftExtraData; +import org.hyperledger.besu.consensus.ibftlegacy.IbftHelpers; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule; +import org.hyperledger.besu.ethereum.rlp.RLPException; import java.util.Collection; import java.util.List; diff --git a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/headervalidationrules/VoteValidationRule.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/VoteValidationRule.java similarity index 83% rename from consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/headervalidationrules/VoteValidationRule.java rename to consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/VoteValidationRule.java index 8899adfa65..bb1b8e4b39 100644 --- a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/headervalidationrules/VoteValidationRule.java +++ b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/VoteValidationRule.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy.headervalidationrules; +package org.hyperledger.besu.consensus.ibftlegacy.headervalidationrules; -import tech.pegasys.pantheon.consensus.ibftlegacy.IbftLegacyBlockInterface; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import org.hyperledger.besu.consensus.ibftlegacy.IbftLegacyBlockInterface; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/protocol/Istanbul64Protocol.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/protocol/Istanbul64Protocol.java similarity index 90% rename from consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/protocol/Istanbul64Protocol.java rename to consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/protocol/Istanbul64Protocol.java index b6f602e8b6..4e9cd2adf8 100644 --- a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/protocol/Istanbul64Protocol.java +++ b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/protocol/Istanbul64Protocol.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy.protocol; +package org.hyperledger.besu.consensus.ibftlegacy.protocol; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV63; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.SubProtocol; +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; +import org.hyperledger.besu.ethereum.eth.messages.EthPV63; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol; import java.util.Arrays; import java.util.List; diff --git a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/protocol/Istanbul64ProtocolManager.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/protocol/Istanbul64ProtocolManager.java similarity index 84% rename from consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/protocol/Istanbul64ProtocolManager.java rename to consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/protocol/Istanbul64ProtocolManager.java index 3ce70079aa..bad80f521b 100644 --- a/consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/protocol/Istanbul64ProtocolManager.java +++ b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/protocol/Istanbul64ProtocolManager.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy.protocol; +package org.hyperledger.besu.consensus.ibftlegacy.protocol; import static java.util.Collections.singletonList; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.math.BigInteger; import java.time.Clock; diff --git a/consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftBlockHashingTest.java b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHashingTest.java similarity index 93% rename from consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftBlockHashingTest.java rename to consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHashingTest.java index 723dcc3b85..67a3f8e458 100644 --- a/consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftBlockHashingTest.java +++ b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHashingTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy; +package org.hyperledger.besu.consensus.ibftlegacy; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogsBloomFilter; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.LogsBloomFilter; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Arrays; import java.util.List; diff --git a/consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactoryTest.java b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactoryTest.java similarity index 85% rename from consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactoryTest.java rename to consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactoryTest.java index fd44e0b010..e0b8f794be 100644 --- a/consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactoryTest.java +++ b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactoryTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy; +package org.hyperledger.besu.consensus.ibftlegacy; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; @@ -19,21 +19,21 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.consensus.common.VoteTally; -import tech.pegasys.pantheon.consensus.common.VoteTallyCache; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.consensus.common.VoteTally; +import org.hyperledger.besu.consensus.common.VoteTallyCache; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.util.Collection; diff --git a/consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftExtraDataTest.java b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftExtraDataTest.java similarity index 87% rename from consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftExtraDataTest.java rename to consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftExtraDataTest.java index d29cbacd3f..089161bb32 100644 --- a/consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftExtraDataTest.java +++ b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftExtraDataTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy; +package org.hyperledger.besu.consensus.ibftlegacy; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; import java.util.Arrays; @@ -26,7 +26,6 @@ import java.util.List; import java.util.Random; import com.google.common.collect.Lists; -import org.assertj.core.api.Assertions; import org.bouncycastle.util.encoders.Hex; import org.junit.Test; @@ -53,10 +52,10 @@ public class IbftExtraDataTest { final IbftExtraData extraData = IbftExtraData.decodeRaw(bufferToInject); - Assertions.assertThat(extraData.getVanityData()).isEqualTo(vanity_data); + assertThat(extraData.getVanityData()).isEqualTo(vanity_data); assertThat(extraData.getProposerSeal()).isEqualTo(proposerSeal); - Assertions.assertThat(extraData.getSeals()).isEqualTo(committerSeals); - Assertions.assertThat(extraData.getValidators()).isEqualTo(validators); + assertThat(extraData.getSeals()).isEqualTo(committerSeals); + assertThat(extraData.getValidators()).isEqualTo(validators); } @Test @@ -84,10 +83,10 @@ public class IbftExtraDataTest { final IbftExtraData extraData = IbftExtraData.decodeRaw(bufferToInject); - Assertions.assertThat(extraData.getVanityData()).isEqualTo(vanity_data); + assertThat(extraData.getVanityData()).isEqualTo(vanity_data); assertThat(extraData.getProposerSeal()).isEqualTo(proposerSeal); - Assertions.assertThat(extraData.getSeals()).isEqualTo(committerSeals); - Assertions.assertThat(extraData.getValidators()).isEqualTo(validators); + assertThat(extraData.getSeals()).isEqualTo(committerSeals); + assertThat(extraData.getValidators()).isEqualTo(validators); } @Test(expected = RLPException.class) diff --git a/consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftLegacyBlockInterfaceTest.java b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftLegacyBlockInterfaceTest.java similarity index 87% rename from consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftLegacyBlockInterfaceTest.java rename to consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftLegacyBlockInterfaceTest.java index c44a995031..a0c7b0587b 100644 --- a/consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/IbftLegacyBlockInterfaceTest.java +++ b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftLegacyBlockInterfaceTest.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy; +package org.hyperledger.besu.consensus.ibftlegacy; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.consensus.common.VoteType.ADD; -import static tech.pegasys.pantheon.consensus.common.VoteType.DROP; - -import tech.pegasys.pantheon.consensus.common.ValidatorVote; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Util; +import static org.hyperledger.besu.consensus.common.VoteType.ADD; +import static org.hyperledger.besu.consensus.common.VoteType.DROP; + +import org.hyperledger.besu.consensus.common.ValidatorVote; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Util; import java.util.Collection; import java.util.List; diff --git a/consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/TestHelpers.java b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/TestHelpers.java similarity index 77% rename from consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/TestHelpers.java rename to consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/TestHelpers.java index 266c502aaa..1db112f0f8 100644 --- a/consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/TestHelpers.java +++ b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/TestHelpers.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy; - -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.consensus.ibftlegacy; + +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collections; import java.util.List; diff --git a/consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/blockcreation/IbftBlockCreatorTest.java b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/blockcreation/IbftBlockCreatorTest.java similarity index 70% rename from consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/blockcreation/IbftBlockCreatorTest.java rename to consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/blockcreation/IbftBlockCreatorTest.java index 43c9062520..1fd374d426 100644 --- a/consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/blockcreation/IbftBlockCreatorTest.java +++ b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/blockcreation/IbftBlockCreatorTest.java @@ -10,38 +10,38 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy.blockcreation; +package org.hyperledger.besu.consensus.ibftlegacy.blockcreation; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.consensus.ibft.IbftContextBuilder.setupContextWithValidators; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibftlegacy.IbftBlockHeaderValidationRulesetFactory; -import tech.pegasys.pantheon.consensus.ibftlegacy.IbftExtraData; -import tech.pegasys.pantheon.consensus.ibftlegacy.IbftProtocolSchedule; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibftlegacy.IbftBlockHeaderValidationRulesetFactory; +import org.hyperledger.besu.consensus.ibftlegacy.IbftExtraData; +import org.hyperledger.besu.consensus.ibftlegacy.IbftProtocolSchedule; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.bytes.BytesValue; import java.time.Instant; import java.util.Arrays; diff --git a/consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRuleTest.java b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRuleTest.java similarity index 93% rename from consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRuleTest.java rename to consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRuleTest.java index 330f9d2d57..3321580577 100644 --- a/consensus/ibftlegacy/src/test/java/tech/pegasys/pantheon/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRuleTest.java +++ b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRuleTest.java @@ -10,26 +10,26 @@ * 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. */ -package tech.pegasys.pantheon.consensus.ibftlegacy.headervalidationrules; +package org.hyperledger.besu.consensus.ibftlegacy.headervalidationrules; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.consensus.ibft.IbftContextBuilder.setupContextWithValidators; - -import tech.pegasys.pantheon.consensus.ibft.IbftContext; -import tech.pegasys.pantheon.consensus.ibftlegacy.IbftBlockHashing; -import tech.pegasys.pantheon.consensus.ibftlegacy.IbftExtraData; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators; + +import org.hyperledger.besu.consensus.ibft.IbftContext; +import org.hyperledger.besu.consensus.ibftlegacy.IbftBlockHashing; +import org.hyperledger.besu.consensus.ibftlegacy.IbftExtraData; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collection; import java.util.Collections; diff --git a/crypto/build.gradle b/crypto/build.gradle index 6ee59aeabc..0f42cfd6a9 100644 --- a/crypto/build.gradle +++ b/crypto/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-crypto' + baseName 'besu-crypto' manifest { attributes( 'Specification-Title': baseName, diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/PantheonProvider.java b/crypto/src/main/java/org/hyperledger/besu/crypto/BesuProvider.java similarity index 71% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/PantheonProvider.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/BesuProvider.java index d769083e43..5148f9101d 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/PantheonProvider.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/BesuProvider.java @@ -10,25 +10,25 @@ * 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. */ -package tech.pegasys.pantheon.crypto; +package org.hyperledger.besu.crypto; import java.security.AccessController; import java.security.PrivilegedAction; import java.security.Provider; -public final class PantheonProvider extends Provider { +public final class BesuProvider extends Provider { - private static final String info = "Pantheon Security Provider v1.0"; + private static final String info = "Besu Security Provider v1.0"; - public static final String PROVIDER_NAME = "Pantheon"; + public static final String PROVIDER_NAME = "Besu"; @SuppressWarnings("unchecked") - public PantheonProvider() { + public BesuProvider() { super(PROVIDER_NAME, "1.0", info); AccessController.doPrivileged( (PrivilegedAction) () -> { - put("MessageDigest.Blake2bf", "tech.pegasys.pantheon.crypto.Blake2bfMessageDigest"); + put("MessageDigest.Blake2bf", Blake2bfMessageDigest.class.getName()); return null; }); } diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/Blake2bfMessageDigest.java b/crypto/src/main/java/org/hyperledger/besu/crypto/Blake2bfMessageDigest.java similarity index 99% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/Blake2bfMessageDigest.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/Blake2bfMessageDigest.java index fcbc7d27c9..a3e9c94496 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/Blake2bfMessageDigest.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/Blake2bfMessageDigest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto; +package org.hyperledger.besu.crypto; import static java.util.Arrays.copyOfRange; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/Hash.java b/crypto/src/main/java/org/hyperledger/besu/crypto/Hash.java similarity index 95% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/Hash.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/Hash.java index 23fc0dab77..1994041e7e 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/Hash.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/Hash.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.crypto; +package org.hyperledger.besu.crypto; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/InvalidSEC256K1PrivateKeyStoreException.java b/crypto/src/main/java/org/hyperledger/besu/crypto/InvalidSEC256K1PrivateKeyStoreException.java similarity index 94% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/InvalidSEC256K1PrivateKeyStoreException.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/InvalidSEC256K1PrivateKeyStoreException.java index b26155e0d9..c00155bee3 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/InvalidSEC256K1PrivateKeyStoreException.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/InvalidSEC256K1PrivateKeyStoreException.java @@ -10,6 +10,6 @@ * 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. */ -package tech.pegasys.pantheon.crypto; +package org.hyperledger.besu.crypto; public class InvalidSEC256K1PrivateKeyStoreException extends RuntimeException {} diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/MessageDigestFactory.java b/crypto/src/main/java/org/hyperledger/besu/crypto/MessageDigestFactory.java similarity index 92% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/MessageDigestFactory.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/MessageDigestFactory.java index 28efadec66..6df8a34040 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/MessageDigestFactory.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/MessageDigestFactory.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto; +package org.hyperledger.besu.crypto; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -21,7 +21,7 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider; public class MessageDigestFactory { static { - Security.addProvider(new PantheonProvider()); + Security.addProvider(new BesuProvider()); Security.addProvider(new BouncyCastleProvider()); } diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/PRNGSecureRandom.java b/crypto/src/main/java/org/hyperledger/besu/crypto/PRNGSecureRandom.java similarity index 94% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/PRNGSecureRandom.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/PRNGSecureRandom.java index d85f585155..4a6957d3cc 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/PRNGSecureRandom.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/PRNGSecureRandom.java @@ -10,9 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto; - -import static tech.pegasys.pantheon.crypto.PersonalisationString.getPersonalizationString; +package org.hyperledger.besu.crypto; import java.security.SecureRandom; @@ -34,7 +32,7 @@ public class PRNGSecureRandom extends SecureRandom { protected PRNGSecureRandom( final QuickEntropy quickEntropy, final SP800SecureRandomBuilder sp800SecureRandomBuilder) { final Digest digest = new SHA256Digest(); - final byte[] personalizationString = getPersonalizationString(); + final byte[] personalizationString = PersonalisationString.getPersonalizationString(); this.quickEntropy = quickEntropy; // prediction resistance is not required as we are applying a light reseed on each nextBytes // with quick entropy. diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/PersonalisationString.java b/crypto/src/main/java/org/hyperledger/besu/crypto/PersonalisationString.java similarity index 98% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/PersonalisationString.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/PersonalisationString.java index b663dda8a0..7f33e4ccbb 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/PersonalisationString.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/PersonalisationString.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto; +package org.hyperledger.besu.crypto; import java.net.NetworkInterface; import java.net.SocketException; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/QuickEntropy.java b/crypto/src/main/java/org/hyperledger/besu/crypto/QuickEntropy.java similarity index 96% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/QuickEntropy.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/QuickEntropy.java index 8a4bde0a8d..f8259ab5d2 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/QuickEntropy.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/QuickEntropy.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto; +package org.hyperledger.besu.crypto; import com.google.common.primitives.Bytes; import com.google.common.primitives.Ints; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/SECP256K1.java b/crypto/src/main/java/org/hyperledger/besu/crypto/SECP256K1.java similarity index 98% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/SECP256K1.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/SECP256K1.java index 6d9738e173..779de569e8 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/SECP256K1.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/SECP256K1.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.crypto; +package org.hyperledger.besu.crypto; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static java.nio.file.StandardCopyOption.ATOMIC_MOVE; import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; -import static tech.pegasys.pantheon.util.bytes.BytesValues.asUnsignedBigInteger; - -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; -import tech.pegasys.pantheon.util.uint.UInt256Bytes; +import static org.hyperledger.besu.util.bytes.BytesValues.asUnsignedBigInteger; + +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.besu.util.bytes.MutableBytesValue; +import org.hyperledger.besu.util.uint.UInt256; +import org.hyperledger.besu.util.uint.UInt256Bytes; import java.io.File; import java.io.IOException; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/SecureRandomProvider.java b/crypto/src/main/java/org/hyperledger/besu/crypto/SecureRandomProvider.java similarity index 96% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/SecureRandomProvider.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/SecureRandomProvider.java index 6afc529a68..efd06d046e 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/SecureRandomProvider.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/SecureRandomProvider.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto; +package org.hyperledger.besu.crypto; import java.security.SecureRandom; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AbstractFieldPoint.java b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFieldPoint.java similarity index 98% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AbstractFieldPoint.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFieldPoint.java index eab4468ae3..192a2005fe 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AbstractFieldPoint.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFieldPoint.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; import java.math.BigInteger; import java.util.Objects; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AbstractFqp.java b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFqp.java similarity index 99% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AbstractFqp.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFqp.java index d263b27998..16a4e238ca 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AbstractFqp.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFqp.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; import java.math.BigInteger; import java.util.Arrays; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12Pairer.java b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Pairer.java similarity index 96% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12Pairer.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Pairer.java index fa2f84acbf..6d77f14ed7 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12Pairer.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Pairer.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; -import static tech.pegasys.pantheon.crypto.altbn128.AltBn128Fq12Point.twist; +import static org.hyperledger.besu.crypto.altbn128.AltBn128Fq12Point.twist; import java.math.BigInteger; import java.util.Arrays; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12Point.java b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Point.java similarity index 97% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12Point.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Point.java index ff38ccbfc6..e7119851e8 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12Point.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Point.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; import java.util.Arrays; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq2Point.java b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2Point.java similarity index 98% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq2Point.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2Point.java index 9f29bf3aa6..9d7cfd8765 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq2Point.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2Point.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; import java.math.BigInteger; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Point.java b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Point.java similarity index 97% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Point.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Point.java index 4310d747f2..5932587d5f 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Point.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Point.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; /** * Adapted from the pc_ecc (Apache 2 License) implementation: diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/FieldElement.java b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldElement.java similarity index 96% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/FieldElement.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldElement.java index d0ceebd051..d698fffe24 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/FieldElement.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldElement.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; import java.math.BigInteger; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/FieldPoint.java b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldPoint.java similarity index 95% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/FieldPoint.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldPoint.java index e3f60047cb..caf8dfe4c1 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/FieldPoint.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldPoint.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; import java.math.BigInteger; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/Fq.java b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq.java similarity index 96% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/Fq.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq.java index a6dfa7fc9d..d627bdf96a 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/Fq.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.math.BigInteger; import java.util.Objects; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/Fq12.java b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq12.java similarity index 97% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/Fq12.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq12.java index 54e432038b..3d1abda996 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/Fq12.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq12.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; /** * Adapted from the pc_ecc (Apache 2 License) implementation: diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/Fq2.java b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq2.java similarity index 97% rename from crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/Fq2.java rename to crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq2.java index 391a2fc2c0..8a7351a5bb 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/Fq2.java +++ b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq2.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; import java.math.BigInteger; diff --git a/crypto/src/test/java/tech/pegasys/pantheon/crypto/Blake2bfMessageDigestTest.java b/crypto/src/test/java/org/hyperledger/besu/crypto/Blake2bfMessageDigestTest.java similarity index 99% rename from crypto/src/test/java/tech/pegasys/pantheon/crypto/Blake2bfMessageDigestTest.java rename to crypto/src/test/java/org/hyperledger/besu/crypto/Blake2bfMessageDigestTest.java index d3179f320d..e87817c9b9 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/Blake2bfMessageDigestTest.java +++ b/crypto/src/test/java/org/hyperledger/besu/crypto/Blake2bfMessageDigestTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto; +package org.hyperledger.besu.crypto; import static org.assertj.core.api.Assertions.assertThat; diff --git a/crypto/src/test/java/tech/pegasys/pantheon/crypto/HashTest.java b/crypto/src/test/java/org/hyperledger/besu/crypto/HashTest.java similarity index 96% rename from crypto/src/test/java/tech/pegasys/pantheon/crypto/HashTest.java rename to crypto/src/test/java/org/hyperledger/besu/crypto/HashTest.java index 90cdc638a2..f3b579e287 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/HashTest.java +++ b/crypto/src/test/java/org/hyperledger/besu/crypto/HashTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.crypto; +package org.hyperledger.besu.crypto; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import org.bouncycastle.util.encoders.Hex; import org.junit.Test; diff --git a/crypto/src/test/java/tech/pegasys/pantheon/crypto/PRNGSecureRandomTest.java b/crypto/src/test/java/org/hyperledger/besu/crypto/PRNGSecureRandomTest.java similarity index 98% rename from crypto/src/test/java/tech/pegasys/pantheon/crypto/PRNGSecureRandomTest.java rename to crypto/src/test/java/org/hyperledger/besu/crypto/PRNGSecureRandomTest.java index d795b472aa..f507c80f22 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/PRNGSecureRandomTest.java +++ b/crypto/src/test/java/org/hyperledger/besu/crypto/PRNGSecureRandomTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto; +package org.hyperledger.besu.crypto; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; diff --git a/crypto/src/test/java/tech/pegasys/pantheon/crypto/SECP256K1Test.java b/crypto/src/test/java/org/hyperledger/besu/crypto/SECP256K1Test.java similarity index 96% rename from crypto/src/test/java/tech/pegasys/pantheon/crypto/SECP256K1Test.java rename to crypto/src/test/java/org/hyperledger/besu/crypto/SECP256K1Test.java index f21cce07a0..90d26975a6 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/SECP256K1Test.java +++ b/crypto/src/test/java/org/hyperledger/besu/crypto/SECP256K1Test.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.crypto; +package org.hyperledger.besu.crypto; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.crypto.Hash.keccak256; -import static tech.pegasys.pantheon.util.bytes.BytesValue.fromHexString; +import static org.hyperledger.besu.crypto.Hash.keccak256; +import static org.hyperledger.besu.util.bytes.BytesValue.fromHexString; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.File; import java.math.BigInteger; @@ -246,7 +246,7 @@ public class SECP256K1Test { final File file = new File( this.getClass() - .getResource("/tech/pegasys/pantheon/crypto/validPrivateKey.txt") + .getResource("/org/hyperledger/besu/crypto/validPrivateKey.txt") .toURI()); final SECP256K1.PrivateKey privateKey = SECP256K1.PrivateKey.load(file); assertThat(privateKey.getEncodedBytes()) diff --git a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12PairerTest.java b/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PairerTest.java similarity index 98% rename from crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12PairerTest.java rename to crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PairerTest.java index 5235d8080e..f4d3edd46d 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12PairerTest.java +++ b/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PairerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; import static org.assertj.core.api.Assertions.assertThat; diff --git a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12PointTest.java b/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PointTest.java similarity index 97% rename from crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12PointTest.java rename to crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PointTest.java index 9ccca42b90..c3cd7ee481 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12PointTest.java +++ b/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PointTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; import static org.assertj.core.api.Assertions.assertThat; diff --git a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq2PointTest.java b/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2PointTest.java similarity index 98% rename from crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq2PointTest.java rename to crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2PointTest.java index 1a06160290..f1c64e41c3 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq2PointTest.java +++ b/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2PointTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; import static org.assertj.core.api.Assertions.assertThat; diff --git a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128PointTest.java b/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128PointTest.java similarity index 99% rename from crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128PointTest.java rename to crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128PointTest.java index e3aef574aa..c7e0619eb5 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128PointTest.java +++ b/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128PointTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; import static org.assertj.core.api.Assertions.assertThat; diff --git a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/Fq12Test.java b/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq12Test.java similarity index 97% rename from crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/Fq12Test.java rename to crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq12Test.java index ed24bcc556..f6fbd2066a 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/Fq12Test.java +++ b/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq12Test.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; import static org.assertj.core.api.Assertions.assertThat; diff --git a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/Fq2Test.java b/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq2Test.java similarity index 97% rename from crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/Fq2Test.java rename to crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq2Test.java index 8350c1323b..b4837ca129 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/Fq2Test.java +++ b/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq2Test.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; import static org.assertj.core.api.Assertions.assertThat; diff --git a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/FqTest.java b/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/FqTest.java similarity index 98% rename from crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/FqTest.java rename to crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/FqTest.java index c57992d302..03f026d2ba 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/FqTest.java +++ b/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/FqTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.crypto.altbn128; +package org.hyperledger.besu.crypto.altbn128; import static org.assertj.core.api.Assertions.assertThat; diff --git a/pantheon/src/test/resources/validPrivateKey.txt b/crypto/src/test/resources/org/hyperledger/besu/crypto/validPrivateKey.txt similarity index 100% rename from pantheon/src/test/resources/validPrivateKey.txt rename to crypto/src/test/resources/org/hyperledger/besu/crypto/validPrivateKey.txt diff --git a/docker/Dockerfile b/docker/Dockerfile index 842e3fe352..f6e96faa3a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,8 +1,8 @@ FROM openjdk:11.0.2-jre-slim-stretch -COPY pantheon /opt/pantheon/ -WORKDIR /opt/pantheon +COPY besu /opt/besu/ +WORKDIR /opt/besu # Expose services ports # 8545 HTTP JSON-RPC @@ -12,22 +12,22 @@ WORKDIR /opt/pantheon EXPOSE 8545 8546 8547 30303 # defaults for host interfaces -ENV PANTHEON_RPC_HTTP_HOST 0.0.0.0 -ENV PANTHEON_RPC_WS_HOST 0.0.0.0 -ENV PANTHEON_GRAPHQL_HTTP_HOST 0.0.0.0 +ENV BESU_RPC_HTTP_HOST 0.0.0.0 +ENV BESU_RPC_WS_HOST 0.0.0.0 +ENV BESU_GRAPHQL_HTTP_HOST 0.0.0.0 -ENTRYPOINT ["/opt/pantheon/bin/pantheon"] +ENTRYPOINT ["/opt/besu/bin/besu"] # Build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ - org.label-schema.name="Pantheon" \ + org.label-schema.name="Besu" \ org.label-schema.description="Enterprise Ethereum client" \ - org.label-schema.url="https://docs.pantheon.pegasys.tech/" \ + org.label-schema.url="https://besu.hyperledger.org/" \ org.label-schema.vcs-ref=$VCS_REF \ - org.label-schema.vcs-url="https://github.com/PegaSysEng/pantheon.git" \ - org.label-schema.vendor="Pegasys" \ + org.label-schema.vcs-url="https://github.com/hyperledger/besu.git" \ + org.label-schema.vendor="Hyperledger" \ org.label-schema.version=$VERSION \ org.label-schema.schema-version="1.0" \ No newline at end of file diff --git a/docker/tests/00/goss.yaml b/docker/tests/00/goss.yaml index c0e8c09ef4..74dfa9dda6 100644 --- a/docker/tests/00/goss.yaml +++ b/docker/tests/00/goss.yaml @@ -6,7 +6,7 @@ file: /goss/Dockerfile: exists: true contains: - - "/ENV PANTHEON_RPC_HTTP_HOST 0.0.0.0/" - - "/ENV PANTHEON_RPC_WS_HOST 0.0.0.0/" - - "/ENV PANTHEON_GRAPHQL_HTTP_HOST 0.0.0.0/" + - "/ENV BESU_RPC_HTTP_HOST 0.0.0.0/" + - "/ENV BESU_RPC_WS_HOST 0.0.0.0/" + - "/ENV BESU_GRAPHQL_HTTP_HOST 0.0.0.0/" diff --git a/docker/tests/01/goss.yaml b/docker/tests/01/goss.yaml index 996e86f843..1feb2a3407 100644 --- a/docker/tests/01/goss.yaml +++ b/docker/tests/01/goss.yaml @@ -1,21 +1,21 @@ --- # runtime docker tests file: - /opt/pantheon/bin/pantheon: + /opt/besu/bin/besu: exists: true mode: "0755" owner: root group: root filetype: file contains: [] - /opt/pantheon/database: + /opt/besu/database: exists: true mode: "0755" owner: root group: root filetype: directory contains: [] - /opt/pantheon/key: + /opt/besu/key: exists: true mode: "0600" owner: root diff --git a/docs/README.md b/docs/README.md index 05aad9a4e8..c9584bfadc 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,5 +1,5 @@ -Pantheon user documentation was moved to as separate repository to help manage versions and releases. +Besu user documentation was moved to as separate repository to help manage versions and releases. -If you want to contribute to the doc site, make a pull request against https://github.com/PegaSysEng/doc.pantheon +If you want to contribute to the doc site, make a pull request against https://github.com/hyperledger/besu-docs -The generated doc website is at https://docs.pantheon.pegasys.tech/ \ No newline at end of file +The generated doc website is at https://besu.hyperledger.org/ \ No newline at end of file diff --git a/docs/community/code-reviews.md b/docs/community/code-reviews.md index 83efcb6751..54e9bfc853 100644 --- a/docs/community/code-reviews.md +++ b/docs/community/code-reviews.md @@ -1,4 +1,4 @@ -description: Code review guidelines for Pantheon developers +description: Code review guidelines for Besu developers All changes must be code reviewed. For non-approvers this is obvious, since @@ -16,7 +16,7 @@ and say so in a reply to the PR. Only the primary approver of a change should actually do the merge, except in rare cases (e.g. they are unavailable in a reasonable timeframe). -If a PR has gone 2 work days without an approver emerging, please ask on [Pantheon Gitter] +If a PR has gone 2 work days without an approver emerging, please ask on [Besu Rocketchat] ## Attribution @@ -24,4 +24,4 @@ This Document was adapted by the following: - Kubernetes collab.md, available at [kub collab] [kub collab]: https://raw.githubusercontent.com/kubernetes/community/master/contributors/devel/collab.md -[Pantheon Gitter]: https://gitter.im/PegaSysEng/pantheon \ No newline at end of file +[Besu Rocketchat]: https://chat.hyperledger.org/channel/besu \ No newline at end of file diff --git a/docs/community/community-membership.md b/docs/community/community-membership.md index f7f5b061c0..a62793358b 100644 --- a/docs/community/community-membership.md +++ b/docs/community/community-membership.md @@ -10,13 +10,13 @@ this project. | Role | Responsibilities | Defined by | | -----| ---------------- | ---------- | | Everyone | none | anybody with a belly button -| Member | everyone who contributes - code or otherwise | Pantheon GitHub org member +| Member | everyone who contributes - code or otherwise | Besu GitHub org member | Approver | approve accepting contributions | write permissions on master -| Project Manager | management of the project | PegaSys -| Project Sponsor | contribute developer resources | PegaSys -| Open Source Circle | OSS support | PegaSys -| Project Evangelist | promote the project | PegaSys -| Benevolent Dictator | decision tie-breaker | PegaSys +| Project Manager | management of the project | Hyperledger +| Project Sponsor | contribute developer resources | Hyperledger +| Open Source Circle | OSS support | Hyperledger +| Project Evangelist | promote the project | Hyperledger +| Benevolent Dictator | decision tie-breaker | Hyperledger ## Everyone Any person from the public is able to access the code. The standard permissions grant the ability to view the code, view open bugs, access the wiki, download binaries, view CI results and comment on pull requests. @@ -47,9 +47,9 @@ issues and PRs assigned to them. - Authoring or reviewing PRs on GitHub - Filing or commenting on issues on GitHub - Contributing to community discussions (e.g. meetings, Slack, email discussion forums, Stack Overflow) -- Subscribed to [pantheon-dev@pegasys.tech] -- Joined [Pantheon Gitter] -- Browsed [Pantheon Wiki] +- Subscribed to [besu-dev@pegasys.tech] +- Joined [Besu Rocketchat] +- Browsed [Besu Wiki] - Have read the [contributor guide] - Signed ICLA, as described in [CLA.md] @@ -90,7 +90,7 @@ Code approvers are members that have signed an ICLA and have been granted additi ## Project Manager The Project Manager role provides the user with control over management aspects of the project. -**Defined by:** PegaSys +**Defined by:** Hyperledger ### Requirements - Includes all of the requirements of a Member user @@ -107,7 +107,7 @@ The Project Manager role provides the user with control over management aspects ## Project Sponsor The Project Sponsor role provides a user with the ability to contribute additional developer resources to the project. Project Sponsors must sign the ICLA. -**Defined by:** PegaSys +**Defined by:** Hyperledger ### Requirements - Signed ICLA, as described in [CLA.md] @@ -119,7 +119,7 @@ The Project Sponsor role provides a user with the ability to contribute addition ## Open Source Circle The Open Source Circle is a group that provides open source software support to projects. -**Defined by:** PegaSys +**Defined by:** Hyperledger ### Requirements - Includes all of the requirements of a Member user @@ -134,7 +134,7 @@ The Open Source Circle is a group that provides open source software support to ## Project Evangelist The Project Evangelist role is for those who wish to promote the project to the outside world, but not actively contribute to it. -**Defined by:** PegaSys +**Defined by:** Hyperledger ### Requirements - Includes all of the requirements of a Member user @@ -170,6 +170,6 @@ This document is adapted from the following sources: [contributor guide]: /CONTRIBUTING.md [New contributors]: /CONTRIBUTING.md [two-factor authentication]: https://help.github.com/articles/about-two-factor-authentication -[pantheon-dev@pegasys.tech]: mailto:pantheon-dev@pegasys.tech -[Pantheon Gitter]: https://gitter.im/PegaSysEng/pantheon -[Pantheon Documentation]: https://pantheon.readthedocs.io/ +[besu-dev@pegasys.tech]: mailto:besu-dev@pegasys.tech +[Besu RocketChat]: https://chat.hyperledger.org/channel/besu +[Besu Documentation]: https://besu.readthedocs.io/ diff --git a/docs/development/building.md b/docs/development/building.md index 2f03e71fc8..2f1ba7c501 100644 --- a/docs/development/building.md +++ b/docs/development/building.md @@ -7,8 +7,8 @@ ## Quick start ```sh -git clone --recursive https://github.com/PegasysEng/pantheon -cd pantheon +git clone --recursive https://github.com/hyperledger/besu +cd besu ./gradlew build ./gradlew integrationTest ``` @@ -16,17 +16,17 @@ cd pantheon ## Checkout source code ``` -git clone --recursive git@github.com:PegasysEng/pantheon.git +git clone --recursive git@github.com:hyperledger/besu.git ``` OR ``` -git clone --recursive https://github.com/PegasysEng/pantheon +git clone --recursive https://github.com/hyperledger/besu ``` ## See what tasks are available To see all of the gradle tasks that are available: ``` -cd pantheon +cd besu ./gradlew tasks ``` @@ -34,7 +34,7 @@ cd pantheon ## Build from source After you have checked out the code, this will build the distribution binaries. ``` -cd pantheon +cd besu ./gradlew build ``` @@ -70,11 +70,11 @@ as part of the unit test suite as described above, but for debugging, it is often convenient to run only a subset of those tests, for which a few convenience as provided. For instance, one can run only "Frontier" general state tests with ``` -./gradlew :ethereum:tech.pegasys.pantheon.ethereum.vm:referenceTest -Dtest.single=GeneralStateTest -Dtest.ethereum.state.eip=Frontier +./gradlew :ethereum:org.hyperledger.besu.ethereum.vm:referenceTest -Dtest.single=GeneralStateTest -Dtest.ethereum.state.eip=Frontier ``` or only the tests that match a particular pattern with something like: ``` -gradle :ethereum:tech.pegasys.pantheon.ethereum.vm:test -Dtest.single=GeneralStateTest -Dtest.ethereum.include='^CALLCODE.*-Frontier' +gradle :ethereum:org.hyperledger.besu.ethereum.vm:test -Dtest.single=GeneralStateTest -Dtest.ethereum.include='^CALLCODE.*-Frontier' ``` Please see the comment on the `test` target in the top level `build.gradle` file for more details. diff --git a/docs/development/logging.md b/docs/development/logging.md index 7ce6b5b2a7..8edfb4aa0e 100644 --- a/docs/development/logging.md +++ b/docs/development/logging.md @@ -15,7 +15,7 @@ ALL: All levels including custom levels. ``` One mechanism of globally effecting the log output of a running client is though modification the file -`/pantheon/src/main/resources/log4j2.xml`, where it can be specified under the ``. +`/besu/src/main/resources/log4j2.xml`, where it can be specified under the ``. As such, corresponding instances of information logs throughout the codebase, e.g. `log.fatal("Fatal Message!");`, will be rendered to the console while the client is in use. diff --git a/docs/development/running-developer-builds.md b/docs/development/running-developer-builds.md index 832a4591cb..f7ebf3924b 100644 --- a/docs/development/running-developer-builds.md +++ b/docs/development/running-developer-builds.md @@ -1,17 +1,17 @@ # Running Developer Builds -Build and run Pantheon with default options using: +Build and run Besu with default options using: ``` ./gradlew installDist ``` -By default this stores all persistent data in `build/install/pantheon`. +By default this stores all persistent data in `build/install/besu`. -To set custom CLI arguments for the Pantheon execution: +To set custom CLI arguments for the Besu execution: ```sh -cd build/install/pantheon +cd build/install/besu -./bin/pantheon --discovery-enabled=false --data-path=/tmp/pantheontmp +./bin/besu --discovery-enabled=false --data-path=/tmp/besutmp ``` diff --git a/enclave/src/integration-test/java/tech/pegasys/pantheon/enclave/EnclaveTest.java b/enclave/src/integration-test/java/org/hyperledger/besu/enclave/EnclaveTest.java similarity index 88% rename from enclave/src/integration-test/java/tech/pegasys/pantheon/enclave/EnclaveTest.java rename to enclave/src/integration-test/java/org/hyperledger/besu/enclave/EnclaveTest.java index d472b5acba..b822628243 100644 --- a/enclave/src/integration-test/java/tech/pegasys/pantheon/enclave/EnclaveTest.java +++ b/enclave/src/integration-test/java/org/hyperledger/besu/enclave/EnclaveTest.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.enclave; +package org.hyperledger.besu.enclave; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import tech.pegasys.orion.testutil.OrionKeyConfiguration; -import tech.pegasys.orion.testutil.OrionTestHarness; -import tech.pegasys.orion.testutil.OrionTestHarnessFactory; -import tech.pegasys.pantheon.enclave.types.CreatePrivacyGroupRequest; -import tech.pegasys.pantheon.enclave.types.DeletePrivacyGroupRequest; -import tech.pegasys.pantheon.enclave.types.FindPrivacyGroupRequest; -import tech.pegasys.pantheon.enclave.types.PrivacyGroup; -import tech.pegasys.pantheon.enclave.types.ReceiveRequest; -import tech.pegasys.pantheon.enclave.types.ReceiveResponse; -import tech.pegasys.pantheon.enclave.types.SendRequestLegacy; -import tech.pegasys.pantheon.enclave.types.SendRequestPantheon; -import tech.pegasys.pantheon.enclave.types.SendResponse; +import org.hyperledger.besu.enclave.types.CreatePrivacyGroupRequest; +import org.hyperledger.besu.enclave.types.DeletePrivacyGroupRequest; +import org.hyperledger.besu.enclave.types.FindPrivacyGroupRequest; +import org.hyperledger.besu.enclave.types.PrivacyGroup; +import org.hyperledger.besu.enclave.types.ReceiveRequest; +import org.hyperledger.besu.enclave.types.ReceiveResponse; +import org.hyperledger.besu.enclave.types.SendRequestBesu; +import org.hyperledger.besu.enclave.types.SendRequestLegacy; +import org.hyperledger.besu.enclave.types.SendResponse; +import org.hyperledger.orion.testutil.OrionKeyConfiguration; +import org.hyperledger.orion.testutil.OrionTestHarness; +import org.hyperledger.orion.testutil.OrionTestHarnessFactory; import java.io.IOException; import java.net.URI; @@ -109,7 +109,7 @@ public class EnclaveTest { final SendResponse sr = enclave.send( - new SendRequestPantheon( + new SendRequestBesu( PAYLOAD, publicKeys.get(0), privacyGroupResponse.getPrivacyGroupId())); final ReceiveResponse rr = enclave.receive(new ReceiveRequest(sr.getKey(), publicKeys.get(0))); assertThat(rr).isNotNull(); diff --git a/enclave/src/main/java/tech/pegasys/pantheon/enclave/Enclave.java b/enclave/src/main/java/org/hyperledger/besu/enclave/Enclave.java similarity index 88% rename from enclave/src/main/java/tech/pegasys/pantheon/enclave/Enclave.java rename to enclave/src/main/java/org/hyperledger/besu/enclave/Enclave.java index cb3eec4126..3caa23e6df 100644 --- a/enclave/src/main/java/tech/pegasys/pantheon/enclave/Enclave.java +++ b/enclave/src/main/java/org/hyperledger/besu/enclave/Enclave.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.enclave; - -import tech.pegasys.pantheon.enclave.types.CreatePrivacyGroupRequest; -import tech.pegasys.pantheon.enclave.types.DeletePrivacyGroupRequest; -import tech.pegasys.pantheon.enclave.types.ErrorResponse; -import tech.pegasys.pantheon.enclave.types.FindPrivacyGroupRequest; -import tech.pegasys.pantheon.enclave.types.PrivacyGroup; -import tech.pegasys.pantheon.enclave.types.ReceiveRequest; -import tech.pegasys.pantheon.enclave.types.ReceiveResponse; -import tech.pegasys.pantheon.enclave.types.SendRequest; -import tech.pegasys.pantheon.enclave.types.SendResponse; +package org.hyperledger.besu.enclave; + +import org.hyperledger.besu.enclave.types.CreatePrivacyGroupRequest; +import org.hyperledger.besu.enclave.types.DeletePrivacyGroupRequest; +import org.hyperledger.besu.enclave.types.ErrorResponse; +import org.hyperledger.besu.enclave.types.FindPrivacyGroupRequest; +import org.hyperledger.besu.enclave.types.PrivacyGroup; +import org.hyperledger.besu.enclave.types.ReceiveRequest; +import org.hyperledger.besu.enclave.types.ReceiveResponse; +import org.hyperledger.besu.enclave.types.SendRequest; +import org.hyperledger.besu.enclave.types.SendResponse; import java.io.IOException; import java.net.URI; diff --git a/enclave/src/main/java/tech/pegasys/pantheon/enclave/EnclaveException.java b/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveException.java similarity index 95% rename from enclave/src/main/java/tech/pegasys/pantheon/enclave/EnclaveException.java rename to enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveException.java index 10b48fdda6..11c29666df 100644 --- a/enclave/src/main/java/tech/pegasys/pantheon/enclave/EnclaveException.java +++ b/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.enclave; +package org.hyperledger.besu.enclave; public class EnclaveException extends IllegalArgumentException { public EnclaveException(final String message) { diff --git a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/CreatePrivacyGroupRequest.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/CreatePrivacyGroupRequest.java similarity index 97% rename from enclave/src/main/java/tech/pegasys/pantheon/enclave/types/CreatePrivacyGroupRequest.java rename to enclave/src/main/java/org/hyperledger/besu/enclave/types/CreatePrivacyGroupRequest.java index 260c6a89d3..eb633a5795 100644 --- a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/CreatePrivacyGroupRequest.java +++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/CreatePrivacyGroupRequest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.enclave.types; +package org.hyperledger.besu.enclave.types; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/DeletePrivacyGroupRequest.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/DeletePrivacyGroupRequest.java similarity index 96% rename from enclave/src/main/java/tech/pegasys/pantheon/enclave/types/DeletePrivacyGroupRequest.java rename to enclave/src/main/java/org/hyperledger/besu/enclave/types/DeletePrivacyGroupRequest.java index 401e8272ee..46051aff02 100644 --- a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/DeletePrivacyGroupRequest.java +++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/DeletePrivacyGroupRequest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.enclave.types; +package org.hyperledger.besu.enclave.types; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/ErrorResponse.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/ErrorResponse.java similarity index 95% rename from enclave/src/main/java/tech/pegasys/pantheon/enclave/types/ErrorResponse.java rename to enclave/src/main/java/org/hyperledger/besu/enclave/types/ErrorResponse.java index 5e760864aa..a529f34f3a 100644 --- a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/ErrorResponse.java +++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/ErrorResponse.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.enclave.types; +package org.hyperledger.besu.enclave.types; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/FindPrivacyGroupRequest.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/FindPrivacyGroupRequest.java similarity index 95% rename from enclave/src/main/java/tech/pegasys/pantheon/enclave/types/FindPrivacyGroupRequest.java rename to enclave/src/main/java/org/hyperledger/besu/enclave/types/FindPrivacyGroupRequest.java index eeef111696..337e1d2631 100644 --- a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/FindPrivacyGroupRequest.java +++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/FindPrivacyGroupRequest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.enclave.types; +package org.hyperledger.besu.enclave.types; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/PrivacyGroup.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/PrivacyGroup.java similarity index 97% rename from enclave/src/main/java/tech/pegasys/pantheon/enclave/types/PrivacyGroup.java rename to enclave/src/main/java/org/hyperledger/besu/enclave/types/PrivacyGroup.java index acd02cb41b..18c4b83ff4 100644 --- a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/PrivacyGroup.java +++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/PrivacyGroup.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.enclave.types; +package org.hyperledger.besu.enclave.types; import java.io.Serializable; diff --git a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/ReceiveRequest.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/ReceiveRequest.java similarity index 95% rename from enclave/src/main/java/tech/pegasys/pantheon/enclave/types/ReceiveRequest.java rename to enclave/src/main/java/org/hyperledger/besu/enclave/types/ReceiveRequest.java index cbead09ecb..036f1d1c7d 100644 --- a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/ReceiveRequest.java +++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/ReceiveRequest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.enclave.types; +package org.hyperledger.besu.enclave.types; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/ReceiveResponse.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/ReceiveResponse.java similarity index 96% rename from enclave/src/main/java/tech/pegasys/pantheon/enclave/types/ReceiveResponse.java rename to enclave/src/main/java/org/hyperledger/besu/enclave/types/ReceiveResponse.java index 6f6d6d2ac5..537261b7ff 100644 --- a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/ReceiveResponse.java +++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/ReceiveResponse.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.enclave.types; +package org.hyperledger.besu.enclave.types; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/SendRequest.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequest.java similarity index 95% rename from enclave/src/main/java/tech/pegasys/pantheon/enclave/types/SendRequest.java rename to enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequest.java index 5c2a29525f..edfbec8b1d 100644 --- a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/SendRequest.java +++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.enclave.types; +package org.hyperledger.besu.enclave.types; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/SendRequestPantheon.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequestBesu.java similarity index 89% rename from enclave/src/main/java/tech/pegasys/pantheon/enclave/types/SendRequestPantheon.java rename to enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequestBesu.java index 67f9229ad9..19508a1182 100644 --- a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/SendRequestPantheon.java +++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequestBesu.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.enclave.types; +package org.hyperledger.besu.enclave.types; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonPropertyOrder({"payload", "from", "privacyGroupId"}) -public class SendRequestPantheon extends SendRequest { +public class SendRequestBesu extends SendRequest { private String privacyGroupId; - public SendRequestPantheon( + public SendRequestBesu( @JsonProperty(value = "payload") final String payload, @JsonProperty(value = "from") final String from, @JsonProperty(value = "to") final String privacyGroupId) { diff --git a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/SendRequestLegacy.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequestLegacy.java similarity index 96% rename from enclave/src/main/java/tech/pegasys/pantheon/enclave/types/SendRequestLegacy.java rename to enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequestLegacy.java index d220589ed9..587d915f0f 100644 --- a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/SendRequestLegacy.java +++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequestLegacy.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.enclave.types; +package org.hyperledger.besu.enclave.types; import java.util.List; diff --git a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/SendResponse.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendResponse.java similarity index 95% rename from enclave/src/main/java/tech/pegasys/pantheon/enclave/types/SendResponse.java rename to enclave/src/main/java/org/hyperledger/besu/enclave/types/SendResponse.java index e42f2b1416..7f51028136 100644 --- a/enclave/src/main/java/tech/pegasys/pantheon/enclave/types/SendResponse.java +++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendResponse.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.enclave.types; +package org.hyperledger.besu.enclave.types; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/BannedMethod.java b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/BannedMethod.java similarity index 98% rename from errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/BannedMethod.java rename to errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/BannedMethod.java index 4321542e45..8954efea07 100644 --- a/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/BannedMethod.java +++ b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/BannedMethod.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import static com.google.errorprone.BugPattern.SeverityLevel.WARNING; import static com.google.errorprone.bugpatterns.BugChecker.MethodInvocationTreeMatcher; diff --git a/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectly.java b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectly.java similarity index 98% rename from errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectly.java rename to errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectly.java index 234264b0ec..f992868d34 100644 --- a/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectly.java +++ b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectly.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import static com.google.errorprone.BugPattern.SeverityLevel.WARNING; diff --git a/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectly.java b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectly.java similarity index 97% rename from errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectly.java rename to errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectly.java index 630033beff..226bcea698 100644 --- a/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectly.java +++ b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectly.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import static com.google.errorprone.BugPattern.SeverityLevel.WARNING; diff --git a/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotReturnNullOptionals.java b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionals.java similarity index 98% rename from errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotReturnNullOptionals.java rename to errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionals.java index 38cca2d371..df7af8a1d6 100644 --- a/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotReturnNullOptionals.java +++ b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionals.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION; import static com.google.errorprone.matchers.Matchers.contains; diff --git a/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinal.java b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinal.java similarity index 98% rename from errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinal.java rename to errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinal.java index 9e8e0451d0..3ba4d3041b 100644 --- a/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinal.java +++ b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinal.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import static com.google.errorprone.BugPattern.SeverityLevel.WARNING; diff --git a/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/BannedMethodTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/BannedMethodTest.java similarity index 96% rename from errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/BannedMethodTest.java rename to errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/BannedMethodTest.java index 1e260bc298..1462b6713a 100644 --- a/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/BannedMethodTest.java +++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/BannedMethodTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import com.google.errorprone.CompilationTestHelper; import org.junit.Before; diff --git a/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java similarity index 96% rename from errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java rename to errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java index 84059c52d2..841a650407 100644 --- a/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java +++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import com.google.errorprone.CompilationTestHelper; import org.junit.Before; diff --git a/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java similarity index 96% rename from errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java rename to errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java index 1a8171833d..f90ac8c388 100644 --- a/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java +++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import com.google.errorprone.CompilationTestHelper; import org.junit.Before; diff --git a/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsTest.java similarity index 96% rename from errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsTest.java rename to errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsTest.java index 13acf78af1..f22eaa1730 100644 --- a/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsTest.java +++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import com.google.errorprone.CompilationTestHelper; import org.junit.Before; diff --git a/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalTest.java similarity index 97% rename from errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalTest.java rename to errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalTest.java index c50f1fe504..72c2a9c3e6 100644 --- a/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalTest.java +++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import com.google.errorprone.CompilationTestHelper; import org.junit.Before; diff --git a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/BannedMethodNegativeCases.java b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/BannedMethodNegativeCases.java similarity index 95% rename from errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/BannedMethodNegativeCases.java rename to errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/BannedMethodNegativeCases.java index e8e236a2d6..43877956cb 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/BannedMethodNegativeCases.java +++ b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/BannedMethodNegativeCases.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import java.util.Objects; diff --git a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/BannedMethodPositiveCases.java b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/BannedMethodPositiveCases.java similarity index 98% rename from errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/BannedMethodPositiveCases.java rename to errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/BannedMethodPositiveCases.java index 5d33149b7a..767a41b0ef 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/BannedMethodPositiveCases.java +++ b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/BannedMethodPositiveCases.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import com.google.common.base.Objects; diff --git a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyNegativeCases.java b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyNegativeCases.java similarity index 96% rename from errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyNegativeCases.java rename to errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyNegativeCases.java index 5a90233b37..57851eb8cb 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyNegativeCases.java +++ b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyNegativeCases.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import java.security.Provider; import java.security.SecureRandom; diff --git a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyPositiveCases.java b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyPositiveCases.java similarity index 97% rename from errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyPositiveCases.java rename to errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyPositiveCases.java index 68ff05de3d..3519d1851e 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyPositiveCases.java +++ b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyPositiveCases.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import java.security.Provider; import java.security.SecureRandom; diff --git a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyNegativeCases.java b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyNegativeCases.java similarity index 95% rename from errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyNegativeCases.java rename to errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyNegativeCases.java index 4f2e753f14..a12ccc3f6c 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyNegativeCases.java +++ b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyNegativeCases.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyPositiveCases.java b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyPositiveCases.java similarity index 95% rename from errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyPositiveCases.java rename to errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyPositiveCases.java index 2f145f8319..2cb0005330 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyPositiveCases.java +++ b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyPositiveCases.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsNegativeCases.java b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsNegativeCases.java similarity index 96% rename from errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsNegativeCases.java rename to errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsNegativeCases.java index 344c0f5ea7..5569ae3ccb 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsNegativeCases.java +++ b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsNegativeCases.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import java.util.Optional; import javax.annotation.Nullable; diff --git a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsPositiveCases.java b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsPositiveCases.java similarity index 95% rename from errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsPositiveCases.java rename to errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsPositiveCases.java index df77ce3777..db41519e15 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsPositiveCases.java +++ b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsPositiveCases.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import java.util.Optional; diff --git a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalInterfaceNegativeCases.java b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalInterfaceNegativeCases.java similarity index 96% rename from errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalInterfaceNegativeCases.java rename to errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalInterfaceNegativeCases.java index 57731dc5c2..1fb6df7fe3 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalInterfaceNegativeCases.java +++ b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalInterfaceNegativeCases.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; import java.util.Observable; import java.util.Observer; diff --git a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalInterfacePositiveCases.java b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalInterfacePositiveCases.java similarity index 95% rename from errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalInterfacePositiveCases.java rename to errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalInterfacePositiveCases.java index aa0e048a48..3b7c01099e 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalInterfacePositiveCases.java +++ b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalInterfacePositiveCases.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; public interface MethodInputParametersMustBeFinalInterfacePositiveCases { diff --git a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalNegativeCases.java b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalNegativeCases.java similarity index 95% rename from errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalNegativeCases.java rename to errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalNegativeCases.java index c0d29da9a1..60c4b635ea 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalNegativeCases.java +++ b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalNegativeCases.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; public class MethodInputParametersMustBeFinalNegativeCases { diff --git a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalPositiveCases.java b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalPositiveCases.java similarity index 97% rename from errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalPositiveCases.java rename to errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalPositiveCases.java index c35b5b4249..dba0afda86 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalPositiveCases.java +++ b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalPositiveCases.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.errorpronechecks; +package org.hyperledger.errorpronechecks; public class MethodInputParametersMustBeFinalPositiveCases { diff --git a/ethereum/api/build.gradle b/ethereum/api/build.gradle index 6429bd3f9e..4ee2840057 100644 --- a/ethereum/api/build.gradle +++ b/ethereum/api/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-api' + baseName 'besu-api' manifest { attributes( 'Specification-Title': baseName, diff --git a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/BlockchainImporter.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/BlockchainImporter.java similarity index 78% rename from ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/BlockchainImporter.java rename to ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/BlockchainImporter.java index cc74535f2e..836b3f3ed2 100644 --- a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/BlockchainImporter.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/BlockchainImporter.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.ethereum.chain.GenesisState; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.util.RawBlockIterator; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.ethereum.chain.GenesisState; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.util.RawBlockIterator; import java.net.URL; import java.nio.file.Paths; diff --git a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcResponseKey.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseKey.java similarity index 94% rename from ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcResponseKey.java rename to ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseKey.java index 4d7c3987d3..45e315a3aa 100644 --- a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcResponseKey.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseKey.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; public enum JsonRpcResponseKey { COINBASE, diff --git a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcResponseUtils.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java similarity index 69% rename from ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcResponseUtils.java rename to ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java index a7558ba59d..883f836e82 100644 --- a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcResponseUtils.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java @@ -10,45 +10,45 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; - +package org.hyperledger.besu.ethereum.api.jsonrpc; + +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.COINBASE; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.DIFFICULTY; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.EXTRA_DATA; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.GAS_LIMIT; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.GAS_USED; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.LOGS_BLOOM; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.MIX_HASH; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.NONCE; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.NUMBER; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.OMMERS_HASH; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.PARENT_HASH; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.RECEIPTS_ROOT; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.SIZE; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.STATE_ROOT; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.TIMESTAMP; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY; +import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.COINBASE; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.DIFFICULTY; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.EXTRA_DATA; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.GAS_LIMIT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.GAS_USED; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.LOGS_BLOOM; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.MIX_HASH; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.NONCE; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.NUMBER; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.OMMERS_HASH; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.PARENT_HASH; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.RECEIPTS_ROOT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.SIZE; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.STATE_ROOT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.TIMESTAMP; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT; - -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.BlockResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionCompleteResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionHashResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionResult; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogsBloomFilter; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; + +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionCompleteResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionHashResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionResult; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.LogsBloomFilter; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.util.ArrayList; diff --git a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java similarity index 65% rename from ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java rename to ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java index bf2642d78e..ef95a631f2 100644 --- a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java @@ -10,38 +10,38 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; import static org.mockito.Mockito.mock; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; -import tech.pegasys.pantheon.config.StubGenesisConfigOptions; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterIdGenerator; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterRepository; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.config.StubGenesisConfigOptions; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterIdGenerator; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterRepository; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.ObservableMetricsSystem; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; import java.math.BigInteger; import java.util.HashSet; diff --git a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthCallIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthCallIntegrationTest.java similarity index 84% rename from ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthCallIntegrationTest.java rename to ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthCallIntegrationTest.java index 7c5ce6fe05..62d0719be5 100644 --- a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthCallIntegrationTest.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthCallIntegrationTest.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.BlockchainImporter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.transaction.CallParameter; -import tech.pegasys.pantheon.testutil.BlockTestUtil; +import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.transaction.CallParameter; +import org.hyperledger.besu.testutil.BlockTestUtil; import java.util.Map; diff --git a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthEstimateGasIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthEstimateGasIntegrationTest.java similarity index 88% rename from ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthEstimateGasIntegrationTest.java rename to ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthEstimateGasIntegrationTest.java index ac7b50ca82..48ccc63e45 100644 --- a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthEstimateGasIntegrationTest.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthEstimateGasIntegrationTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.methods; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.BlockchainImporter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.transaction.CallParameter; -import tech.pegasys.pantheon.testutil.BlockTestUtil; +import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.transaction.CallParameter; +import org.hyperledger.besu.testutil.BlockTestUtil; import java.util.Map; diff --git a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetBlockByHashIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetBlockByHashIntegrationTest.java similarity index 67% rename from ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetBlockByHashIntegrationTest.java rename to ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetBlockByHashIntegrationTest.java index 6554f6d0d8..99d10bf3b4 100644 --- a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetBlockByHashIntegrationTest.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetBlockByHashIntegrationTest.java @@ -10,38 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.methods; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.COINBASE; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.DIFFICULTY; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.EXTRA_DATA; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.GAS_LIMIT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.GAS_USED; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.LOGS_BLOOM; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.MIX_HASH; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.NONCE; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.NUMBER; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.OMMERS_HASH; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.PARENT_HASH; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.RECEIPTS_ROOT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.SIZE; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.STATE_ROOT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.TIMESTAMP; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.BlockchainImporter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseUtils; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionResult; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.testutil.BlockTestUtil; + +import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseUtils; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionResult; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.testutil.BlockTestUtil; import java.util.EnumMap; import java.util.List; @@ -95,31 +78,37 @@ public class EthGetBlockByHashIntegrationTest { @Test public void returnFullTransactionIfBlockFound() { final Map expectedResult = new EnumMap<>(JsonRpcResponseKey.class); - expectedResult.put(NUMBER, "0x1"); + expectedResult.put(JsonRpcResponseKey.NUMBER, "0x1"); expectedResult.put( - MIX_HASH, "0x552dd5ae3ccb7a278c6cedda27e48963101be56526a8ee8d70e8227f2c08edf0"); + JsonRpcResponseKey.MIX_HASH, + "0x552dd5ae3ccb7a278c6cedda27e48963101be56526a8ee8d70e8227f2c08edf0"); expectedResult.put( - PARENT_HASH, "0xf8f01382f5636d02edac7fff679a6feb7a572d37a395daaab77938feb6fe217f"); - expectedResult.put(NONCE, "0xbd2b1f0ebba7b989"); + JsonRpcResponseKey.PARENT_HASH, + "0xf8f01382f5636d02edac7fff679a6feb7a572d37a395daaab77938feb6fe217f"); + expectedResult.put(JsonRpcResponseKey.NONCE, "0xbd2b1f0ebba7b989"); expectedResult.put( - OMMERS_HASH, "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); + JsonRpcResponseKey.OMMERS_HASH, + "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); expectedResult.put( - LOGS_BLOOM, + JsonRpcResponseKey.LOGS_BLOOM, "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"); expectedResult.put( - TRANSACTION_ROOT, "0x3ccbb984a0a736604acae327d9b643f8e75c7931cb2c6ac10dab4226e2e4c5a3"); + JsonRpcResponseKey.TRANSACTION_ROOT, + "0x3ccbb984a0a736604acae327d9b643f8e75c7931cb2c6ac10dab4226e2e4c5a3"); expectedResult.put( - STATE_ROOT, "0xee57559895449b8dbd0a096b2999cf97b517b645ec8db33c7f5934778672263e"); + JsonRpcResponseKey.STATE_ROOT, + "0xee57559895449b8dbd0a096b2999cf97b517b645ec8db33c7f5934778672263e"); expectedResult.put( - RECEIPTS_ROOT, "0xa2bd925fcbb8b1ec39612553b17c9265ab198f5af25cc564655114bf5a28c75d"); - expectedResult.put(COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1"); - expectedResult.put(DIFFICULTY, "0x20000"); - expectedResult.put(TOTAL_DIFFICULTY, "0x40000"); - expectedResult.put(EXTRA_DATA, "0x"); - expectedResult.put(SIZE, "0x96a"); - expectedResult.put(GAS_LIMIT, "0x2fefd8"); - expectedResult.put(GAS_USED, "0x78674"); - expectedResult.put(TIMESTAMP, "0x561bc2e0"); + JsonRpcResponseKey.RECEIPTS_ROOT, + "0xa2bd925fcbb8b1ec39612553b17c9265ab198f5af25cc564655114bf5a28c75d"); + expectedResult.put(JsonRpcResponseKey.COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1"); + expectedResult.put(JsonRpcResponseKey.DIFFICULTY, "0x20000"); + expectedResult.put(JsonRpcResponseKey.TOTAL_DIFFICULTY, "0x40000"); + expectedResult.put(JsonRpcResponseKey.EXTRA_DATA, "0x"); + expectedResult.put(JsonRpcResponseKey.SIZE, "0x96a"); + expectedResult.put(JsonRpcResponseKey.GAS_LIMIT, "0x2fefd8"); + expectedResult.put(JsonRpcResponseKey.GAS_USED, "0x78674"); + expectedResult.put(JsonRpcResponseKey.TIMESTAMP, "0x561bc2e0"); final List transactions = responseUtils.transactions( responseUtils.transaction( @@ -151,31 +140,37 @@ public class EthGetBlockByHashIntegrationTest { @Test public void returnTransactionHashOnlyIfBlockFound() { final Map expectedResult = new EnumMap<>(JsonRpcResponseKey.class); - expectedResult.put(NUMBER, "0x1"); + expectedResult.put(JsonRpcResponseKey.NUMBER, "0x1"); expectedResult.put( - MIX_HASH, "0x552dd5ae3ccb7a278c6cedda27e48963101be56526a8ee8d70e8227f2c08edf0"); + JsonRpcResponseKey.MIX_HASH, + "0x552dd5ae3ccb7a278c6cedda27e48963101be56526a8ee8d70e8227f2c08edf0"); expectedResult.put( - PARENT_HASH, "0xf8f01382f5636d02edac7fff679a6feb7a572d37a395daaab77938feb6fe217f"); - expectedResult.put(NONCE, "0xbd2b1f0ebba7b989"); + JsonRpcResponseKey.PARENT_HASH, + "0xf8f01382f5636d02edac7fff679a6feb7a572d37a395daaab77938feb6fe217f"); + expectedResult.put(JsonRpcResponseKey.NONCE, "0xbd2b1f0ebba7b989"); expectedResult.put( - OMMERS_HASH, "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); + JsonRpcResponseKey.OMMERS_HASH, + "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); expectedResult.put( - LOGS_BLOOM, + JsonRpcResponseKey.LOGS_BLOOM, "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"); expectedResult.put( - TRANSACTION_ROOT, "0x3ccbb984a0a736604acae327d9b643f8e75c7931cb2c6ac10dab4226e2e4c5a3"); + JsonRpcResponseKey.TRANSACTION_ROOT, + "0x3ccbb984a0a736604acae327d9b643f8e75c7931cb2c6ac10dab4226e2e4c5a3"); expectedResult.put( - STATE_ROOT, "0xee57559895449b8dbd0a096b2999cf97b517b645ec8db33c7f5934778672263e"); + JsonRpcResponseKey.STATE_ROOT, + "0xee57559895449b8dbd0a096b2999cf97b517b645ec8db33c7f5934778672263e"); expectedResult.put( - RECEIPTS_ROOT, "0xa2bd925fcbb8b1ec39612553b17c9265ab198f5af25cc564655114bf5a28c75d"); - expectedResult.put(COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1"); - expectedResult.put(DIFFICULTY, "0x20000"); - expectedResult.put(TOTAL_DIFFICULTY, "0x40000"); - expectedResult.put(EXTRA_DATA, "0x"); - expectedResult.put(SIZE, "0x96a"); - expectedResult.put(GAS_LIMIT, "0x2fefd8"); - expectedResult.put(GAS_USED, "0x78674"); - expectedResult.put(TIMESTAMP, "0x561bc2e0"); + JsonRpcResponseKey.RECEIPTS_ROOT, + "0xa2bd925fcbb8b1ec39612553b17c9265ab198f5af25cc564655114bf5a28c75d"); + expectedResult.put(JsonRpcResponseKey.COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1"); + expectedResult.put(JsonRpcResponseKey.DIFFICULTY, "0x20000"); + expectedResult.put(JsonRpcResponseKey.TOTAL_DIFFICULTY, "0x40000"); + expectedResult.put(JsonRpcResponseKey.EXTRA_DATA, "0x"); + expectedResult.put(JsonRpcResponseKey.SIZE, "0x96a"); + expectedResult.put(JsonRpcResponseKey.GAS_LIMIT, "0x2fefd8"); + expectedResult.put(JsonRpcResponseKey.GAS_USED, "0x78674"); + expectedResult.put(JsonRpcResponseKey.TIMESTAMP, "0x561bc2e0"); final List transactions = responseUtils.transactions( "0x812742182a79a8e67733edc58cfa3767aa2d7ad06439d156ddbbb33e3403b4ed"); diff --git a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetBlockByNumberIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetBlockByNumberIntegrationTest.java similarity index 58% rename from ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetBlockByNumberIntegrationTest.java rename to ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetBlockByNumberIntegrationTest.java index 7b48984f9c..3038e86184 100644 --- a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetBlockByNumberIntegrationTest.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetBlockByNumberIntegrationTest.java @@ -10,38 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.COINBASE; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.DIFFICULTY; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.EXTRA_DATA; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.GAS_LIMIT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.GAS_USED; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.LOGS_BLOOM; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.MIX_HASH; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.NONCE; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.NUMBER; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.OMMERS_HASH; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.PARENT_HASH; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.RECEIPTS_ROOT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.SIZE; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.STATE_ROOT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.TIMESTAMP; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.BlockchainImporter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseUtils; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionResult; -import tech.pegasys.pantheon.testutil.BlockTestUtil; + +import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseUtils; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionResult; +import org.hyperledger.besu.testutil.BlockTestUtil; import java.util.EnumMap; import java.util.List; @@ -90,25 +73,37 @@ public class EthGetBlockByNumberIntegrationTest { @Test public void earliestBlockHashes() { final Map out = new EnumMap<>(JsonRpcResponseKey.class); - out.put(COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1"); - out.put(DIFFICULTY, "0x20000"); - out.put(EXTRA_DATA, "0x42"); - out.put(GAS_LIMIT, "0x2fefd8"); - out.put(GAS_USED, "0x0"); + out.put(JsonRpcResponseKey.COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1"); + out.put(JsonRpcResponseKey.DIFFICULTY, "0x20000"); + out.put(JsonRpcResponseKey.EXTRA_DATA, "0x42"); + out.put(JsonRpcResponseKey.GAS_LIMIT, "0x2fefd8"); + out.put(JsonRpcResponseKey.GAS_USED, "0x0"); out.put( - LOGS_BLOOM, + JsonRpcResponseKey.LOGS_BLOOM, "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"); - out.put(MIX_HASH, "0x2c85bcbce56429100b2108254bb56906257582aeafcbd682bc9af67a9f5aee46"); - out.put(NONCE, "0x78cc16f7b4f65485"); - out.put(NUMBER, "0x0"); - out.put(OMMERS_HASH, "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); - out.put(PARENT_HASH, "0x0000000000000000000000000000000000000000000000000000000000000000"); - out.put(RECEIPTS_ROOT, "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"); - out.put(STATE_ROOT, "0x7dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1"); - out.put(SIZE, "0x1ff"); - out.put(TIMESTAMP, "0x54c98c81"); - out.put(TOTAL_DIFFICULTY, "0x20000"); - out.put(TRANSACTION_ROOT, "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"); + out.put( + JsonRpcResponseKey.MIX_HASH, + "0x2c85bcbce56429100b2108254bb56906257582aeafcbd682bc9af67a9f5aee46"); + out.put(JsonRpcResponseKey.NONCE, "0x78cc16f7b4f65485"); + out.put(JsonRpcResponseKey.NUMBER, "0x0"); + out.put( + JsonRpcResponseKey.OMMERS_HASH, + "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); + out.put( + JsonRpcResponseKey.PARENT_HASH, + "0x0000000000000000000000000000000000000000000000000000000000000000"); + out.put( + JsonRpcResponseKey.RECEIPTS_ROOT, + "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"); + out.put( + JsonRpcResponseKey.STATE_ROOT, + "0x7dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1"); + out.put(JsonRpcResponseKey.SIZE, "0x1ff"); + out.put(JsonRpcResponseKey.TIMESTAMP, "0x54c98c81"); + out.put(JsonRpcResponseKey.TOTAL_DIFFICULTY, "0x20000"); + out.put( + JsonRpcResponseKey.TRANSACTION_ROOT, + "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"); final JsonRpcResponse expected = responseUtils.response(out); final JsonRpcRequest request = requestWithParams("earliest", false); @@ -120,25 +115,37 @@ public class EthGetBlockByNumberIntegrationTest { @Test public void earliestBlockTransactions() { final Map out = new EnumMap<>(JsonRpcResponseKey.class); - out.put(COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1"); - out.put(DIFFICULTY, "0x20000"); - out.put(EXTRA_DATA, "0x42"); - out.put(GAS_LIMIT, "0x2fefd8"); - out.put(GAS_USED, "0x0"); + out.put(JsonRpcResponseKey.COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1"); + out.put(JsonRpcResponseKey.DIFFICULTY, "0x20000"); + out.put(JsonRpcResponseKey.EXTRA_DATA, "0x42"); + out.put(JsonRpcResponseKey.GAS_LIMIT, "0x2fefd8"); + out.put(JsonRpcResponseKey.GAS_USED, "0x0"); out.put( - LOGS_BLOOM, + JsonRpcResponseKey.LOGS_BLOOM, "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"); - out.put(MIX_HASH, "0x2c85bcbce56429100b2108254bb56906257582aeafcbd682bc9af67a9f5aee46"); - out.put(NONCE, "0x78cc16f7b4f65485"); - out.put(NUMBER, "0x0"); - out.put(OMMERS_HASH, "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); - out.put(PARENT_HASH, "0x0000000000000000000000000000000000000000000000000000000000000000"); - out.put(RECEIPTS_ROOT, "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"); - out.put(STATE_ROOT, "0x7dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1"); - out.put(SIZE, "0x1ff"); - out.put(TIMESTAMP, "0x54c98c81"); - out.put(TOTAL_DIFFICULTY, "0x20000"); - out.put(TRANSACTION_ROOT, "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"); + out.put( + JsonRpcResponseKey.MIX_HASH, + "0x2c85bcbce56429100b2108254bb56906257582aeafcbd682bc9af67a9f5aee46"); + out.put(JsonRpcResponseKey.NONCE, "0x78cc16f7b4f65485"); + out.put(JsonRpcResponseKey.NUMBER, "0x0"); + out.put( + JsonRpcResponseKey.OMMERS_HASH, + "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); + out.put( + JsonRpcResponseKey.PARENT_HASH, + "0x0000000000000000000000000000000000000000000000000000000000000000"); + out.put( + JsonRpcResponseKey.RECEIPTS_ROOT, + "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"); + out.put( + JsonRpcResponseKey.STATE_ROOT, + "0x7dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1"); + out.put(JsonRpcResponseKey.SIZE, "0x1ff"); + out.put(JsonRpcResponseKey.TIMESTAMP, "0x54c98c81"); + out.put(JsonRpcResponseKey.TOTAL_DIFFICULTY, "0x20000"); + out.put( + JsonRpcResponseKey.TRANSACTION_ROOT, + "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"); final JsonRpcResponse expected = responseUtils.response(out); final JsonRpcRequest request = requestWithParams("earliest", true); @@ -149,25 +156,37 @@ public class EthGetBlockByNumberIntegrationTest { private JsonRpcResponse expectedLatestBlockHashes() { final Map out = new EnumMap<>(JsonRpcResponseKey.class); - out.put(COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1"); - out.put(DIFFICULTY, "0x207c0"); - out.put(EXTRA_DATA, "0x"); - out.put(GAS_LIMIT, "0x2fefd8"); - out.put(GAS_USED, "0x5c99"); + out.put(JsonRpcResponseKey.COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1"); + out.put(JsonRpcResponseKey.DIFFICULTY, "0x207c0"); + out.put(JsonRpcResponseKey.EXTRA_DATA, "0x"); + out.put(JsonRpcResponseKey.GAS_LIMIT, "0x2fefd8"); + out.put(JsonRpcResponseKey.GAS_USED, "0x5c99"); out.put( - LOGS_BLOOM, + JsonRpcResponseKey.LOGS_BLOOM, "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000"); - out.put(MIX_HASH, "0x4edd77bfff565659bb0ae09421918e4def65d938a900eb94230eb01f5ce80c99"); - out.put(NONCE, "0xdb063000b00e8026"); - out.put(NUMBER, "0x20"); - out.put(OMMERS_HASH, "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); - out.put(PARENT_HASH, "0x0f765087745aa259d9e5ac39c367c57432a16ed98e3b0d81c5b51d10f301dc49"); - out.put(RECEIPTS_ROOT, "0xa50a7e67e833f4502524371ee462ccbcc6c6cabd2aeb1555c56150007a53183c"); - out.put(STATE_ROOT, "0xf65f3dd13f72f5fa5607a5224691419969b4f4bae7a00a6cdb853f2ca9eeb1be"); - out.put(SIZE, "0x268"); - out.put(TIMESTAMP, "0x561bc33d"); - out.put(TOTAL_DIFFICULTY, "0x427c00"); - out.put(TRANSACTION_ROOT, "0x6075dd391cf791c74f9e01855d9e5061d009c0903dc102e8b00bcafde8f92839"); + out.put( + JsonRpcResponseKey.MIX_HASH, + "0x4edd77bfff565659bb0ae09421918e4def65d938a900eb94230eb01f5ce80c99"); + out.put(JsonRpcResponseKey.NONCE, "0xdb063000b00e8026"); + out.put(JsonRpcResponseKey.NUMBER, "0x20"); + out.put( + JsonRpcResponseKey.OMMERS_HASH, + "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); + out.put( + JsonRpcResponseKey.PARENT_HASH, + "0x0f765087745aa259d9e5ac39c367c57432a16ed98e3b0d81c5b51d10f301dc49"); + out.put( + JsonRpcResponseKey.RECEIPTS_ROOT, + "0xa50a7e67e833f4502524371ee462ccbcc6c6cabd2aeb1555c56150007a53183c"); + out.put( + JsonRpcResponseKey.STATE_ROOT, + "0xf65f3dd13f72f5fa5607a5224691419969b4f4bae7a00a6cdb853f2ca9eeb1be"); + out.put(JsonRpcResponseKey.SIZE, "0x268"); + out.put(JsonRpcResponseKey.TIMESTAMP, "0x561bc33d"); + out.put(JsonRpcResponseKey.TOTAL_DIFFICULTY, "0x427c00"); + out.put( + JsonRpcResponseKey.TRANSACTION_ROOT, + "0x6075dd391cf791c74f9e01855d9e5061d009c0903dc102e8b00bcafde8f92839"); final List transactions = responseUtils.transactions( "0xcef53f2311d7c80e9086d661e69ac11a5f3d081e28e02a9ba9b66749407ac310"); @@ -186,25 +205,37 @@ public class EthGetBlockByNumberIntegrationTest { private JsonRpcResponse expectedLatestBlockTransactions() { final Map out = new EnumMap<>(JsonRpcResponseKey.class); - out.put(COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1"); - out.put(DIFFICULTY, "0x207c0"); - out.put(EXTRA_DATA, "0x"); - out.put(GAS_LIMIT, "0x2fefd8"); - out.put(GAS_USED, "0x5c99"); + out.put(JsonRpcResponseKey.COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1"); + out.put(JsonRpcResponseKey.DIFFICULTY, "0x207c0"); + out.put(JsonRpcResponseKey.EXTRA_DATA, "0x"); + out.put(JsonRpcResponseKey.GAS_LIMIT, "0x2fefd8"); + out.put(JsonRpcResponseKey.GAS_USED, "0x5c99"); out.put( - LOGS_BLOOM, + JsonRpcResponseKey.LOGS_BLOOM, "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000"); - out.put(MIX_HASH, "0x4edd77bfff565659bb0ae09421918e4def65d938a900eb94230eb01f5ce80c99"); - out.put(NONCE, "0xdb063000b00e8026"); - out.put(NUMBER, "0x20"); - out.put(OMMERS_HASH, "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); - out.put(PARENT_HASH, "0x0f765087745aa259d9e5ac39c367c57432a16ed98e3b0d81c5b51d10f301dc49"); - out.put(RECEIPTS_ROOT, "0xa50a7e67e833f4502524371ee462ccbcc6c6cabd2aeb1555c56150007a53183c"); - out.put(STATE_ROOT, "0xf65f3dd13f72f5fa5607a5224691419969b4f4bae7a00a6cdb853f2ca9eeb1be"); - out.put(SIZE, "0x268"); - out.put(TIMESTAMP, "0x561bc33d"); - out.put(TOTAL_DIFFICULTY, "0x427c00"); - out.put(TRANSACTION_ROOT, "0x6075dd391cf791c74f9e01855d9e5061d009c0903dc102e8b00bcafde8f92839"); + out.put( + JsonRpcResponseKey.MIX_HASH, + "0x4edd77bfff565659bb0ae09421918e4def65d938a900eb94230eb01f5ce80c99"); + out.put(JsonRpcResponseKey.NONCE, "0xdb063000b00e8026"); + out.put(JsonRpcResponseKey.NUMBER, "0x20"); + out.put( + JsonRpcResponseKey.OMMERS_HASH, + "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); + out.put( + JsonRpcResponseKey.PARENT_HASH, + "0x0f765087745aa259d9e5ac39c367c57432a16ed98e3b0d81c5b51d10f301dc49"); + out.put( + JsonRpcResponseKey.RECEIPTS_ROOT, + "0xa50a7e67e833f4502524371ee462ccbcc6c6cabd2aeb1555c56150007a53183c"); + out.put( + JsonRpcResponseKey.STATE_ROOT, + "0xf65f3dd13f72f5fa5607a5224691419969b4f4bae7a00a6cdb853f2ca9eeb1be"); + out.put(JsonRpcResponseKey.SIZE, "0x268"); + out.put(JsonRpcResponseKey.TIMESTAMP, "0x561bc33d"); + out.put(JsonRpcResponseKey.TOTAL_DIFFICULTY, "0x427c00"); + out.put( + JsonRpcResponseKey.TRANSACTION_ROOT, + "0x6075dd391cf791c74f9e01855d9e5061d009c0903dc102e8b00bcafde8f92839"); final List transactions = responseUtils.transactions( responseUtils.transaction( @@ -258,25 +289,37 @@ public class EthGetBlockByNumberIntegrationTest { @Test public void blockSixHashes() { final Map out = new EnumMap<>(JsonRpcResponseKey.class); - out.put(COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1"); - out.put(DIFFICULTY, "0x20100"); - out.put(EXTRA_DATA, "0x"); - out.put(GAS_LIMIT, "0x2fefd8"); - out.put(GAS_USED, "0x559f"); + out.put(JsonRpcResponseKey.COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1"); + out.put(JsonRpcResponseKey.DIFFICULTY, "0x20100"); + out.put(JsonRpcResponseKey.EXTRA_DATA, "0x"); + out.put(JsonRpcResponseKey.GAS_LIMIT, "0x2fefd8"); + out.put(JsonRpcResponseKey.GAS_USED, "0x559f"); out.put( - LOGS_BLOOM, + JsonRpcResponseKey.LOGS_BLOOM, "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"); - out.put(MIX_HASH, "0x1657e6f42fc186c23d921ba9bcf93f287db353762682f675fa3969757e410e00"); - out.put(NONCE, "0xb65c663250417c60"); - out.put(NUMBER, "0x5"); - out.put(OMMERS_HASH, "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); - out.put(PARENT_HASH, "0x4e9a67b663f9abe03e7e9fd5452c9497998337077122f44ee78a466f6a7358de"); - out.put(RECEIPTS_ROOT, "0x01bf16fce84572feb648e5f3487eb3b6648a49639888a90eb552aa661f38f8bd"); - out.put(STATE_ROOT, "0x0c7a49b1ae3138ae33d88b21d5543b8d2c8e2377bd2b58e73db8ea8924395ff4"); - out.put(SIZE, "0x268"); - out.put(TIMESTAMP, "0x561bc2ec"); - out.put(TOTAL_DIFFICULTY, "0xc0280"); - out.put(TRANSACTION_ROOT, "0xd8672f45d109c2e0b27acf68fd67b9eae14957fd2bf2444210ee0d7e97bc68a6"); + out.put( + JsonRpcResponseKey.MIX_HASH, + "0x1657e6f42fc186c23d921ba9bcf93f287db353762682f675fa3969757e410e00"); + out.put(JsonRpcResponseKey.NONCE, "0xb65c663250417c60"); + out.put(JsonRpcResponseKey.NUMBER, "0x5"); + out.put( + JsonRpcResponseKey.OMMERS_HASH, + "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); + out.put( + JsonRpcResponseKey.PARENT_HASH, + "0x4e9a67b663f9abe03e7e9fd5452c9497998337077122f44ee78a466f6a7358de"); + out.put( + JsonRpcResponseKey.RECEIPTS_ROOT, + "0x01bf16fce84572feb648e5f3487eb3b6648a49639888a90eb552aa661f38f8bd"); + out.put( + JsonRpcResponseKey.STATE_ROOT, + "0x0c7a49b1ae3138ae33d88b21d5543b8d2c8e2377bd2b58e73db8ea8924395ff4"); + out.put(JsonRpcResponseKey.SIZE, "0x268"); + out.put(JsonRpcResponseKey.TIMESTAMP, "0x561bc2ec"); + out.put(JsonRpcResponseKey.TOTAL_DIFFICULTY, "0xc0280"); + out.put( + JsonRpcResponseKey.TRANSACTION_ROOT, + "0xd8672f45d109c2e0b27acf68fd67b9eae14957fd2bf2444210ee0d7e97bc68a6"); final List transactions = responseUtils.transactions( "0xec7e53d1b99ef586b3e43c1c7068311f6861d51ac3d6fbf257ac0b54ba3f2032"); @@ -291,25 +334,37 @@ public class EthGetBlockByNumberIntegrationTest { @Test public void blockSixTransactions() { final Map out = new EnumMap<>(JsonRpcResponseKey.class); - out.put(COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1"); - out.put(DIFFICULTY, "0x20100"); - out.put(EXTRA_DATA, "0x"); - out.put(GAS_LIMIT, "0x2fefd8"); - out.put(GAS_USED, "0x559f"); + out.put(JsonRpcResponseKey.COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1"); + out.put(JsonRpcResponseKey.DIFFICULTY, "0x20100"); + out.put(JsonRpcResponseKey.EXTRA_DATA, "0x"); + out.put(JsonRpcResponseKey.GAS_LIMIT, "0x2fefd8"); + out.put(JsonRpcResponseKey.GAS_USED, "0x559f"); out.put( - LOGS_BLOOM, + JsonRpcResponseKey.LOGS_BLOOM, "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"); - out.put(MIX_HASH, "0x1657e6f42fc186c23d921ba9bcf93f287db353762682f675fa3969757e410e00"); - out.put(NONCE, "0xb65c663250417c60"); - out.put(NUMBER, "0x5"); - out.put(OMMERS_HASH, "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); - out.put(PARENT_HASH, "0x4e9a67b663f9abe03e7e9fd5452c9497998337077122f44ee78a466f6a7358de"); - out.put(RECEIPTS_ROOT, "0x01bf16fce84572feb648e5f3487eb3b6648a49639888a90eb552aa661f38f8bd"); - out.put(STATE_ROOT, "0x0c7a49b1ae3138ae33d88b21d5543b8d2c8e2377bd2b58e73db8ea8924395ff4"); - out.put(SIZE, "0x268"); - out.put(TIMESTAMP, "0x561bc2ec"); - out.put(TOTAL_DIFFICULTY, "0xc0280"); - out.put(TRANSACTION_ROOT, "0xd8672f45d109c2e0b27acf68fd67b9eae14957fd2bf2444210ee0d7e97bc68a6"); + out.put( + JsonRpcResponseKey.MIX_HASH, + "0x1657e6f42fc186c23d921ba9bcf93f287db353762682f675fa3969757e410e00"); + out.put(JsonRpcResponseKey.NONCE, "0xb65c663250417c60"); + out.put(JsonRpcResponseKey.NUMBER, "0x5"); + out.put( + JsonRpcResponseKey.OMMERS_HASH, + "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); + out.put( + JsonRpcResponseKey.PARENT_HASH, + "0x4e9a67b663f9abe03e7e9fd5452c9497998337077122f44ee78a466f6a7358de"); + out.put( + JsonRpcResponseKey.RECEIPTS_ROOT, + "0x01bf16fce84572feb648e5f3487eb3b6648a49639888a90eb552aa661f38f8bd"); + out.put( + JsonRpcResponseKey.STATE_ROOT, + "0x0c7a49b1ae3138ae33d88b21d5543b8d2c8e2377bd2b58e73db8ea8924395ff4"); + out.put(JsonRpcResponseKey.SIZE, "0x268"); + out.put(JsonRpcResponseKey.TIMESTAMP, "0x561bc2ec"); + out.put(JsonRpcResponseKey.TOTAL_DIFFICULTY, "0xc0280"); + out.put( + JsonRpcResponseKey.TRANSACTION_ROOT, + "0xd8672f45d109c2e0b27acf68fd67b9eae14957fd2bf2444210ee0d7e97bc68a6"); final List transactions = responseUtils.transactions( responseUtils.transaction( diff --git a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetFilterChangesIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetFilterChangesIntegrationTest.java similarity index 79% rename from ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetFilterChangesIntegrationTest.java rename to ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetFilterChangesIntegrationTest.java index 6624c3a7f7..ce24c01361 100644 --- a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetFilterChangesIntegrationTest.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetFilterChangesIntegrationTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.methods; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; @@ -19,42 +19,42 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterIdGenerator; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterRepository; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetFilterChanges; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.ExecutionContextTestFixture; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.eth.transactions.PeerTransactionTracker; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool.TransactionBatchAddedListener; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterIdGenerator; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterRepository; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetFilterChanges; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.eth.transactions.PeerTransactionTracker; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool.TransactionBatchAddedListener; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.util.List; diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetUncleByBlockHashAndIndexIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetUncleByBlockHashAndIndexIntegrationTest.java new file mode 100644 index 0000000000..099b26b854 --- /dev/null +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetUncleByBlockHashAndIndexIntegrationTest.java @@ -0,0 +1,107 @@ +/* + * Copyright 2018 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. + */ +package org.hyperledger.besu.ethereum.api.jsonrpc.methods; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseUtils; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.testutil.BlockTestUtil; + +import java.util.EnumMap; +import java.util.Map; + +import com.google.common.base.Charsets; +import com.google.common.io.Resources; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +public class EthGetUncleByBlockHashAndIndexIntegrationTest { + + private static JsonRpcTestMethodsFactory BLOCKCHAIN; + + private final JsonRpcResponseUtils responseUtils = new JsonRpcResponseUtils(); + private JsonRpcMethod method; + + @BeforeClass + public static void setUpOnce() throws Exception { + final String genesisJson = + Resources.toString(BlockTestUtil.getTestGenesisUrl(), Charsets.UTF_8); + + BLOCKCHAIN = + new JsonRpcTestMethodsFactory( + new BlockchainImporter(BlockTestUtil.getTestBlockchainUrl(), genesisJson)); + } + + @Before + public void setUp() { + method = BLOCKCHAIN.methods().get("eth_getUncleByBlockHashAndIndex"); + } + + @Test + public void shouldGetExpectedBlockResult() { + final JsonRpcRequest request = + new JsonRpcRequest( + "2.0", + "eth_getUncleByBlockHashAndIndex", + new Object[] { + "0x4e9a67b663f9abe03e7e9fd5452c9497998337077122f44ee78a466f6a7358de", "0x0" + }); + + final Map out = new EnumMap<>(JsonRpcResponseKey.class); + out.put(JsonRpcResponseKey.COINBASE, "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"); + out.put(JsonRpcResponseKey.DIFFICULTY, "0x20040"); + out.put(JsonRpcResponseKey.EXTRA_DATA, "0x"); + out.put(JsonRpcResponseKey.GAS_LIMIT, "0x2fefd8"); + out.put(JsonRpcResponseKey.GAS_USED, "0x0"); + out.put( + JsonRpcResponseKey.LOGS_BLOOM, + "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"); + out.put( + JsonRpcResponseKey.MIX_HASH, + "0xe970d9815a634e25a778a765764d91ecc80d667a85721dcd4297d00be8d2af29"); + out.put(JsonRpcResponseKey.NONCE, "0x64050e6ee4c2f3c7"); + out.put(JsonRpcResponseKey.NUMBER, "0x2"); + out.put( + JsonRpcResponseKey.OMMERS_HASH, + "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); + out.put( + JsonRpcResponseKey.PARENT_HASH, + "0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9"); + out.put( + JsonRpcResponseKey.RECEIPTS_ROOT, + "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"); + out.put( + JsonRpcResponseKey.STATE_ROOT, + "0xee57559895449b8dbd0a096b2999cf97b517b645ec8db33c7f5934778672263e"); + out.put(JsonRpcResponseKey.SIZE, "0x1ff"); + out.put(JsonRpcResponseKey.TIMESTAMP, "0x561bc2e7"); + out.put(JsonRpcResponseKey.TOTAL_DIFFICULTY, "0x0"); + out.put( + JsonRpcResponseKey.TRANSACTION_ROOT, + "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"); + + final JsonRpcResponse expected = responseUtils.response(out); + final JsonRpcResponse actual = method.response(request); + + assertThat(actual).isInstanceOf(JsonRpcSuccessResponse.class); + assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + } +} diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetUncleByBlockNumberAndIndexIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetUncleByBlockNumberAndIndexIntegrationTest.java new file mode 100644 index 0000000000..79b70373b3 --- /dev/null +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetUncleByBlockNumberAndIndexIntegrationTest.java @@ -0,0 +1,104 @@ +/* + * Copyright 2018 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. + */ +package org.hyperledger.besu.ethereum.api.jsonrpc.methods; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseUtils; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.testutil.BlockTestUtil; + +import java.util.EnumMap; +import java.util.Map; + +import com.google.common.base.Charsets; +import com.google.common.io.Resources; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +public class EthGetUncleByBlockNumberAndIndexIntegrationTest { + + private static JsonRpcTestMethodsFactory BLOCKCHAIN; + + private final JsonRpcResponseUtils responseUtils = new JsonRpcResponseUtils(); + private JsonRpcMethod method; + + @BeforeClass + public static void setUpOnce() throws Exception { + final String genesisJson = + Resources.toString(BlockTestUtil.getTestGenesisUrl(), Charsets.UTF_8); + + BLOCKCHAIN = + new JsonRpcTestMethodsFactory( + new BlockchainImporter(BlockTestUtil.getTestBlockchainUrl(), genesisJson)); + } + + @Before + public void setUp() { + method = BLOCKCHAIN.methods().get("eth_getUncleByBlockNumberAndIndex"); + } + + @Test + public void shouldGetExpectedBlockResult() { + final Map out = new EnumMap<>(JsonRpcResponseKey.class); + out.put(JsonRpcResponseKey.COINBASE, "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"); + out.put(JsonRpcResponseKey.DIFFICULTY, "0x20040"); + out.put(JsonRpcResponseKey.EXTRA_DATA, "0x"); + out.put(JsonRpcResponseKey.GAS_LIMIT, "0x2fefd8"); + out.put(JsonRpcResponseKey.GAS_USED, "0x0"); + out.put( + JsonRpcResponseKey.LOGS_BLOOM, + "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"); + out.put( + JsonRpcResponseKey.MIX_HASH, + "0xe970d9815a634e25a778a765764d91ecc80d667a85721dcd4297d00be8d2af29"); + out.put(JsonRpcResponseKey.NONCE, "0x64050e6ee4c2f3c7"); + out.put(JsonRpcResponseKey.NUMBER, "0x2"); + out.put( + JsonRpcResponseKey.OMMERS_HASH, + "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); + out.put( + JsonRpcResponseKey.PARENT_HASH, + "0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9"); + out.put( + JsonRpcResponseKey.RECEIPTS_ROOT, + "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"); + out.put( + JsonRpcResponseKey.STATE_ROOT, + "0xee57559895449b8dbd0a096b2999cf97b517b645ec8db33c7f5934778672263e"); + out.put(JsonRpcResponseKey.SIZE, "0x1ff"); + out.put(JsonRpcResponseKey.TIMESTAMP, "0x561bc2e7"); + out.put(JsonRpcResponseKey.TOTAL_DIFFICULTY, "0x0"); + out.put( + JsonRpcResponseKey.TRANSACTION_ROOT, + "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"); + final JsonRpcResponse expected = responseUtils.response(out); + final JsonRpcRequest request = getUncleByBlockNumberAndIndex(); + + final JsonRpcSuccessResponse actual = (JsonRpcSuccessResponse) method.response(request); + + assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + } + + private JsonRpcRequest getUncleByBlockNumberAndIndex() { + return new JsonRpcRequest( + "2.0", "eth_getUncleByBlockNumberAndIndex", new Object[] {"0x4", "0x0"}); + } +} diff --git a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/PrivGetPrivateTransactionIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivGetPrivateTransactionIntegrationTest.java similarity index 76% rename from ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/PrivGetPrivateTransactionIntegrationTest.java rename to ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivGetPrivateTransactionIntegrationTest.java index 3cddc7d039..134e631b29 100644 --- a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/PrivGetPrivateTransactionIntegrationTest.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivGetPrivateTransactionIntegrationTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.methods; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; @@ -18,31 +18,31 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.orion.testutil.OrionKeyConfiguration; -import tech.pegasys.orion.testutil.OrionTestHarness; -import tech.pegasys.orion.testutil.OrionTestHarnessFactory; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.types.SendRequest; -import tech.pegasys.pantheon.enclave.types.SendRequestLegacy; -import tech.pegasys.pantheon.enclave.types.SendResponse; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivGetPrivateTransaction; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionLegacyResult; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.ethereum.privacy.Restriction; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.types.SendRequest; +import org.hyperledger.besu.enclave.types.SendRequestLegacy; +import org.hyperledger.besu.enclave.types.SendResponse; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivGetPrivateTransaction; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionLegacyResult; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.ethereum.privacy.Restriction; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.orion.testutil.OrionKeyConfiguration; +import org.hyperledger.orion.testutil.OrionTestHarness; +import org.hyperledger.orion.testutil.OrionTestHarnessFactory; import java.math.BigInteger; import java.util.Base64; diff --git a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetUncleByBlockHashAndIndexIntegrationTest.java b/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetUncleByBlockHashAndIndexIntegrationTest.java deleted file mode 100644 index e51f358cef..0000000000 --- a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetUncleByBlockHashAndIndexIntegrationTest.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright 2018 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. - */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.methods; - -import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.COINBASE; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.DIFFICULTY; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.EXTRA_DATA; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.GAS_LIMIT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.GAS_USED; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.LOGS_BLOOM; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.MIX_HASH; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.NONCE; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.NUMBER; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.OMMERS_HASH; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.PARENT_HASH; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.RECEIPTS_ROOT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.SIZE; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.STATE_ROOT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.TIMESTAMP; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.BlockchainImporter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseUtils; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.testutil.BlockTestUtil; - -import java.util.EnumMap; -import java.util.Map; - -import com.google.common.base.Charsets; -import com.google.common.io.Resources; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -public class EthGetUncleByBlockHashAndIndexIntegrationTest { - - private static JsonRpcTestMethodsFactory BLOCKCHAIN; - - private final JsonRpcResponseUtils responseUtils = new JsonRpcResponseUtils(); - private JsonRpcMethod method; - - @BeforeClass - public static void setUpOnce() throws Exception { - final String genesisJson = - Resources.toString(BlockTestUtil.getTestGenesisUrl(), Charsets.UTF_8); - - BLOCKCHAIN = - new JsonRpcTestMethodsFactory( - new BlockchainImporter(BlockTestUtil.getTestBlockchainUrl(), genesisJson)); - } - - @Before - public void setUp() { - method = BLOCKCHAIN.methods().get("eth_getUncleByBlockHashAndIndex"); - } - - @Test - public void shouldGetExpectedBlockResult() { - final JsonRpcRequest request = - new JsonRpcRequest( - "2.0", - "eth_getUncleByBlockHashAndIndex", - new Object[] { - "0x4e9a67b663f9abe03e7e9fd5452c9497998337077122f44ee78a466f6a7358de", "0x0" - }); - - final Map out = new EnumMap<>(JsonRpcResponseKey.class); - out.put(COINBASE, "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"); - out.put(DIFFICULTY, "0x20040"); - out.put(EXTRA_DATA, "0x"); - out.put(GAS_LIMIT, "0x2fefd8"); - out.put(GAS_USED, "0x0"); - out.put( - LOGS_BLOOM, - "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"); - out.put(MIX_HASH, "0xe970d9815a634e25a778a765764d91ecc80d667a85721dcd4297d00be8d2af29"); - out.put(NONCE, "0x64050e6ee4c2f3c7"); - out.put(NUMBER, "0x2"); - out.put(OMMERS_HASH, "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); - out.put(PARENT_HASH, "0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9"); - out.put(RECEIPTS_ROOT, "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"); - out.put(STATE_ROOT, "0xee57559895449b8dbd0a096b2999cf97b517b645ec8db33c7f5934778672263e"); - out.put(SIZE, "0x1ff"); - out.put(TIMESTAMP, "0x561bc2e7"); - out.put(TOTAL_DIFFICULTY, "0x0"); - out.put(TRANSACTION_ROOT, "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"); - - final JsonRpcResponse expected = responseUtils.response(out); - final JsonRpcResponse actual = method.response(request); - - assertThat(actual).isInstanceOf(JsonRpcSuccessResponse.class); - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); - } -} diff --git a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetUncleByBlockNumberAndIndexIntegrationTest.java b/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetUncleByBlockNumberAndIndexIntegrationTest.java deleted file mode 100644 index d70d6a8386..0000000000 --- a/ethereum/api/src/integration-test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/methods/EthGetUncleByBlockNumberAndIndexIntegrationTest.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright 2018 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. - */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.methods; - -import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.COINBASE; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.DIFFICULTY; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.EXTRA_DATA; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.GAS_LIMIT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.GAS_USED; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.LOGS_BLOOM; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.MIX_HASH; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.NONCE; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.NUMBER; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.OMMERS_HASH; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.PARENT_HASH; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.RECEIPTS_ROOT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.SIZE; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.STATE_ROOT; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.TIMESTAMP; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.BlockchainImporter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseKey; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcResponseUtils; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.testutil.BlockTestUtil; - -import java.util.EnumMap; -import java.util.Map; - -import com.google.common.base.Charsets; -import com.google.common.io.Resources; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -public class EthGetUncleByBlockNumberAndIndexIntegrationTest { - - private static JsonRpcTestMethodsFactory BLOCKCHAIN; - - private final JsonRpcResponseUtils responseUtils = new JsonRpcResponseUtils(); - private JsonRpcMethod method; - - @BeforeClass - public static void setUpOnce() throws Exception { - final String genesisJson = - Resources.toString(BlockTestUtil.getTestGenesisUrl(), Charsets.UTF_8); - - BLOCKCHAIN = - new JsonRpcTestMethodsFactory( - new BlockchainImporter(BlockTestUtil.getTestBlockchainUrl(), genesisJson)); - } - - @Before - public void setUp() { - method = BLOCKCHAIN.methods().get("eth_getUncleByBlockNumberAndIndex"); - } - - @Test - public void shouldGetExpectedBlockResult() { - final Map out = new EnumMap<>(JsonRpcResponseKey.class); - out.put(COINBASE, "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"); - out.put(DIFFICULTY, "0x20040"); - out.put(EXTRA_DATA, "0x"); - out.put(GAS_LIMIT, "0x2fefd8"); - out.put(GAS_USED, "0x0"); - out.put( - LOGS_BLOOM, - "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"); - out.put(MIX_HASH, "0xe970d9815a634e25a778a765764d91ecc80d667a85721dcd4297d00be8d2af29"); - out.put(NONCE, "0x64050e6ee4c2f3c7"); - out.put(NUMBER, "0x2"); - out.put(OMMERS_HASH, "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"); - out.put(PARENT_HASH, "0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9"); - out.put(RECEIPTS_ROOT, "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"); - out.put(STATE_ROOT, "0xee57559895449b8dbd0a096b2999cf97b517b645ec8db33c7f5934778672263e"); - out.put(SIZE, "0x1ff"); - out.put(TIMESTAMP, "0x561bc2e7"); - out.put(TOTAL_DIFFICULTY, "0x0"); - out.put(TRANSACTION_ROOT, "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"); - final JsonRpcResponse expected = responseUtils.response(out); - final JsonRpcRequest request = getUncleByBlockNumberAndIndex(); - - final JsonRpcSuccessResponse actual = (JsonRpcSuccessResponse) method.response(request); - - assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); - } - - private JsonRpcRequest getUncleByBlockNumberAndIndex() { - return new JsonRpcRequest( - "2.0", "eth_getUncleByBlockNumberAndIndex", new Object[] {"0x4", "0x0"}); - } -} diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/BlockWithMetadata.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/BlockWithMetadata.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/BlockWithMetadata.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/BlockWithMetadata.java index 1652e41ef9..a3681e3771 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/BlockWithMetadata.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/BlockWithMetadata.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api; +package org.hyperledger.besu.ethereum.api; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.util.uint.UInt256; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/LogWithMetadata.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/LogWithMetadata.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/LogWithMetadata.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/LogWithMetadata.java index 32ca4ef1ff..d801d73be7 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/LogWithMetadata.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/LogWithMetadata.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api; +package org.hyperledger.besu.ethereum.api; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogTopic; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.LogTopic; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/LogsQuery.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/LogsQuery.java similarity index 93% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/LogsQuery.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/LogsQuery.java index 7b0a8ee430..7d134557ec 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/LogsQuery.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/LogsQuery.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api; +package org.hyperledger.besu.ethereum.api; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Log; -import tech.pegasys.pantheon.ethereum.core.LogTopic; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Log; +import org.hyperledger.besu.ethereum.core.LogTopic; import java.util.Arrays; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/TopicsParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/TopicsParameter.java similarity index 90% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/TopicsParameter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/TopicsParameter.java index 897b22d6a1..507e0066d2 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/TopicsParameter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/TopicsParameter.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api; +package org.hyperledger.besu.ethereum.api; -import tech.pegasys.pantheon.ethereum.core.LogTopic; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.LogTopic; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/TransactionWithMetadata.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/TransactionWithMetadata.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/TransactionWithMetadata.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/TransactionWithMetadata.java index 189f336228..a759d54007 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/TransactionWithMetadata.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/TransactionWithMetadata.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api; +package org.hyperledger.besu.ethereum.api; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLConfiguration.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLConfiguration.java similarity index 98% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLConfiguration.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLConfiguration.java index bfda35cb7a..cd8f4c7048 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLConfiguration.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLConfiguration.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; +package org.hyperledger.besu.ethereum.api.graphql; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLDataFetcherContext.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLDataFetcherContext.java similarity index 78% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLDataFetcherContext.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLDataFetcherContext.java index 091f1bce69..252d160a27 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLDataFetcherContext.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLDataFetcherContext.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; +package org.hyperledger.besu.ethereum.api.graphql; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.BlockchainQuery; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.ethereum.api.graphql.internal.BlockchainQuery; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; public class GraphQLDataFetcherContext { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLDataFetchers.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLDataFetchers.java similarity index 80% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLDataFetchers.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLDataFetchers.java index 8d2ff508c6..fb977f30df 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLDataFetchers.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLDataFetchers.java @@ -10,37 +10,37 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; +package org.hyperledger.besu.ethereum.api.graphql; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.BlockchainQuery; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.pojoadapter.AccountAdapter; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.pojoadapter.NormalBlockAdapter; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.pojoadapter.PendingStateAdapter; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.pojoadapter.SyncStateAdapter; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.pojoadapter.TransactionAdapter; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.response.GraphQLError; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.plugin.data.SyncStatus; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.graphql.internal.BlockchainQuery; +import org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter.AccountAdapter; +import org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter.NormalBlockAdapter; +import org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter.PendingStateAdapter; +import org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter.SyncStateAdapter; +import org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter.TransactionAdapter; +import org.hyperledger.besu.ethereum.api.graphql.internal.response.GraphQLError; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.plugin.data.SyncStatus; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLException.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLException.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLException.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLException.java index e1db5fe931..b890fccf15 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLException.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLException.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; +package org.hyperledger.besu.ethereum.api.graphql; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.response.GraphQLError; +import org.hyperledger.besu.ethereum.api.graphql.internal.response.GraphQLError; import java.util.LinkedHashMap; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLHttpService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpService.java similarity index 96% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLHttpService.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpService.java index 057835cce3..2fa4667c46 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLHttpService.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpService.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; +package org.hyperledger.besu.ethereum.api.graphql; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Streams.stream; import static io.vertx.core.http.HttpMethod.GET; import static io.vertx.core.http.HttpMethod.POST; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.response.GraphQLErrorResponse; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.response.GraphQLJsonRequest; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.response.GraphQLResponse; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.response.GraphQLResponseType; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.response.GraphQLSuccessResponse; -import tech.pegasys.pantheon.util.NetworkUtility; +import org.hyperledger.besu.ethereum.api.graphql.internal.response.GraphQLErrorResponse; +import org.hyperledger.besu.ethereum.api.graphql.internal.response.GraphQLJsonRequest; +import org.hyperledger.besu.ethereum.api.graphql.internal.response.GraphQLResponse; +import org.hyperledger.besu.ethereum.api.graphql.internal.response.GraphQLResponseType; +import org.hyperledger.besu.ethereum.api.graphql.internal.response.GraphQLSuccessResponse; +import org.hyperledger.besu.util.NetworkUtility; import java.net.InetSocketAddress; import java.net.SocketException; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLProvider.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLProvider.java similarity index 96% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLProvider.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLProvider.java index aa5c27c70d..21e8c8e90c 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLProvider.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLProvider.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; +package org.hyperledger.besu.ethereum.api.graphql; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.Scalars; +import org.hyperledger.besu.ethereum.api.graphql.internal.Scalars; import java.io.IOException; import java.net.URL; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLServiceException.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLServiceException.java similarity index 93% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLServiceException.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLServiceException.java index 162a7302a5..cd3ed77f71 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLServiceException.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLServiceException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; +package org.hyperledger.besu.ethereum.api.graphql; class GraphQLServiceException extends RuntimeException { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/BlockchainQuery.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/BlockchainQuery.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/BlockchainQuery.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/BlockchainQuery.java index c465d44b6b..b41e9d62d0 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/BlockchainQuery.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/BlockchainQuery.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal; +package org.hyperledger.besu.ethereum.api.graphql.internal; -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; -import tech.pegasys.pantheon.ethereum.api.LogsQuery; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.TransactionLocation; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.api.LogsQuery; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.TransactionLocation; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/Scalars.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/Scalars.java similarity index 97% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/Scalars.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/Scalars.java index 29889fc81d..3e5f6713ea 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/Scalars.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/Scalars.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal; +package org.hyperledger.besu.ethereum.api.graphql.internal; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import graphql.language.IntValue; import graphql.language.StringValue; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/TransactionReceiptWithMetadata.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/TransactionReceiptWithMetadata.java similarity index 89% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/TransactionReceiptWithMetadata.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/TransactionReceiptWithMetadata.java index 8fd574d31c..4d6b90c316 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/TransactionReceiptWithMetadata.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/TransactionReceiptWithMetadata.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal; +package org.hyperledger.besu.ethereum.api.graphql.internal; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; public class TransactionReceiptWithMetadata { private final TransactionReceipt receipt; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/AccountAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AccountAdapter.java similarity index 82% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/AccountAdapter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AccountAdapter.java index 136d527ff1..3f8d6a2b31 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/AccountAdapter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AccountAdapter.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.pojoadapter; +package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/AdapterBase.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AdapterBase.java similarity index 78% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/AdapterBase.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AdapterBase.java index 265f54d270..a9fa93341f 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/AdapterBase.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AdapterBase.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.pojoadapter; +package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter; -import tech.pegasys.pantheon.ethereum.api.graphql.GraphQLDataFetcherContext; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.BlockchainQuery; +import org.hyperledger.besu.ethereum.api.graphql.GraphQLDataFetcherContext; +import org.hyperledger.besu.ethereum.api.graphql.internal.BlockchainQuery; import graphql.schema.DataFetchingEnvironment; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java similarity index 85% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java index 891005b328..f9000a2d91 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java @@ -10,27 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.pojoadapter; - -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; -import tech.pegasys.pantheon.ethereum.api.LogsQuery; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.graphql.GraphQLDataFetcherContext; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.BlockchainQuery; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogTopic; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.transaction.CallParameter; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulator; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulatorResult; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter; + +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.api.LogsQuery; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.graphql.GraphQLDataFetcherContext; +import org.hyperledger.besu.ethereum.api.graphql.internal.BlockchainQuery; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.LogTopic; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.transaction.CallParameter; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/CallResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/CallResult.java similarity index 89% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/CallResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/CallResult.java index 01b2d558de..804c98c112 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/CallResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/CallResult.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.pojoadapter; +package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; @SuppressWarnings("unused") // reflected by GraphQL class CallResult { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/LogAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/LogAdapter.java similarity index 82% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/LogAdapter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/LogAdapter.java index 90ce67bcc6..53eb4acfb1 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/LogAdapter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/LogAdapter.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.pojoadapter; +package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter; -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.BlockchainQuery; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogTopic; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.graphql.internal.BlockchainQuery; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.LogTopic; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/NormalBlockAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/NormalBlockAdapter.java similarity index 88% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/NormalBlockAdapter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/NormalBlockAdapter.java index f67628708d..bb28fe37bb 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/NormalBlockAdapter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/NormalBlockAdapter.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.pojoadapter; - -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.BlockchainQuery; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter; + +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.graphql.internal.BlockchainQuery; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java similarity index 83% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java index 392ab4de4d..dc94d01af8 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.pojoadapter; +package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.graphql.GraphQLDataFetcherContext; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.BlockchainQuery; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.transaction.CallParameter; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulator; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulatorResult; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.graphql.GraphQLDataFetcherContext; +import org.hyperledger.besu.ethereum.api.graphql.internal.BlockchainQuery; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.transaction.CallParameter; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.List; import java.util.Map; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/SyncStateAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/SyncStateAdapter.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/SyncStateAdapter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/SyncStateAdapter.java index 4ad44e64ef..e5b6830a25 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/SyncStateAdapter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/SyncStateAdapter.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.pojoadapter; +package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter; -import tech.pegasys.pantheon.plugin.data.SyncStatus; +import org.hyperledger.besu.plugin.data.SyncStatus; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/TransactionAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/TransactionAdapter.java similarity index 90% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/TransactionAdapter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/TransactionAdapter.java index 1d89bfd43e..026d17cc75 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/TransactionAdapter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/TransactionAdapter.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.pojoadapter; - -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.BlockchainQuery; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.TransactionReceiptWithMetadata; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter; + +import org.hyperledger.besu.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.graphql.internal.BlockchainQuery; +import org.hyperledger.besu.ethereum.api.graphql.internal.TransactionReceiptWithMetadata; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/UncleBlockAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/UncleBlockAdapter.java similarity index 89% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/UncleBlockAdapter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/UncleBlockAdapter.java index 6a3df1df7b..891f888403 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/pojoadapter/UncleBlockAdapter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/UncleBlockAdapter.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.pojoadapter; +package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLError.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLError.java similarity index 95% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLError.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLError.java index 320ac557c3..83770be5db 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLError.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLError.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.response; +package org.hyperledger.besu.ethereum.api.graphql.internal.response; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonGetter; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLErrorResponse.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLErrorResponse.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLErrorResponse.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLErrorResponse.java index 7ff2094053..aae17210bf 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLErrorResponse.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLErrorResponse.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.response; +package org.hyperledger.besu.ethereum.api.graphql.internal.response; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLJsonRequest.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLJsonRequest.java similarity index 95% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLJsonRequest.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLJsonRequest.java index a256713e1e..0202437810 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLJsonRequest.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLJsonRequest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.response; +package org.hyperledger.besu.ethereum.api.graphql.internal.response; import java.util.Map; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLNoResponse.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLNoResponse.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLNoResponse.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLNoResponse.java index ea2571d84f..c2c511bfb1 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLNoResponse.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLNoResponse.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.response; +package org.hyperledger.besu.ethereum.api.graphql.internal.response; public class GraphQLNoResponse extends GraphQLResponse { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLResponse.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLResponse.java similarity index 94% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLResponse.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLResponse.java index 111a3287e3..ba738b8250 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLResponse.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLResponse.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.response; +package org.hyperledger.besu.ethereum.api.graphql.internal.response; import java.util.Objects; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLResponseType.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLResponseType.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLResponseType.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLResponseType.java index 5989f01b05..d063a33d02 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLResponseType.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLResponseType.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.response; +package org.hyperledger.besu.ethereum.api.graphql.internal.response; /** Various types of responses that the JSON-RPC component may produce. */ public enum GraphQLResponseType { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLSuccessResponse.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLSuccessResponse.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLSuccessResponse.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLSuccessResponse.java index 021cc7e969..4f8e637c23 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/graphql/internal/response/GraphQLSuccessResponse.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLSuccessResponse.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.response; +package org.hyperledger.besu.ethereum.api.graphql.internal.response; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcConfiguration.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfiguration.java similarity index 98% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcConfiguration.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfiguration.java index ea87257066..b83fd646c9 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcConfiguration.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfiguration.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import java.util.ArrayList; import java.util.Arrays; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcEnclaveErrorConverter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcEnclaveErrorConverter.java similarity index 89% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcEnclaveErrorConverter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcEnclaveErrorConverter.java index f8ef3d83e8..c680c6cf8d 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcEnclaveErrorConverter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcEnclaveErrorConverter.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; import java.util.Arrays; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcErrorConverter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverter.java similarity index 89% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcErrorConverter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverter.java index c3310b66a8..9517b01dcc 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcErrorConverter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverter.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; public class JsonRpcErrorConverter { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpService.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpService.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpService.java index bacf7d0155..f0ca48b7c7 100755 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpService.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpService.java @@ -10,31 +10,31 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Streams.stream; import static java.util.stream.Collectors.toList; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.authentication.AuthenticationService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.authentication.AuthenticationUtils; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.HealthService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequestId; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcNoResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcUnauthorizedResponse; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.nat.upnp.UpnpNatManager; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.plugin.services.metrics.OperationTimer; -import tech.pegasys.pantheon.util.NetworkUtility; +import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationService; +import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationUtils; +import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestId; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcNoResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcUnauthorizedResponse; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.nat.upnp.UpnpNatManager; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.plugin.services.metrics.OperationTimer; +import org.hyperledger.besu.util.NetworkUtility; import java.net.InetSocketAddress; import java.net.SocketException; @@ -137,7 +137,7 @@ public class JsonRpcHttpService { this.dataDir = dataDir; requestTimer = metricsSystem.createLabelledTimer( - PantheonMetricCategory.RPC, + BesuMetricCategory.RPC, "request_time", "Time taken to process a JSON-RPC request", "methodName"); diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java similarity index 56% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java index 0c5734cf57..5024ae04f6 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcMethodsFactory.java @@ -10,122 +10,122 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; -import tech.pegasys.pantheon.config.GenesisConfigOptions; -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.AdminAddPeer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.AdminChangeLogLevel; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.AdminNodeInfo; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.AdminPeers; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.AdminRemovePeer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.DebugAccountRange; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.DebugMetrics; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.DebugStorageRangeAt; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.DebugTraceBlock; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.DebugTraceBlockByHash; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.DebugTraceBlockByNumber; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.DebugTraceTransaction; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthAccounts; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthBlockNumber; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthCall; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthChainId; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthCoinbase; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthEstimateGas; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGasPrice; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetBalance; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetBlockByHash; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetBlockByNumber; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetBlockTransactionCountByHash; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetBlockTransactionCountByNumber; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetCode; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetFilterChanges; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetFilterLogs; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetLogs; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetProof; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetStorageAt; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetTransactionByBlockHashAndIndex; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetTransactionByBlockNumberAndIndex; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetTransactionByHash; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetTransactionCount; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetTransactionReceipt; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetUncleByBlockHashAndIndex; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetUncleByBlockNumberAndIndex; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetUncleCountByBlockHash; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetUncleCountByBlockNumber; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetWork; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthHashrate; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthMining; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthNewBlockFilter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthNewFilter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthNewPendingTransactionFilter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthProtocolVersion; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthSendRawTransaction; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthSendTransaction; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthSyncing; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthUninstallFilter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.NetEnode; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.NetListening; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.NetPeerCount; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.NetServices; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.NetVersion; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.RpcModules; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.TraceReplayBlockTransactions; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.TxPoolPantheonStatistics; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.TxPoolPantheonTransactions; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.Web3ClientVersion; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.Web3Sha3; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.miner.MinerSetCoinbase; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.miner.MinerSetEtherbase; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.miner.MinerStart; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.miner.MinerStop; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning.PermAddAccountsToWhitelist; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning.PermAddNodesToWhitelist; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning.PermGetAccountsWhitelist; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning.PermGetNodesWhitelist; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning.PermReloadPermissionsFromFile; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning.PermRemoveAccountsFromWhitelist; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning.PermRemoveNodesFromWhitelist; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaGetTransactionCount; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaGetTransactionReceipt; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaPrivateNonceProvider; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaSendRawTransaction; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivCreatePrivacyGroup; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivDeletePrivacyGroup; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivFindPrivacyGroup; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivGetPrivacyPrecompileAddress; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivGetPrivateTransaction; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivGetTransactionCount; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockReplay; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockTracer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.TransactionTracer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.BlockResultFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionHandler; -import tech.pegasys.pantheon.ethereum.privacy.markertransaction.FixedKeySigningPrivateMarkerTransactionFactory; -import tech.pegasys.pantheon.ethereum.privacy.markertransaction.PrivateMarkerTransactionFactory; -import tech.pegasys.pantheon.ethereum.privacy.markertransaction.RandomSigningPrivateMarkerTransactionFactory; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulator; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.config.GenesisConfigOptions; +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.AdminAddPeer; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.AdminChangeLogLevel; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.AdminNodeInfo; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.AdminPeers; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.AdminRemovePeer; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugAccountRange; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugMetrics; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugStorageRangeAt; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugTraceBlock; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugTraceBlockByHash; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugTraceBlockByNumber; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugTraceTransaction; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthAccounts; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthBlockNumber; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthCall; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthChainId; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthCoinbase; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthEstimateGas; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGasPrice; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetBalance; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetBlockByHash; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetBlockByNumber; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetBlockTransactionCountByHash; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetBlockTransactionCountByNumber; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetCode; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetFilterChanges; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetFilterLogs; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetLogs; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetProof; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetStorageAt; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetTransactionByBlockHashAndIndex; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetTransactionByBlockNumberAndIndex; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetTransactionByHash; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetTransactionCount; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetTransactionReceipt; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetUncleByBlockHashAndIndex; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetUncleByBlockNumberAndIndex; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetUncleCountByBlockHash; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetUncleCountByBlockNumber; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetWork; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthHashrate; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthMining; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthNewBlockFilter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthNewFilter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthNewPendingTransactionFilter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthProtocolVersion; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthSendRawTransaction; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthSendTransaction; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthSyncing; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthUninstallFilter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.NetEnode; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.NetListening; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.NetPeerCount; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.NetServices; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.NetVersion; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.RpcModules; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.TraceReplayBlockTransactions; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.TxPoolBesuStatistics; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.TxPoolBesuTransactions; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.Web3ClientVersion; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.Web3Sha3; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner.MinerSetCoinbase; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner.MinerSetEtherbase; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner.MinerStart; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner.MinerStop; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning.PermAddAccountsToWhitelist; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning.PermAddNodesToWhitelist; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning.PermGetAccountsWhitelist; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning.PermGetNodesWhitelist; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning.PermReloadPermissionsFromFile; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning.PermRemoveAccountsFromWhitelist; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning.PermRemoveNodesFromWhitelist; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaGetTransactionCount; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaGetTransactionReceipt; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaPrivateNonceProvider; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaSendRawTransaction; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivCreatePrivacyGroup; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivDeletePrivacyGroup; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivFindPrivacyGroup; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivGetPrivacyPrecompileAddress; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivGetPrivateTransaction; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivGetTransactionCount; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockReplay; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTracer; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionHandler; +import org.hyperledger.besu.ethereum.privacy.markertransaction.FixedKeySigningPrivateMarkerTransactionFactory; +import org.hyperledger.besu.ethereum.privacy.markertransaction.PrivateMarkerTransactionFactory; +import org.hyperledger.besu.ethereum.privacy.markertransaction.RandomSigningPrivateMarkerTransactionFactory; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.ObservableMetricsSystem; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; import java.math.BigInteger; import java.util.Collection; @@ -310,8 +310,8 @@ public class JsonRpcMethodsFactory { if (rpcApis.contains(RpcApis.TX_POOL)) { addMethods( enabledMethods, - new TxPoolPantheonTransactions(transactionPool.getPendingTransactions()), - new TxPoolPantheonStatistics(transactionPool.getPendingTransactions())); + new TxPoolBesuTransactions(transactionPool.getPendingTransactions()), + new TxPoolBesuStatistics(transactionPool.getPendingTransactions())); } if (rpcApis.contains(RpcApis.PERM)) { addMethods( diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcServiceException.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcServiceException.java similarity index 93% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcServiceException.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcServiceException.java index 388fb4ad20..f5d8de1c78 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcServiceException.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcServiceException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; public class JsonRpcServiceException extends RuntimeException { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/LatestNonceProvider.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/LatestNonceProvider.java similarity index 80% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/LatestNonceProvider.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/LatestNonceProvider.java index 38c5c2ca5c..7bccc7af92 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/LatestNonceProvider.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/LatestNonceProvider.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.util.NonceProvider; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.util.NonceProvider; import java.util.OptionalLong; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/RpcApi.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcApi.java similarity index 95% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/RpcApi.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcApi.java index b5da99a2b2..97a13f08b6 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/RpcApi.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcApi.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import java.util.Objects; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/RpcApis.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcApis.java similarity index 97% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/RpcApis.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcApis.java index 2f3f711e95..10af37541a 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/RpcApis.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcApis.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import java.util.Arrays; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/RpcMethod.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethod.java similarity index 97% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/RpcMethod.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethod.java index 92a5b7b554..55ab7c5ba1 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/RpcMethod.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethod.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import java.util.ArrayList; import java.util.Collection; @@ -106,8 +106,8 @@ public enum RpcMethod { PERM_REMOVE_NODES_FROM_WHITELIST("perm_removeNodesFromWhitelist"), RPC_MODULES("rpc_modules"), TRACE_REPLAY_BLOCK_TRANSACTIONS("trace_replayBlockTransactions"), - TX_POOL_PANTHEON_STATISTICS("txpool_pantheonStatistics"), - TX_POOL_PANTHEON_TRANSACTIONS("txpool_pantheonTransactions"), + TX_POOL_BESU_STATISTICS("txpool_besuStatistics"), + TX_POOL_BESU_TRANSACTIONS("txpool_besuTransactions"), WEB3_CLIENT_VERSION("web3_clientVersion"), WEB3_SHA3("web3_sha3"); diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/RpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethods.java similarity index 89% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/RpcMethods.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethods.java index 9379924aa6..6cb3c63c42 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/RpcMethods.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethods.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; import java.util.Map; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/AuthenticationService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationService.java similarity index 97% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/AuthenticationService.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationService.java index 9bf447581a..74a001984b 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/AuthenticationService.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationService.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.authentication; +package org.hyperledger.besu.ethereum.api.jsonrpc.authentication; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; import java.security.KeyPair; import java.security.KeyPairGenerator; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/AuthenticationUtils.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtils.java similarity index 95% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/AuthenticationUtils.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtils.java index fd7bf82c7f..1787c5e625 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/AuthenticationUtils.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtils.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.authentication; +package org.hyperledger.besu.ethereum.api.jsonrpc.authentication; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/TomlAuth.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuth.java similarity index 98% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/TomlAuth.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuth.java index db633d0112..f1cc63fb75 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/TomlAuth.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuth.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.authentication; +package org.hyperledger.besu.ethereum.api.jsonrpc.authentication; import java.io.IOException; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/TomlAuthOptions.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuthOptions.java similarity index 95% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/TomlAuthOptions.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuthOptions.java index 1ceba5feb9..b55c3d6d77 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/TomlAuthOptions.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuthOptions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.authentication; +package org.hyperledger.besu.ethereum.api.jsonrpc.authentication; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/TomlUser.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlUser.java similarity index 97% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/TomlUser.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlUser.java index cb642a6faa..e0fa6e104f 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/TomlUser.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlUser.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.authentication; +package org.hyperledger.besu.ethereum.api.jsonrpc.authentication; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/health/HealthService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/HealthService.java similarity index 97% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/health/HealthService.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/HealthService.java index 30ebcb9ef0..4768e7b0a5 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/health/HealthService.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/HealthService.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.health; +package org.hyperledger.besu.ethereum.api.jsonrpc.health; import static java.util.Collections.singletonMap; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/health/LivenessCheck.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/LivenessCheck.java similarity index 70% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/health/LivenessCheck.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/LivenessCheck.java index 843f783592..a696162969 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/health/LivenessCheck.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/LivenessCheck.java @@ -10,19 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.health; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.HealthService.HealthCheck; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.HealthService.ParamSource; +package org.hyperledger.besu.ethereum.api.jsonrpc.health; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -public class LivenessCheck implements HealthCheck { +public class LivenessCheck implements HealthService.HealthCheck { private static final Logger LOG = LogManager.getLogger(); @Override - public boolean isHealthy(final ParamSource params) { + public boolean isHealthy(final HealthService.ParamSource params) { LOG.debug("Invoking liveness check."); return true; } diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/health/ReadinessCheck.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/ReadinessCheck.java similarity index 78% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/health/ReadinessCheck.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/ReadinessCheck.java index 214fb9cfb6..4fe78672e6 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/health/ReadinessCheck.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/ReadinessCheck.java @@ -10,18 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.health; +package org.hyperledger.besu.ethereum.api.jsonrpc.health; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.HealthService.HealthCheck; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.HealthService.ParamSource; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.plugin.data.SyncStatus; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.plugin.data.SyncStatus; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -public class ReadinessCheck implements HealthCheck { +public class ReadinessCheck implements HealthService.HealthCheck { private static final Logger LOG = LogManager.getLogger(); private static final int DEFAULT_MINIMUM_PEERS = 1; private static final int DEFAULT_MAX_BLOCKS_BEHIND = 2; @@ -34,7 +32,7 @@ public class ReadinessCheck implements HealthCheck { } @Override - public boolean isHealthy(final ParamSource params) { + public boolean isHealthy(final HealthService.ParamSource params) { LOG.debug("Invoking readiness check."); if (p2pNetwork.isP2pEnabled()) { final int peerCount = p2pNetwork.getPeerCount(); @@ -48,7 +46,7 @@ public class ReadinessCheck implements HealthCheck { .orElse(true); } - private boolean isInSync(final SyncStatus syncStatus, final ParamSource params) { + private boolean isInSync(final SyncStatus syncStatus, final HealthService.ParamSource params) { final String maxBlocksBehindParam = params.getParam("maxBlocksBehind"); final long maxBlocksBehind; if (maxBlocksBehindParam == null) { @@ -64,7 +62,7 @@ public class ReadinessCheck implements HealthCheck { return syncStatus.getHighestBlock() - syncStatus.getCurrentBlock() <= maxBlocksBehind; } - private boolean hasMinimumPeers(final ParamSource params, final int peerCount) { + private boolean hasMinimumPeers(final HealthService.ParamSource params, final int peerCount) { final int minimumPeers; final String peersParam = params.getParam("minPeers"); if (peersParam == null) { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/JsonRpcRequest.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/JsonRpcRequest.java similarity index 95% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/JsonRpcRequest.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/JsonRpcRequest.java index 8c69728979..61243cafb3 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/JsonRpcRequest.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/JsonRpcRequest.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcRequestException; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcRequestException; import java.util.Arrays; import java.util.Objects; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/JsonRpcRequestId.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/JsonRpcRequestId.java similarity index 93% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/JsonRpcRequestId.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/JsonRpcRequestId.java index cc4129819c..653fa3b1a9 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/JsonRpcRequestId.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/JsonRpcRequestId.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcRequestException; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcRequestException; import java.math.BigInteger; import java.util.Objects; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/exception/InvalidJsonRpcParameters.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/exception/InvalidJsonRpcParameters.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/exception/InvalidJsonRpcParameters.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/exception/InvalidJsonRpcParameters.java index 31915a0def..f55ef3f9ad 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/exception/InvalidJsonRpcParameters.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/exception/InvalidJsonRpcParameters.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception; public class InvalidJsonRpcParameters extends InvalidJsonRpcRequestException { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/exception/InvalidJsonRpcRequestException.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/exception/InvalidJsonRpcRequestException.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/exception/InvalidJsonRpcRequestException.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/exception/InvalidJsonRpcRequestException.java index 756e0ad37d..899099fa77 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/exception/InvalidJsonRpcRequestException.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/exception/InvalidJsonRpcRequestException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception; public class InvalidJsonRpcRequestException extends IllegalArgumentException { public InvalidJsonRpcRequestException(final String message) { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/BlockFilter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/BlockFilter.java similarity index 89% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/BlockFilter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/BlockFilter.java index d2f951694a..8f421f7649 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/BlockFilter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/BlockFilter.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/Filter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/Filter.java similarity index 95% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/Filter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/Filter.java index eec1c9f08e..1f41bbe92d 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/Filter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/Filter.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter; import java.time.Duration; import java.time.Instant; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterIdGenerator.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterIdGenerator.java similarity index 81% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterIdGenerator.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterIdGenerator.java index 485647174e..15cc7113d0 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterIdGenerator.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterIdGenerator.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter; -import tech.pegasys.pantheon.crypto.SecureRandomProvider; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.crypto.SecureRandomProvider; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; import java.security.SecureRandom; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterManager.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManager.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterManager.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManager.java index 6c8de3b097..ec4e7ee180 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterManager.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManager.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter; import static com.google.common.base.Preconditions.checkNotNull; -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; -import tech.pegasys.pantheon.ethereum.api.LogsQuery; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.api.LogsQuery; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterRepository.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterRepository.java similarity index 97% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterRepository.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterRepository.java index 7f31ca5005..04bea42b55 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterRepository.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterRepository.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterTimeoutMonitor.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterTimeoutMonitor.java similarity index 93% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterTimeoutMonitor.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterTimeoutMonitor.java index 327d58a41c..e4b39120ef 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterTimeoutMonitor.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterTimeoutMonitor.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter; class FilterTimeoutMonitor { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/LogFilter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/LogFilter.java similarity index 84% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/LogFilter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/LogFilter.java index 11f6153f5b..c31095c1f8 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/LogFilter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/LogFilter.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter; -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; -import tech.pegasys.pantheon.ethereum.api.LogsQuery; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.api.LogsQuery; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/PendingTransactionFilter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/PendingTransactionFilter.java similarity index 90% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/PendingTransactionFilter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/PendingTransactionFilter.java index 6c5c1d0d27..fa18ec4975 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/PendingTransactionFilter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/PendingTransactionFilter.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AbstractBlockParameterMethod.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractBlockParameterMethod.java similarity index 82% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AbstractBlockParameterMethod.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractBlockParameterMethod.java index f5e6a419df..cd9d4370bd 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AbstractBlockParameterMethod.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractBlockParameterMethod.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; + +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.util.OptionalLong; import java.util.function.Supplier; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminAddPeer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeer.java similarity index 69% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminAddPeer.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeer.java index 030fd903b1..af0ff5bef6 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminAddPeer.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeer.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevel.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevel.java similarity index 74% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevel.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevel.java index f56503dcce..391828755c 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevel.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevel.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.util.Arrays; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminModifyPeer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminModifyPeer.java similarity index 73% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminModifyPeer.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminModifyPeer.java index 68b1e3ef80..79f6649b19 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminModifyPeer.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminModifyPeer.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.P2PDisabledException; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.P2PDisabledException; public abstract class AdminModifyPeer implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminNodeInfo.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfo.java similarity index 78% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminNodeInfo.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfo.java index 901da03dac..814e466d8b 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminNodeInfo.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfo.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.config.GenesisConfigOptions; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.chain.ChainHead; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.config.GenesisConfigOptions; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.chain.ChainHead; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; import java.util.HashMap; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminPeers.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminPeers.java similarity index 64% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminPeers.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminPeers.java index ca2eefaccd..78baf0b5d9 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminPeers.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminPeers.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.PeerResult; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.P2PDisabledException; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.PeerResult; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.P2PDisabledException; import java.util.List; import java.util.stream.Collectors; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminRemovePeer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminRemovePeer.java similarity index 70% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminRemovePeer.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminRemovePeer.java index c78e716b4d..0a4f290548 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminRemovePeer.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminRemovePeer.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugAccountRange.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugAccountRange.java similarity index 80% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugAccountRange.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugAccountRange.java index fe8a0f9f95..c8c57ac4f5 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugAccountRange.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugAccountRange.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; - -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameterOrBlockHash; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.DebugAccountRangeAtResult; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.WorldState.StreamableAccount; -import tech.pegasys.pantheon.util.bytes.Bytes32; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; + +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameterOrBlockHash; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugAccountRangeAtResult; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.WorldState.StreamableAccount; +import org.hyperledger.besu.util.bytes.Bytes32; import java.util.Collections; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugMetrics.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugMetrics.java similarity index 83% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugMetrics.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugMetrics.java index 37716c4e04..8bad3d2c6d 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugMetrics.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugMetrics.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; -import tech.pegasys.pantheon.metrics.Observation; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.metrics.ObservableMetricsSystem; +import org.hyperledger.besu.metrics.Observation; import java.util.HashMap; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAt.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAt.java similarity index 80% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAt.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAt.java index 50c27284a8..c2e40600c8 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAt.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAt.java @@ -10,26 +10,26 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; - -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameterOrBlockHash; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockReplay; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.DebugStorageRangeAtResult; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.AccountStorageEntry; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.util.bytes.Bytes32; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; + +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameterOrBlockHash; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockReplay; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugStorageRangeAtResult; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.AccountStorageEntry; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.util.bytes.Bytes32; import java.util.Collections; import java.util.NavigableMap; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlock.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlock.java similarity index 65% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlock.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlock.java index d2d1158e58..f3d116e8c8 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlock.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlock.java @@ -10,27 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.TransactionTraceParams; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockTrace; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockTracer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.debug.TraceOptions; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.ethereum.vm.DebugOperationTracer; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TransactionTraceParams; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.debug.TraceOptions; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.ethereum.vm.DebugOperationTracer; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collection; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHash.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHash.java similarity index 64% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHash.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHash.java index d4cf0832da..798c537ca8 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHash.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHash.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.TransactionTraceParams; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockTrace; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockTracer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.debug.TraceOptions; -import tech.pegasys.pantheon.ethereum.vm.DebugOperationTracer; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; + +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TransactionTraceParams; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.debug.TraceOptions; +import org.hyperledger.besu.ethereum.vm.DebugOperationTracer; import java.util.Collection; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumber.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumber.java similarity index 66% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumber.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumber.java index 757b046e5f..c370c63e5f 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumber.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumber.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.TransactionTraceParams; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockTrace; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockTracer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.debug.TraceOptions; -import tech.pegasys.pantheon.ethereum.vm.DebugOperationTracer; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TransactionTraceParams; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.debug.TraceOptions; +import org.hyperledger.besu.ethereum.vm.DebugOperationTracer; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceTransaction.java similarity index 70% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceTransaction.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceTransaction.java index 7720210f42..b1be40c0de 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceTransaction.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceTransaction.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.TransactionTraceParams; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.TransactionTracer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.debug.TraceOptions; -import tech.pegasys.pantheon.ethereum.vm.DebugOperationTracer; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TransactionTraceParams; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTracer; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.debug.TraceOptions; +import org.hyperledger.besu.ethereum.vm.DebugOperationTracer; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthAccounts.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthAccounts.java similarity index 70% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthAccounts.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthAccounts.java index 99a67d8676..29da9a6d37 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthAccounts.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthAccounts.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; public class EthAccounts implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthBlockNumber.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlockNumber.java similarity index 73% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthBlockNumber.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlockNumber.java index 52be5f5431..5aedad8db5 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthBlockNumber.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlockNumber.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; + +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; import java.util.function.Supplier; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthCall.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCall.java similarity index 67% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthCall.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCall.java index 0fae6f875b..d4525b621e 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthCall.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCall.java @@ -10,22 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcErrorConverter.convertTransactionInvalidReason; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.transaction.CallParameter; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulator; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcErrorConverter; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.transaction.CallParameter; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; public class EthCall extends AbstractBlockParameterMethod { @@ -65,7 +64,8 @@ public class EthCall extends AbstractBlockParameterMethod { request.getId(), result.getOutput().toString())), reason -> new JsonRpcErrorResponse( - request.getId(), convertTransactionInvalidReason(reason)))) + request.getId(), + JsonRpcErrorConverter.convertTransactionInvalidReason(reason)))) .orElse(validRequestBlockNotFound(request)); } diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthChainId.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthChainId.java similarity index 70% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthChainId.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthChainId.java index 8e783abd10..4c3375749b 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthChainId.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthChainId.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; import java.math.BigInteger; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthCoinbase.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbase.java similarity index 65% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthCoinbase.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbase.java index dad9eb4bb5..e5d38ec10a 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthCoinbase.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbase.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.core.Address; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthEstimateGas.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGas.java similarity index 72% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthEstimateGas.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGas.java index d39078c73d..db4c4fdbee 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthEstimateGas.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGas.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.transaction.CallParameter; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulator; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulatorResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.transaction.CallParameter; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult; import java.util.function.Function; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGasPrice.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPrice.java similarity index 68% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGasPrice.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPrice.java index c8bd40d340..4758e3479d 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGasPrice.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPrice.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.core.Wei; public class EthGasPrice implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBalance.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBalance.java similarity index 73% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBalance.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBalance.java index 4ffa0b642c..6ae0202668 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBalance.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBalance.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.core.Address; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; + +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.core.Address; import java.util.function.Supplier; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHash.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHash.java similarity index 73% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHash.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHash.java index a2a2638787..f44d19489f 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHash.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHash.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.BlockResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.BlockResultFactory; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory; +import org.hyperledger.besu.ethereum.core.Hash; public class EthGetBlockByHash implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBlockByNumber.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByNumber.java similarity index 80% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBlockByNumber.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByNumber.java index b8e7eaccd9..9548f40b51 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBlockByNumber.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByNumber.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.BlockResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.BlockResultFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory; import java.util.function.Supplier; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByHash.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByHash.java similarity index 68% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByHash.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByHash.java index 0f70dc34df..b18ef39b5a 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByHash.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByHash.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.core.Hash; public class EthGetBlockTransactionCountByHash implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByNumber.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByNumber.java similarity index 71% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByNumber.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByNumber.java index 271b259db9..56f75fd9cf 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByNumber.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByNumber.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; public class EthGetBlockTransactionCountByNumber extends AbstractBlockParameterMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetCode.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetCode.java similarity index 74% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetCode.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetCode.java index d378f6ac7f..a1a163a043 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetCode.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetCode.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; + +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.function.Supplier; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetFilterChanges.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChanges.java similarity index 69% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetFilterChanges.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChanges.java index eed669cdfd..f4266a4f5b 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetFilterChanges.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChanges.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.LogsResult; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.LogsResult; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.List; import java.util.stream.Collectors; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogs.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogs.java similarity index 63% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogs.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogs.java index c55e301010..2b43cdda2a 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogs.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogs.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; - -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.LogsResult; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; + +import org.hyperledger.besu.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.LogsResult; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetLogs.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetLogs.java similarity index 69% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetLogs.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetLogs.java index 1e17079558..0a3ad45cf6 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetLogs.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetLogs.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.LogsQuery; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.FilterParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.LogsResult; +import org.hyperledger.besu.ethereum.api.LogsQuery; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.LogsResult; public class EthGetLogs implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetProof.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProof.java similarity index 71% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetProof.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProof.java index d91a1cde41..2061772a3a 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetProof.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProof.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.proof.GetProofResult; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.proof.WorldStateProof; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.proof.GetProofResult; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.proof.WorldStateProof; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Arrays; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetStorageAt.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetStorageAt.java similarity index 70% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetStorageAt.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetStorageAt.java index 81470b3aa0..4833c84c2f 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetStorageAt.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetStorageAt.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.UInt256Parameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.UInt256Parameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.util.uint.UInt256; public class EthGetStorageAt extends AbstractBlockParameterMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndex.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndex.java similarity index 64% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndex.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndex.java index 279d2f9f8a..9d68bf2d5a 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndex.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndex.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.UnsignedIntParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionCompleteResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionResult; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.UnsignedIntParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionCompleteResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionResult; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockNumberAndIndex.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockNumberAndIndex.java similarity index 69% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockNumberAndIndex.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockNumberAndIndex.java index 848a682b46..905afad12b 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockNumberAndIndex.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockNumberAndIndex.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.UnsignedIntParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionCompleteResult; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.UnsignedIntParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionCompleteResult; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByHash.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByHash.java similarity index 66% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByHash.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByHash.java index 7d082ad78c..b61032811c 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByHash.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByHash.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionCompleteResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionPendingResult; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionCompleteResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionPendingResult; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCount.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCount.java similarity index 80% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCount.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCount.java index 777f3ac2a5..057ff839cc 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCount.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCount.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; import java.util.OptionalLong; import java.util.function.Supplier; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceipt.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceipt.java similarity index 62% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceipt.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceipt.java index 39808914d3..9e897fc321 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceipt.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceipt.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.TransactionReceiptWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionReceiptResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionReceiptRootResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionReceiptStatusResult; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionReceiptType; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.TransactionReceiptWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionReceiptResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionReceiptRootResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionReceiptStatusResult; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.mainnet.TransactionReceiptType; public class EthGetTransactionReceipt implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndex.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndex.java similarity index 64% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndex.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndex.java index 313e19d1b4..b7f6c01ee6 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndex.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndex.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.UnsignedIntParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.BlockResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.UncleBlockResult; -import tech.pegasys.pantheon.ethereum.core.Hash; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; + +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.UnsignedIntParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.UncleBlockResult; +import org.hyperledger.besu.ethereum.core.Hash; public class EthGetUncleByBlockHashAndIndex implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndex.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndex.java similarity index 67% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndex.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndex.java index baa31ff47e..81699e04b1 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndex.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndex.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.UnsignedIntParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.BlockResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.UncleBlockResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.UnsignedIntParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.UncleBlockResult; public class EthGetUncleByBlockNumberAndIndex extends AbstractBlockParameterMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockHash.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockHash.java similarity index 66% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockHash.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockHash.java index b40e26c20a..be1b29112a 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockHash.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockHash.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.core.Hash; public class EthGetUncleCountByBlockHash implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockNumber.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockNumber.java similarity index 71% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockNumber.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockNumber.java index 7ca9984217..fceb7db6f1 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockNumber.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockNumber.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; public class EthGetUncleCountByBlockNumber extends AbstractBlockParameterMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetWork.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWork.java similarity index 71% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetWork.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWork.java index 2bebc50a59..b8eac6163e 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetWork.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWork.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.mainnet.DirectAcyclicGraphSeed; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolverInputs; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.mainnet.DirectAcyclicGraphSeed; +import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthHashrate.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthHashrate.java similarity index 69% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthHashrate.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthHashrate.java index 17714cd81b..c4c7e2b2ab 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthHashrate.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthHashrate.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthMining.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMining.java similarity index 70% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthMining.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMining.java index fca5625955..950a044057 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthMining.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMining.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; public class EthMining implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilter.java similarity index 69% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilter.java index 6dc8239099..7a0e196a10 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilter.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; public class EthNewBlockFilter implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthNewFilter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewFilter.java similarity index 68% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthNewFilter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewFilter.java index 6406c0120c..15fbd4fffe 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthNewFilter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewFilter.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; - -import tech.pegasys.pantheon.ethereum.api.LogsQuery; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.FilterParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; + +import org.hyperledger.besu.ethereum.api.LogsQuery; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; public class EthNewFilter implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthNewPendingTransactionFilter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewPendingTransactionFilter.java similarity index 70% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthNewPendingTransactionFilter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewPendingTransactionFilter.java index 6094fd890b..8e95b06bbc 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthNewPendingTransactionFilter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewPendingTransactionFilter.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; public class EthNewPendingTransactionFilter implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthProtocolVersion.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthProtocolVersion.java similarity index 71% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthProtocolVersion.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthProtocolVersion.java index 5fbfc1c269..622d31979f 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthProtocolVersion.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthProtocolVersion.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; import java.util.OptionalInt; import java.util.Set; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSendRawTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransaction.java similarity index 68% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSendRawTransaction.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransaction.java index 97d5872305..b9e0b6847d 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSendRawTransaction.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransaction.java @@ -10,26 +10,25 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcErrorConverter.convertTransactionInvalidReason; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcRequestException; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcErrorConverter; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcRequestException; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.function.Supplier; @@ -86,7 +85,8 @@ public class EthSendRawTransaction implements JsonRpcMethod { sendEmptyHashOnInvalidBlock ? new JsonRpcSuccessResponse(request.getId(), Hash.EMPTY.toString()) : new JsonRpcErrorResponse( - request.getId(), convertTransactionInvalidReason(errorReason))); + request.getId(), + JsonRpcErrorConverter.convertTransactionInvalidReason(errorReason))); } private Transaction decodeRawTransaction(final String hash) diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSendTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendTransaction.java similarity index 66% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSendTransaction.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendTransaction.java index 8320018691..9bd10ea465 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSendTransaction.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendTransaction.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; public class EthSendTransaction implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSyncing.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSyncing.java similarity index 71% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSyncing.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSyncing.java index 2c444b2f2e..8b95d26952 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSyncing.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSyncing.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.SyncingResult; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.SyncingResult; +import org.hyperledger.besu.ethereum.core.Synchronizer; /* * SyncProgress retrieves the current progress of the syncing algorithm. If there's no sync diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthUninstallFilter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthUninstallFilter.java similarity index 70% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthUninstallFilter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthUninstallFilter.java index f5223dfaa6..474d2906e3 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthUninstallFilter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthUninstallFilter.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; public class EthUninstallFilter implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/JsonRpcMethod.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/JsonRpcMethod.java similarity index 86% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/JsonRpcMethod.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/JsonRpcMethod.java index bfd3e472b5..575604b203 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/JsonRpcMethod.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/JsonRpcMethod.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/JsonRpcMethodFactory.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/JsonRpcMethodFactory.java similarity index 85% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/JsonRpcMethodFactory.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/JsonRpcMethodFactory.java index 09582e53e8..7963887ec3 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/JsonRpcMethodFactory.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/JsonRpcMethodFactory.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApi; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi; import java.util.Collection; import java.util.Map; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetEnode.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnode.java similarity index 70% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetEnode.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnode.java index 367661e66f..a8a8344128 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetEnode.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnode.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; + +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetListening.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetListening.java similarity index 69% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetListening.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetListening.java index bb5f2cc810..b438a9640b 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetListening.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetListening.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; public class NetListening implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetPeerCount.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetPeerCount.java similarity index 60% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetPeerCount.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetPeerCount.java index 51fd26bf71..124da18dc7 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetPeerCount.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetPeerCount.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.P2PDisabledException; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.P2PDisabledException; public class NetPeerCount implements JsonRpcMethod { private final P2PNetwork p2pNetwork; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetServices.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetServices.java similarity index 80% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetServices.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetServices.java index 5721f3478e..bf8c2890ad 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetServices.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetServices.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; import com.google.common.collect.ImmutableMap; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetVersion.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetVersion.java similarity index 77% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetVersion.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetVersion.java index 5a4352480b..3db893e5c6 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetVersion.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetVersion.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.math.BigInteger; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/RpcModules.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModules.java similarity index 75% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/RpcModules.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModules.java index 25a3feb933..6fc7d456be 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/RpcModules.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModules.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApi; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.util.Collection; import java.util.Map; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TraceReplayBlockTransactions.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceReplayBlockTransactions.java similarity index 78% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TraceReplayBlockTransactions.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceReplayBlockTransactions.java index 612c4b9618..5a4462318a 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TraceReplayBlockTransactions.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceReplayBlockTransactions.java @@ -10,26 +10,26 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.TraceTypeParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockTrace; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockTracer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.TransactionTrace; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.tracing.FlatTraceGenerator; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.tracing.TraceFormatter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.tracing.TraceWriter; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.debug.TraceOptions; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.vm.DebugOperationTracer; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; + +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TraceTypeParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.FlatTraceGenerator; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.TraceFormatter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.TraceWriter; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.debug.TraceOptions; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.vm.DebugOperationTracer; import java.util.List; import java.util.Set; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TxPoolPantheonStatistics.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuStatistics.java similarity index 61% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TxPoolPantheonStatistics.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuStatistics.java index e31e4279c5..8f02e9d2f6 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TxPoolPantheonStatistics.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuStatistics.java @@ -10,29 +10,29 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.PendingTransactionsStatisticsResult; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions.TransactionInfo; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.PendingTransactionsStatisticsResult; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo; import java.util.Set; -public class TxPoolPantheonStatistics implements JsonRpcMethod { +public class TxPoolBesuStatistics implements JsonRpcMethod { private final PendingTransactions pendingTransactions; - public TxPoolPantheonStatistics(final PendingTransactions pendingTransactions) { + public TxPoolBesuStatistics(final PendingTransactions pendingTransactions) { this.pendingTransactions = pendingTransactions; } @Override public String getName() { - return RpcMethod.TX_POOL_PANTHEON_STATISTICS.getMethodName(); + return RpcMethod.TX_POOL_BESU_STATISTICS.getMethodName(); } @Override diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TxPoolPantheonTransactions.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuTransactions.java similarity index 58% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TxPoolPantheonTransactions.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuTransactions.java index bdb9ef439e..b3a600982d 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TxPoolPantheonTransactions.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuTransactions.java @@ -10,26 +10,26 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.PendingTransactionsResult; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.PendingTransactionsResult; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; -public class TxPoolPantheonTransactions implements JsonRpcMethod { +public class TxPoolBesuTransactions implements JsonRpcMethod { private final PendingTransactions pendingTransactions; - public TxPoolPantheonTransactions(final PendingTransactions pendingTransactions) { + public TxPoolBesuTransactions(final PendingTransactions pendingTransactions) { this.pendingTransactions = pendingTransactions; } @Override public String getName() { - return RpcMethod.TX_POOL_PANTHEON_TRANSACTIONS.getMethodName(); + return RpcMethod.TX_POOL_BESU_TRANSACTIONS.getMethodName(); } @Override diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/Web3ClientVersion.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3ClientVersion.java similarity index 73% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/Web3ClientVersion.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3ClientVersion.java index c3234d7fee..71a76c9728 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/Web3ClientVersion.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3ClientVersion.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; public class Web3ClientVersion implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/Web3Sha3.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3Sha3.java similarity index 70% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/Web3Sha3.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3Sha3.java index 98df8708de..62ecb8f965 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/Web3Sha3.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3Sha3.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; - -import tech.pegasys.pantheon.crypto.Hash; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; + +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.util.bytes.BytesValue; public class Web3Sha3 implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbase.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbase.java similarity index 63% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbase.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbase.java index 8b23d6e54e..2ea2b56ff6 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbase.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbase.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.miner; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.core.Address; public class MinerSetCoinbase implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbase.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbase.java similarity index 73% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbase.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbase.java index b1f3ae8dca..49e2181e0d 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbase.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbase.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.miner; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; public class MinerSetEtherbase implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerStart.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStart.java similarity index 60% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerStart.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStart.java index 317fd57560..d9ea0bd87a 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerStart.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStart.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.miner; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.blockcreation.CoinbaseNotSetException; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.blockcreation.CoinbaseNotSetException; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; public class MinerStart implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerStop.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStop.java similarity index 67% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerStop.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStop.java index 431af4f2a0..f063f6c36a 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerStop.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStop.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.miner; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; public class MinerStop implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelist.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelist.java similarity index 75% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelist.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelist.java index 8bd409e183..55c26ea980 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelist.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelist.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.WhitelistOperationResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.WhitelistOperationResult; import java.util.List; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelist.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelist.java similarity index 76% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelist.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelist.java index c73497626d..5e60d5ec90 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelist.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelist.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.StringListParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.P2PDisabledException; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.StringListParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.P2PDisabledException; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; import java.util.List; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelist.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelist.java similarity index 65% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelist.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelist.java index 0ab5849c94..54339c4f2b 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelist.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelist.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelist.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelist.java similarity index 67% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelist.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelist.java index f73296fead..bfd5005a7d 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelist.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelist.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.P2PDisabledException; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning; + +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.P2PDisabledException; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; import java.util.List; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFile.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFile.java similarity index 70% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFile.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFile.java index b2f8fdca96..4dc300d484 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFile.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFile.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning; + +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelist.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelist.java similarity index 75% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelist.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelist.java index 4011b1aa55..58bf923cce 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelist.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelist.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.WhitelistOperationResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.WhitelistOperationResult; import java.util.List; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelist.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelist.java similarity index 77% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelist.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelist.java index 66e872db21..a4cbcf8839 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelist.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelist.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.StringListParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.P2PDisabledException; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.StringListParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.P2PDisabledException; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; import java.util.List; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/BlockParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameter.java similarity index 94% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/BlockParameter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameter.java index 3544dfef3e..e0704aeb98 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/BlockParameter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameter.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.Objects; import java.util.OptionalLong; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/BlockParameterOrBlockHash.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameterOrBlockHash.java similarity index 94% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/BlockParameterOrBlockHash.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameterOrBlockHash.java index 0e3a015a80..efef01356a 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/BlockParameterOrBlockHash.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameterOrBlockHash.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.Objects; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/FilterParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameter.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/FilterParameter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameter.java index 7a01ef98c8..3dc35f5caa 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/FilterParameter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameter.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters; -import tech.pegasys.pantheon.ethereum.api.TopicsParameter; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.api.TopicsParameter; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java similarity index 83% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java index 01a762f75a..8f554c4bd9 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.transaction.CallParameter; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.transaction.CallParameter; +import org.hyperledger.besu.util.bytes.BytesValue; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/JsonRpcParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonRpcParameter.java similarity index 94% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/JsonRpcParameter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonRpcParameter.java index 621c01504a..f10e770b69 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/JsonRpcParameter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonRpcParameter.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/StringListParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/StringListParameter.java similarity index 93% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/StringListParameter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/StringListParameter.java index 896096864e..fd753f75ec 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/StringListParameter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/StringListParameter.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/TopicsDeserializer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TopicsDeserializer.java similarity index 93% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/TopicsDeserializer.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TopicsDeserializer.java index 14904abe1a..466584178e 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/TopicsDeserializer.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TopicsDeserializer.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters; -import tech.pegasys.pantheon.ethereum.api.TopicsParameter; +import org.hyperledger.besu.ethereum.api.TopicsParameter; import java.io.IOException; import java.util.ArrayList; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/TraceTypeParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TraceTypeParameter.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/TraceTypeParameter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TraceTypeParameter.java index 4ad4719902..54350c9238 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/TraceTypeParameter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TraceTypeParameter.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters; import static java.util.Objects.isNull; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; import java.util.List; import java.util.Objects; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/TransactionTraceParams.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TransactionTraceParams.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/TransactionTraceParams.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TransactionTraceParams.java index 4be4d3702f..27b9b75349 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/TransactionTraceParams.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TransactionTraceParams.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters; -import tech.pegasys.pantheon.ethereum.debug.TraceOptions; +import org.hyperledger.besu.ethereum.debug.TraceOptions; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/UInt256Parameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UInt256Parameter.java similarity index 87% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/UInt256Parameter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UInt256Parameter.java index 34ac8ae9c5..181daab4ef 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/UInt256Parameter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UInt256Parameter.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.util.uint.UInt256; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/UnsignedIntParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UnsignedIntParameter.java similarity index 93% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/UnsignedIntParameter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UnsignedIntParameter.java index a8539bf7bd..bcdbb53642 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/UnsignedIntParameter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UnsignedIntParameter.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters; import static com.google.common.base.Preconditions.checkArgument; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/UnsignedLongParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UnsignedLongParameter.java similarity index 93% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/UnsignedLongParameter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UnsignedLongParameter.java index 95281d876c..da4be59499 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/UnsignedLongParameter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UnsignedLongParameter.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters; import static com.google.common.base.Preconditions.checkArgument; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionCount.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionCount.java similarity index 70% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionCount.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionCount.java index 8a9b63a277..9cb153f89f 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionCount.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionCount.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.eea; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.core.Address; import org.apache.logging.log4j.Logger; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceipt.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceipt.java similarity index 73% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceipt.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceipt.java index b95c9c172e..640bda7050 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceipt.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceipt.java @@ -10,37 +10,37 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.eea; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.EnclaveException; -import tech.pegasys.pantheon.enclave.types.ReceiveRequest; -import tech.pegasys.pantheon.enclave.types.ReceiveResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcEnclaveErrorConverter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionReceiptResult; -import tech.pegasys.pantheon.ethereum.chain.TransactionLocation; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Log; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.EnclaveException; +import org.hyperledger.besu.enclave.types.ReceiveRequest; +import org.hyperledger.besu.enclave.types.ReceiveResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcEnclaveErrorConverter; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionReceiptResult; +import org.hyperledger.besu.ethereum.chain.TransactionLocation; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Log; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.util.Collections; import java.util.List; @@ -122,7 +122,7 @@ public class EeaGetTransactionReceipt implements JsonRpcMethod { LOG.trace("Calculated contractAddress: {}", contractAddress); BytesValue rlpEncoded = RLP.encode(privateTransaction::writeTo); - Bytes32 txHash = tech.pegasys.pantheon.crypto.Hash.keccak256(rlpEncoded); + Bytes32 txHash = org.hyperledger.besu.crypto.Hash.keccak256(rlpEncoded); LOG.trace("Calculated private transaction hash: {}", txHash); diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaPrivateNonceProvider.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaPrivateNonceProvider.java similarity index 82% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaPrivateNonceProvider.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaPrivateNonceProvider.java index ce52164dc6..1e7e5a6caf 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaPrivateNonceProvider.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaPrivateNonceProvider.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.eea; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea; -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.types.FindPrivacyGroupRequest; -import tech.pegasys.pantheon.enclave.types.PrivacyGroup; -import tech.pegasys.pantheon.enclave.types.PrivacyGroup.Type; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionHandler; +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.types.FindPrivacyGroupRequest; +import org.hyperledger.besu.enclave.types.PrivacyGroup; +import org.hyperledger.besu.enclave.types.PrivacyGroup.Type; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionHandler; import java.util.List; import java.util.stream.Collectors; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransaction.java similarity index 65% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransaction.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransaction.java index bbf063208b..b1c2200e3e 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransaction.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransaction.java @@ -10,28 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.eea; - -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcEnclaveErrorConverter.convertEnclaveInvalidReason; -import static tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcErrorConverter.convertTransactionInvalidReason; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcRequestException; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionHandler; -import tech.pegasys.pantheon.ethereum.privacy.Restriction; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea; + +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcEnclaveErrorConverter; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcErrorConverter; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcRequestException; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionHandler; +import org.hyperledger.besu.ethereum.privacy.Restriction; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.util.bytes.BytesValue; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -85,7 +84,9 @@ public class EeaSendRawTransaction implements JsonRpcMethod { try { enclaveKey = privateTransactionHandler.sendToOrion(privateTransaction); } catch (final Exception e) { - return new JsonRpcErrorResponse(request.getId(), convertEnclaveInvalidReason(e.getMessage())); + return new JsonRpcErrorResponse( + request.getId(), + JsonRpcEnclaveErrorConverter.convertEnclaveInvalidReason(e.getMessage())); } final String privacyGroupId; @@ -93,7 +94,9 @@ public class EeaSendRawTransaction implements JsonRpcMethod { privacyGroupId = privateTransactionHandler.getPrivacyGroup(enclaveKey, privateTransaction); } catch (final Exception e) { - return new JsonRpcErrorResponse(request.getId(), convertEnclaveInvalidReason(e.getMessage())); + return new JsonRpcErrorResponse( + request.getId(), + JsonRpcEnclaveErrorConverter.convertEnclaveInvalidReason(e.getMessage())); } return privateTransactionHandler @@ -111,11 +114,13 @@ public class EeaSendRawTransaction implements JsonRpcMethod { request.getId(), privacyMarkerTransaction.hash().toString()), errorReason -> new JsonRpcErrorResponse( - request.getId(), convertTransactionInvalidReason(errorReason))); + request.getId(), + JsonRpcErrorConverter.convertTransactionInvalidReason(errorReason))); }, (errorReason) -> new JsonRpcErrorResponse( - request.getId(), convertTransactionInvalidReason(errorReason))); + request.getId(), + JsonRpcErrorConverter.convertTransactionInvalidReason(errorReason))); } private PrivateTransaction decodeRawTransaction(final String hash) diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroup.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroup.java similarity index 69% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroup.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroup.java index 43c4ab91c1..c91cd7df99 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroup.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroup.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.types.CreatePrivacyGroupRequest; -import tech.pegasys.pantheon.enclave.types.PrivacyGroup; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcEnclaveErrorConverter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.parameters.CreatePrivacyGroupParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.types.CreatePrivacyGroupRequest; +import org.hyperledger.besu.enclave.types.PrivacyGroup; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcEnclaveErrorConverter; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.parameters.CreatePrivacyGroupParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; import org.apache.logging.log4j.Logger; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroup.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroup.java similarity index 73% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroup.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroup.java index a4149a8b31..6b71994d1f 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroup.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroup.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.types.DeletePrivacyGroupRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.types.DeletePrivacyGroupRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; import org.apache.logging.log4j.Logger; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroup.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroup.java similarity index 71% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroup.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroup.java index c8799a445b..c0dde19405 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroup.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroup.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.types.FindPrivacyGroupRequest; -import tech.pegasys.pantheon.enclave.types.PrivacyGroup; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.types.FindPrivacyGroupRequest; +import org.hyperledger.besu.enclave.types.PrivacyGroup; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.util.Arrays; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddress.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddress.java similarity index 64% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddress.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddress.java index 3a79b3fe17..08a85414a4 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddress.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddress.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; public class PrivGetPrivacyPrecompileAddress implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransaction.java similarity index 71% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransaction.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransaction.java index 8ad30bc55c..a83ec52e0c 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransaction.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransaction.java @@ -10,28 +10,28 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.types.ReceiveRequest; -import tech.pegasys.pantheon.enclave.types.ReceiveResponse; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionGroupResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionLegacyResult; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.types.ReceiveRequest; +import org.hyperledger.besu.enclave.types.ReceiveResponse; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionGroupResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionLegacyResult; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.util.bytes.BytesValues; import org.apache.logging.log4j.Logger; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCount.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCount.java similarity index 64% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCount.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCount.java index 6c90ff4bf0..a0bd8f7d69 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCount.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCount.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionHandler; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv; + +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionHandler; public class PrivGetTransactionCount implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/parameters/CreatePrivacyGroupParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/parameters/CreatePrivacyGroupParameter.java similarity index 94% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/parameters/CreatePrivacyGroupParameter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/parameters/CreatePrivacyGroupParameter.java index 3b9a422b28..9f0406f04b 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/parameters/CreatePrivacyGroupParameter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/parameters/CreatePrivacyGroupParameter.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.parameters; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.parameters; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/BlockReplay.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockReplay.java similarity index 88% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/BlockReplay.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockReplay.java index f3d8ca6fe7..1d53a668e4 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/BlockReplay.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockReplay.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidationParams; -import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams; +import org.hyperledger.besu.ethereum.vm.BlockHashLookup; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; import java.util.List; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/BlockTrace.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockTrace.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/BlockTrace.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockTrace.java index 637d93c70b..d6e0718e75 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/BlockTrace.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockTrace.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/BlockTracer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockTracer.java similarity index 79% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/BlockTracer.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockTracer.java index 00c5e4fe77..1665a8eda2 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/BlockTracer.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockTracer.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockReplay.TransactionAction; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; -import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; -import tech.pegasys.pantheon.ethereum.vm.DebugOperationTracer; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor; + +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockReplay.TransactionAction; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor; +import org.hyperledger.besu.ethereum.vm.BlockHashLookup; +import org.hyperledger.besu.ethereum.vm.DebugOperationTracer; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/TransactionTrace.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTrace.java similarity index 83% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/TransactionTrace.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTrace.java index 81b6724032..e4a644c7bf 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/TransactionTrace.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTrace.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.debug.TraceFrame; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor.Result; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.debug.TraceFrame; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor.Result; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/TransactionTracer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTracer.java similarity index 83% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/TransactionTracer.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTracer.java index 629ab1567d..138d3c054f 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/TransactionTracer.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTracer.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor.Result; -import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; -import tech.pegasys.pantheon.ethereum.vm.DebugOperationTracer; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor.Result; +import org.hyperledger.besu.ethereum.vm.BlockHashLookup; +import org.hyperledger.besu.ethereum.vm.DebugOperationTracer; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/queries/BlockchainQueries.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/queries/BlockchainQueries.java similarity index 95% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/queries/BlockchainQueries.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/queries/BlockchainQueries.java index b8e923e858..872caede09 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/queries/BlockchainQueries.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/queries/BlockchainQueries.java @@ -10,30 +10,30 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; -import tech.pegasys.pantheon.ethereum.api.LogsQuery; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.TransactionLocation; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.api.LogsQuery; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.TransactionLocation; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/queries/TransactionReceiptWithMetadata.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/queries/TransactionReceiptWithMetadata.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/queries/TransactionReceiptWithMetadata.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/queries/TransactionReceiptWithMetadata.java index 64e6db8d7e..7c43515b4d 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/queries/TransactionReceiptWithMetadata.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/queries/TransactionReceiptWithMetadata.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; public class TransactionReceiptWithMetadata { private final TransactionReceipt receipt; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcError.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcError.java similarity index 98% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcError.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcError.java index 219566fcbd..1addd57f86 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcError.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcError.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.response; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonFormat; @@ -30,7 +30,7 @@ public enum JsonRpcError { // eth_sendTransaction specific error message ETH_SEND_TX_NOT_AVAILABLE( -32604, - "The method eth_sendTransaction is not supported. Use eth_sendRawTransaction to send a signed transaction to Pantheon."), + "The method eth_sendTransaction is not supported. Use eth_sendRawTransaction to send a signed transaction to Besu."), // P2P related errors P2P_DISABLED(-32000, "P2P has been disabled. This functionality is not available"), diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcErrorResponse.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcErrorResponse.java similarity index 96% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcErrorResponse.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcErrorResponse.java index 5649fa4fda..954facd761 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcErrorResponse.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcErrorResponse.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.response; import java.util.Objects; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcNoResponse.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcNoResponse.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcNoResponse.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcNoResponse.java index 29b36825a0..a2ca4d711c 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcNoResponse.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcNoResponse.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.response; public class JsonRpcNoResponse implements JsonRpcResponse { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcResponse.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcResponse.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcResponse.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcResponse.java index 478d9c571e..8ad99d88fb 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcResponse.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcResponse.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.response; import com.fasterxml.jackson.annotation.JsonGetter; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcResponseType.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcResponseType.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcResponseType.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcResponseType.java index f8e769f7d9..a4399d5d05 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcResponseType.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcResponseType.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.response; /** Various types of responses that the JSON-RPC component may produce. */ public enum JsonRpcResponseType { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcSuccessResponse.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcSuccessResponse.java similarity index 96% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcSuccessResponse.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcSuccessResponse.java index 77e8ebd662..aff13f5889 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcSuccessResponse.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcSuccessResponse.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.response; import java.util.Objects; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcUnauthorizedResponse.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcUnauthorizedResponse.java similarity index 96% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcUnauthorizedResponse.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcUnauthorizedResponse.java index 76b7f77abd..9e3cd891c5 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/response/JsonRpcUnauthorizedResponse.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcUnauthorizedResponse.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.response; import java.util.Objects; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/BlockResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResult.java similarity index 96% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/BlockResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResult.java index c17cc9e4a5..9ff737005d 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/BlockResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResult.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.util.uint.UInt256; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/BlockResultFactory.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResultFactory.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/BlockResultFactory.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResultFactory.java index 03bb0e9b95..29f4d000c8 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/BlockResultFactory.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResultFactory.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.List; import java.util.stream.Collectors; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/DebugAccountRangeAtResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/DebugAccountRangeAtResult.java similarity index 94% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/DebugAccountRangeAtResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/DebugAccountRangeAtResult.java index 8cec2807fe..4d35a2f9bb 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/DebugAccountRangeAtResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/DebugAccountRangeAtResult.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; import java.util.Map; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/DebugStorageRangeAtResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/DebugStorageRangeAtResult.java similarity index 94% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/DebugStorageRangeAtResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/DebugStorageRangeAtResult.java index 269d186c61..46aa58117c 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/DebugStorageRangeAtResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/DebugStorageRangeAtResult.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.core.AccountStorageEntry; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.AccountStorageEntry; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; import java.util.NavigableMap; import java.util.Objects; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/DebugTraceTransactionResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/DebugTraceTransactionResult.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/DebugTraceTransactionResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/DebugTraceTransactionResult.java index 8c970e3ac0..58a92e8d79 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/DebugTraceTransactionResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/DebugTraceTransactionResult.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.TransactionTrace; -import tech.pegasys.pantheon.ethereum.debug.TraceFrame; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace; +import org.hyperledger.besu.ethereum.debug.TraceFrame; import java.util.Collection; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/JsonRpcResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/JsonRpcResult.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/JsonRpcResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/JsonRpcResult.java index 74b51564c0..ca9c6e14f8 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/JsonRpcResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/JsonRpcResult.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/LogResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/LogResult.java similarity index 94% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/LogResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/LogResult.java index 02349e6a46..b1d62ede0d 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/LogResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/LogResult.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; -import tech.pegasys.pantheon.ethereum.core.LogTopic; +import org.hyperledger.besu.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.core.LogTopic; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/LogsResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/LogsResult.java similarity index 89% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/LogsResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/LogsResult.java index f366367138..dd953a0eaf 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/LogsResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/LogsResult.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.api.LogWithMetadata; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/NetworkResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/NetworkResult.java similarity index 95% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/NetworkResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/NetworkResult.java index ae3bbb6d78..86cbf45ab6 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/NetworkResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/NetworkResult.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; import java.net.SocketAddress; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/PeerResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PeerResult.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/PeerResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PeerResult.java index 8a99183e36..98982a5bc2 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/PeerResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PeerResult.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; import java.util.List; import java.util.stream.Collectors; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/PendingTransactionsResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PendingTransactionsResult.java similarity index 88% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/PendingTransactionsResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PendingTransactionsResult.java index b2cd85a2b6..ae9563e048 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/PendingTransactionsResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PendingTransactionsResult.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions.TransactionInfo; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo; import java.util.Set; import java.util.stream.Collectors; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/PendingTransactionsStatisticsResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PendingTransactionsStatisticsResult.java similarity index 94% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/PendingTransactionsStatisticsResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PendingTransactionsStatisticsResult.java index bf65e89401..7804f8c2bc 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/PendingTransactionsStatisticsResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PendingTransactionsStatisticsResult.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; import com.fasterxml.jackson.annotation.JsonGetter; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/Quantity.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/Quantity.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/Quantity.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/Quantity.java index 3f741d2892..226892f39c 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/Quantity.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/Quantity.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; -import tech.pegasys.pantheon.util.uint.UInt256Value; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; +import org.hyperledger.besu.util.uint.UInt256Value; import java.math.BigInteger; import java.util.Objects; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/SignerMetricResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/SignerMetricResult.java similarity index 95% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/SignerMetricResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/SignerMetricResult.java index 9211a519a5..1dc3a5d5f1 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/SignerMetricResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/SignerMetricResult.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Address; import java.util.Objects; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/StructLog.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/StructLog.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/StructLog.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/StructLog.java index 5bba5feb9a..bd9f5587a5 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/StructLog.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/StructLog.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.debug.TraceFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32s; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.debug.TraceFrame; +import org.hyperledger.besu.util.bytes.Bytes32s; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Arrays; import java.util.Map; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/StructLogWithError.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/StructLogWithError.java similarity index 85% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/StructLogWithError.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/StructLogWithError.java index 25db6f0845..688a069849 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/StructLogWithError.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/StructLogWithError.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.debug.TraceFrame; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.debug.TraceFrame; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; import com.fasterxml.jackson.annotation.JsonGetter; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/SyncingResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/SyncingResult.java similarity index 94% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/SyncingResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/SyncingResult.java index 060e553053..13ef8486ae 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/SyncingResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/SyncingResult.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.plugin.data.SyncStatus; +import org.hyperledger.besu.plugin.data.SyncStatus; import java.util.Objects; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionCompleteResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionCompleteResult.java similarity index 93% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionCompleteResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionCompleteResult.java index 53229ca364..1552917ec2 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionCompleteResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionCompleteResult.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.util.bytes.BytesValue; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionHashResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionHashResult.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionHashResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionHashResult.java index b2bed4f5bd..fab25d7c6d 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionHashResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionHashResult.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionInfoResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionInfoResult.java similarity index 90% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionInfoResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionInfoResult.java index fae2d2357f..c95b462642 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionInfoResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionInfoResult.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions.TransactionInfo; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo; import java.time.Instant; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionPendingResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionPendingResult.java similarity index 94% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionPendingResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionPendingResult.java index dcf3220c21..6c63d7b038 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionPendingResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionPendingResult.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.util.bytes.BytesValue; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionReceiptLogResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptLogResult.java similarity index 93% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionReceiptLogResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptLogResult.java index b3a10e9be8..de4e94b7e4 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionReceiptLogResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptLogResult.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Log; -import tech.pegasys.pantheon.ethereum.core.LogTopic; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Log; +import org.hyperledger.besu.ethereum.core.LogTopic; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java index eab853f640..314eb3381f 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.TransactionReceiptWithMetadata; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Log; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; + +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.TransactionReceiptWithMetadata; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Log; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionReceiptRootResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptRootResult.java similarity index 85% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionReceiptRootResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptRootResult.java index fedb30beab..cc51e894d9 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionReceiptRootResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptRootResult.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.TransactionReceiptWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.TransactionReceiptWithMetadata; import com.fasterxml.jackson.annotation.JsonGetter; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionReceiptStatusResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptStatusResult.java similarity index 85% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionReceiptStatusResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptStatusResult.java index be88507e87..616dc0609e 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionReceiptStatusResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptStatusResult.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.TransactionReceiptWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.TransactionReceiptWithMetadata; import com.fasterxml.jackson.annotation.JsonGetter; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionResult.java similarity index 90% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionResult.java index 3fd9ee18b0..d0acabc48c 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/TransactionResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionResult.java @@ -10,6 +10,6 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; public interface TransactionResult {} diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/UncleBlockResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/UncleBlockResult.java similarity index 81% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/UncleBlockResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/UncleBlockResult.java index df49e97fae..ceded25b00 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/UncleBlockResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/UncleBlockResult.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Collections; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionGroupResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionGroupResult.java similarity index 88% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionGroupResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionGroupResult.java index 2c20733977..33d389faab 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionGroupResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionGroupResult.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.privacy; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.util.bytes.BytesValues; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionLegacyResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionLegacyResult.java similarity index 88% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionLegacyResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionLegacyResult.java index 4c7a60c1c1..5549b1e522 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionLegacyResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionLegacyResult.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.privacy; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.util.bytes.BytesValues; import java.util.List; import java.util.stream.Collectors; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionReceiptResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionReceiptResult.java similarity index 88% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionReceiptResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionReceiptResult.java index 23cf07b519..c9d9640871 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionReceiptResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionReceiptResult.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.privacy; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionReceiptLogResult; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Log; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionReceiptLogResult; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Log; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionResult.java similarity index 89% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionResult.java index c050793aec..a3b482e257 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionResult.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.privacy; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import com.fasterxml.jackson.annotation.JsonGetter; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/proof/GetProofResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/GetProofResult.java similarity index 87% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/proof/GetProofResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/GetProofResult.java index c31cb36a96..6f27563369 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/proof/GetProofResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/GetProofResult.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.proof; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.proof.WorldStateProof; -import tech.pegasys.pantheon.ethereum.worldstate.StateTrieAccountValue; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.proof; + +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.proof.WorldStateProof; +import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/proof/StorageEntryProof.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/StorageEntryProof.java similarity index 84% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/proof/StorageEntryProof.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/StorageEntryProof.java index 271aa6cc8e..ef9505f1bd 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/proof/StorageEntryProof.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/StorageEntryProof.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.proof; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.proof; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.List; import java.util.stream.Collectors; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/Action.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/Action.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/Action.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/Action.java index 4a213df622..9a7726b972 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/Action.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/Action.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.tracing; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing; import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.TransactionTrace; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.debug.TraceFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.debug.TraceFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/FlatTrace.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/FlatTrace.java similarity index 96% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/FlatTrace.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/FlatTrace.java index ce9e634e23..83b453149a 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/FlatTrace.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/FlatTrace.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.tracing; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.TransactionTrace; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/FlatTraceGenerator.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/FlatTraceGenerator.java similarity index 95% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/FlatTraceGenerator.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/FlatTraceGenerator.java index cb350943c2..2f90028d56 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/FlatTraceGenerator.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/FlatTraceGenerator.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.tracing; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.TransactionTrace; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.debug.TraceFrame; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.debug.TraceFrame; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/Result.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/Result.java similarity index 96% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/Result.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/Result.java index a9a572a4c2..eb01ebc83a 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/Result.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/Result.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.tracing; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing; import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/Trace.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/Trace.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/Trace.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/Trace.java index 643178117e..5bff3efcca 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/Trace.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/Trace.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.tracing; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing; /** * Trace is a marker interface representing different types of Parity style JSON responses for the diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/TraceFormatter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/TraceFormatter.java similarity index 79% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/TraceFormatter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/TraceFormatter.java index ec4058da13..7f493becc7 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/TraceFormatter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/TraceFormatter.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.tracing; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.TransactionTrace; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace; +import org.hyperledger.besu.ethereum.vm.GasCalculator; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/TraceWriter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/TraceWriter.java similarity index 89% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/TraceWriter.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/TraceWriter.java index 74e20572bb..2ca7760e82 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/tracing/TraceWriter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/TraceWriter.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.tracing; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing; @FunctionalInterface public interface TraceWriter { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketConfiguration.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketConfiguration.java similarity index 95% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketConfiguration.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketConfiguration.java index 524183020f..fffd38f581 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketConfiguration.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketConfiguration.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApi; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApis; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis; import java.util.Arrays; import java.util.Collection; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketRequestHandler.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketRequestHandler.java similarity index 83% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketRequestHandler.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketRequestHandler.java index 459613259d..e7a5145acd 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketRequestHandler.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketRequestHandler.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.authentication.AuthenticationService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.authentication.AuthenticationUtils; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcUnauthorizedResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods.WebSocketRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationService; +import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationUtils; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcUnauthorizedResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketRpcRequest; import java.util.Map; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketService.java similarity index 96% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketService.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketService.java index 23ddc99051..87b5d1908f 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketService.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketService.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket; import static com.google.common.collect.Streams.stream; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.authentication.AuthenticationService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.authentication.AuthenticationUtils; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationService; +import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationUtils; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; import java.net.InetSocketAddress; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/AbstractSubscriptionMethod.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/AbstractSubscriptionMethod.java similarity index 76% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/AbstractSubscriptionMethod.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/AbstractSubscriptionMethod.java index cbd3191b86..46a6a4161f 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/AbstractSubscriptionMethod.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/AbstractSubscriptionMethod.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; abstract class AbstractSubscriptionMethod implements JsonRpcMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthSubscribe.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthSubscribe.java similarity index 59% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthSubscribe.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthSubscribe.java index 3f53f1ccee..1746401399 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthSubscribe.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthSubscribe.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; public class EthSubscribe extends AbstractSubscriptionMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribe.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribe.java similarity index 60% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribe.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribe.java index cf4befb4a2..b8e7360acd 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribe.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribe.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionNotFoundException; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.UnsubscribeRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionNotFoundException; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.UnsubscribeRequest; public class EthUnsubscribe extends AbstractSubscriptionMethod { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/WebSocketMethodsFactory.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/WebSocketMethodsFactory.java similarity index 80% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/WebSocketMethodsFactory.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/WebSocketMethodsFactory.java index 621be0ee96..ebf7e42450 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/WebSocketMethodsFactory.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/WebSocketMethodsFactory.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; import java.util.HashMap; import java.util.Map; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/WebSocketRpcRequest.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/WebSocketRpcRequest.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/WebSocketRpcRequest.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/WebSocketRpcRequest.java index fe62675508..d6371be0d3 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/WebSocketRpcRequest.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/WebSocketRpcRequest.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonGetter; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/Subscription.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/Subscription.java similarity index 93% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/Subscription.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/Subscription.java index b4d686fb27..fd55ded297 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/Subscription.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/Subscription.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; import java.util.Objects; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilder.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilder.java similarity index 78% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilder.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilder.java index d11cc1841e..a4690b3469 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilder.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilder.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.blockheaders.NewBlockHeadersSubscription; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.logs.LogsSubscription; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.syncing.SyncingSubscription; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.blockheaders.NewBlockHeadersSubscription; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.logs.LogsSubscription; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.syncing.SyncingSubscription; import java.util.Optional; import java.util.function.Function; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManager.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManager.java similarity index 86% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManager.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManager.java index a3fa8af740..948658df3f 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManager.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManager.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.JsonRpcResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.UnsubscribeRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.response.SubscriptionResponse; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription; + +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.JsonRpcResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.UnsubscribeRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.response.SubscriptionResponse; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; import java.util.List; import java.util.Map; @@ -55,13 +55,13 @@ public class SubscriptionManager extends AbstractVerticle { public SubscriptionManager(final MetricsSystem metricsSystem) { subscribeCounter = metricsSystem.createLabelledCounter( - PantheonMetricCategory.RPC, + BesuMetricCategory.RPC, "subscription_subscribe_total", "Total number of subscriptions", "type"); unsubscribeCounter = metricsSystem.createLabelledCounter( - PantheonMetricCategory.RPC, + BesuMetricCategory.RPC, "subscription_unsubscribe_total", "Total number of unsubscriptions", "type"); diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionNotFoundException.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionNotFoundException.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionNotFoundException.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionNotFoundException.java index 5d76212ed5..ee005f1223 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionNotFoundException.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionNotFoundException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription; public class SubscriptionNotFoundException extends RuntimeException { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscription.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscription.java similarity index 79% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscription.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscription.java index e4785e8655..8661e5a782 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscription.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscription.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.blockheaders; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.blockheaders; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.Subscription; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.Subscription; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; public class NewBlockHeadersSubscription extends Subscription { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionService.java similarity index 75% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionService.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionService.java index 1506baffbc..b199c803bd 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionService.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionService.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.blockheaders; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.blockheaders; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.BlockResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.BlockResultFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedObserver; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.BlockAddedObserver; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Hash; public class NewBlockHeadersSubscriptionService implements BlockAddedObserver { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscription.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscription.java similarity index 73% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscription.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscription.java index 987c089e6f..e2cc6f150d 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscription.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscription.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.logs; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.logs; -import tech.pegasys.pantheon.ethereum.api.LogsQuery; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.FilterParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.Subscription; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.api.LogsQuery; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.Subscription; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; public class LogsSubscription extends Subscription { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionService.java similarity index 83% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionService.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionService.java index 4e96a9984f..cc5f8c0ac6 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionService.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionService.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.logs; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.logs; -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.TransactionReceiptWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.LogResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedObserver; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Log; +import org.hyperledger.besu.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.TransactionReceiptWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.LogResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.BlockAddedObserver; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Log; import java.util.List; import java.util.Optional; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDetailResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDetailResult.java similarity index 88% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDetailResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDetailResult.java index f3ed9561bb..207a0f0857 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDetailResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDetailResult.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.pending; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.pending; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.JsonRpcResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.JsonRpcResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.util.bytes.BytesValue; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionService.java similarity index 74% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionService.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionService.java index 439049aad8..845971c653 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionService.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionService.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.pending; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.Subscription; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactionDroppedListener; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.pending; + +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.Subscription; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionDroppedListener; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionResult.java similarity index 80% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionResult.java index 22bff53d76..e2f3281735 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionResult.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.pending; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.pending; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.JsonRpcResult; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.JsonRpcResult; +import org.hyperledger.besu.ethereum.core.Hash; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionService.java similarity index 79% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionService.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionService.java index e3549e32bf..0f612c5843 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionService.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionService.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.pending; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.pending; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.Subscription; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactionListener; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.Subscription; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionListener; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/InvalidRequestException.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/InvalidRequestException.java similarity index 89% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/InvalidRequestException.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/InvalidRequestException.java index fd922af9a4..263650573b 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/InvalidRequestException.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/InvalidRequestException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request; public class InvalidRequestException extends RuntimeException { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/InvalidSubscriptionRequestException.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/InvalidSubscriptionRequestException.java similarity index 91% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/InvalidSubscriptionRequestException.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/InvalidSubscriptionRequestException.java index cdfb15ec5c..cbc9df8e8f 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/InvalidSubscriptionRequestException.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/InvalidSubscriptionRequestException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request; public class InvalidSubscriptionRequestException extends RuntimeException { diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/LogsSubscriptionParam.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/LogsSubscriptionParam.java similarity index 93% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/LogsSubscriptionParam.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/LogsSubscriptionParam.java index 6fc9fb82cd..b394a33884 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/LogsSubscriptionParam.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/LogsSubscriptionParam.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request; import java.util.List; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/SubscribeRequest.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscribeRequest.java similarity index 93% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/SubscribeRequest.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscribeRequest.java index 8907701f8c..3205a6ba0a 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/SubscribeRequest.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscribeRequest.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.FilterParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter; import java.util.Objects; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionParam.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionParam.java similarity index 92% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionParam.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionParam.java index 87f25bac45..8ea6f4d74c 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionParam.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionParam.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapper.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapper.java similarity index 89% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapper.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapper.java index 9805cce6cb..9872dee16f 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapper.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapper.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request; - -import tech.pegasys.pantheon.ethereum.api.TopicsParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.FilterParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.UnsignedLongParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods.WebSocketRpcRequest; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request; + +import org.hyperledger.besu.ethereum.api.TopicsParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.UnsignedLongParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketRpcRequest; import java.util.Arrays; import java.util.Collections; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionType.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionType.java similarity index 94% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionType.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionType.java index dfe525faa9..79a93771d2 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionType.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionType.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/UnsubscribeRequest.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/UnsubscribeRequest.java similarity index 95% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/UnsubscribeRequest.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/UnsubscribeRequest.java index 5aa56637cc..45a9ec4f2c 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/UnsubscribeRequest.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/UnsubscribeRequest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request; import java.util.Objects; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/response/SubscriptionResponse.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/response/SubscriptionResponse.java similarity index 85% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/response/SubscriptionResponse.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/response/SubscriptionResponse.java index 58d1396d26..b7283e49ee 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/response/SubscriptionResponse.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/response/SubscriptionResponse.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.response; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.response; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.JsonRpcResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.JsonRpcResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/response/SubscriptionResponseResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/response/SubscriptionResponseResult.java similarity index 87% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/response/SubscriptionResponseResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/response/SubscriptionResponseResult.java index 27ae5c0f80..61463819d1 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/response/SubscriptionResponseResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/response/SubscriptionResponseResult.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.response; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.response; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.JsonRpcResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.JsonRpcResult; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/syncing/NotSynchronisingResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/syncing/NotSynchronisingResult.java similarity index 82% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/syncing/NotSynchronisingResult.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/syncing/NotSynchronisingResult.java index 9dc4c61742..cdbdbdb4c5 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/syncing/NotSynchronisingResult.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/syncing/NotSynchronisingResult.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.syncing; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.syncing; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.JsonRpcResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.JsonRpcResult; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscription.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscription.java similarity index 81% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscription.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscription.java index 3a4a5febdf..edac2df769 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscription.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscription.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.syncing; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.syncing; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.Subscription; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.Subscription; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; public class SyncingSubscription extends Subscription { private boolean firstMessageHasBeenSent = false; diff --git a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionService.java similarity index 74% rename from ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionService.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionService.java index b80e85ccd2..1ee7d15217 100644 --- a/ethereum/api/src/main/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionService.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionService.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.syncing; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.syncing; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.SyncingResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.Subscription; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.plugin.data.SyncStatus; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.SyncingResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.Subscription; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.plugin.data.SyncStatus; public class SyncingSubscriptionService { diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/AbstractDataFetcherTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/AbstractDataFetcherTest.java similarity index 84% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/AbstractDataFetcherTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/AbstractDataFetcherTest.java index 1e805b6942..738bd8bff2 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/AbstractDataFetcherTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/AbstractDataFetcherTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; +package org.hyperledger.besu.ethereum.api.graphql; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.BlockchainQuery; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.pojoadapter.NormalBlockAdapter; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.api.graphql.internal.BlockchainQuery; +import org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter.NormalBlockAdapter; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; import java.util.Optional; import java.util.Set; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/AbstractEthGraphQLHttpServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/AbstractEthGraphQLHttpServiceTest.java similarity index 78% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/AbstractEthGraphQLHttpServiceTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/AbstractEthGraphQLHttpServiceTest.java index 53c96b2c00..8866458c8a 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/AbstractEthGraphQLHttpServiceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/AbstractEthGraphQLHttpServiceTest.java @@ -10,34 +10,34 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import tech.pegasys.pantheon.ethereum.chain.GenesisState; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider; -import tech.pegasys.pantheon.ethereum.core.SyncStatus; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.util.RawBlockIterator; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.testutil.BlockTestUtil; +package org.hyperledger.besu.ethereum.api.graphql; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.chain.GenesisState; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider; +import org.hyperledger.besu.ethereum.core.SyncStatus; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.util.RawBlockIterator; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.testutil.BlockTestUtil; import java.net.URL; import java.nio.file.Paths; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/BlockDataFetcherTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/BlockDataFetcherTest.java similarity index 89% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/BlockDataFetcherTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/BlockDataFetcherTest.java index 6ab4bf5e9f..1285344a61 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/BlockDataFetcherTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/BlockDataFetcherTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; +package org.hyperledger.besu.ethereum.api.graphql; -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/EthGraphQLHttpBySpecErrorCaseTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/EthGraphQLHttpBySpecErrorCaseTest.java similarity index 98% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/EthGraphQLHttpBySpecErrorCaseTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/EthGraphQLHttpBySpecErrorCaseTest.java index a644996cd8..bba9aa4849 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/EthGraphQLHttpBySpecErrorCaseTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/EthGraphQLHttpBySpecErrorCaseTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; +package org.hyperledger.besu.ethereum.api.graphql; import java.io.IOException; import java.util.ArrayList; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/EthGraphQLHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/EthGraphQLHttpBySpecTest.java similarity index 98% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/EthGraphQLHttpBySpecTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/EthGraphQLHttpBySpecTest.java index ebcd28c166..235b5ec537 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/EthGraphQLHttpBySpecTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/EthGraphQLHttpBySpecTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; +package org.hyperledger.besu.ethereum.api.graphql; import java.io.IOException; import java.util.ArrayList; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLConfigurationTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLConfigurationTest.java similarity index 95% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLConfigurationTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLConfigurationTest.java index f5713f79df..caac231236 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLConfigurationTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLConfigurationTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; +package org.hyperledger.besu.ethereum.api.graphql; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLHttpServiceCorsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceCorsTest.java similarity index 94% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLHttpServiceCorsTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceCorsTest.java index b6d87450b6..3e74fda0c5 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLHttpServiceCorsTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceCorsTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; - -import tech.pegasys.pantheon.ethereum.api.graphql.internal.BlockchainQuery; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; +package org.hyperledger.besu.ethereum.api.graphql; + +import org.hyperledger.besu.ethereum.api.graphql.internal.BlockchainQuery; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; import java.util.HashSet; import java.util.Set; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLHttpServiceHostWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceHostWhitelistTest.java similarity index 92% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLHttpServiceHostWhitelistTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceHostWhitelistTest.java index a405bde54e..c7c25a5867 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLHttpServiceHostWhitelistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceHostWhitelistTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; - -import tech.pegasys.pantheon.ethereum.api.graphql.internal.BlockchainQuery; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; +package org.hyperledger.besu.ethereum.api.graphql; + +import org.hyperledger.besu.ethereum.api.graphql.internal.BlockchainQuery; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; import java.io.IOException; import java.util.Arrays; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLHttpServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceTest.java similarity index 94% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLHttpServiceTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceTest.java index 7a19d2ab66..cfe907b1c8 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLHttpServiceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceTest.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; +package org.hyperledger.besu.ethereum.api.graphql; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.BlockchainQuery; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.testutil.BlockTestUtil; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.graphql.internal.BlockchainQuery; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.testutil.BlockTestUtil; +import org.hyperledger.besu.util.bytes.BytesValue; import java.net.InetSocketAddress; import java.net.URL; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLTestHelper.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLTestHelper.java similarity index 96% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLTestHelper.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLTestHelper.java index 5c056b52f8..6ad4ca2543 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/GraphQLTestHelper.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLTestHelper.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql; +package org.hyperledger.besu.ethereum.api.graphql; import java.util.Set; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/scalar/AddressScalarTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/AddressScalarTest.java similarity index 93% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/scalar/AddressScalarTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/AddressScalarTest.java index 49293bc5b4..a8224225e9 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/scalar/AddressScalarTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/AddressScalarTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.scalar; +package org.hyperledger.besu.ethereum.api.graphql.scalar; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.Scalars; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.api.graphql.internal.Scalars; +import org.hyperledger.besu.ethereum.core.Address; import graphql.language.StringValue; import graphql.schema.CoercingParseLiteralException; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/scalar/BigIntScalarTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/BigIntScalarTest.java similarity index 93% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/scalar/BigIntScalarTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/BigIntScalarTest.java index 3afae6b10f..ff1f12bcd1 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/scalar/BigIntScalarTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/BigIntScalarTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.scalar; +package org.hyperledger.besu.ethereum.api.graphql.scalar; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.Scalars; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.api.graphql.internal.Scalars; +import org.hyperledger.besu.util.uint.UInt256; import graphql.language.StringValue; import graphql.schema.CoercingParseLiteralException; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/scalar/Bytes32ScalarTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/Bytes32ScalarTest.java similarity index 93% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/scalar/Bytes32ScalarTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/Bytes32ScalarTest.java index 39aa2266e4..72d85c130d 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/scalar/Bytes32ScalarTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/Bytes32ScalarTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.scalar; +package org.hyperledger.besu.ethereum.api.graphql.scalar; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.Scalars; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.ethereum.api.graphql.internal.Scalars; +import org.hyperledger.besu.util.bytes.Bytes32; import graphql.language.StringValue; import graphql.schema.CoercingParseLiteralException; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/scalar/BytesScalarTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/BytesScalarTest.java similarity index 93% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/scalar/BytesScalarTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/BytesScalarTest.java index 55fc2e2bd8..a09ecd4921 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/scalar/BytesScalarTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/BytesScalarTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.scalar; +package org.hyperledger.besu.ethereum.api.graphql.scalar; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.Scalars; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.graphql.internal.Scalars; +import org.hyperledger.besu.util.bytes.BytesValue; import graphql.language.StringValue; import graphql.schema.CoercingParseLiteralException; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/scalar/LongScalarTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/LongScalarTest.java similarity index 95% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/scalar/LongScalarTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/LongScalarTest.java index 70cf203e2f..52e452f1ab 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/graphql/scalar/LongScalarTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/LongScalarTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.graphql.internal.scalar; +package org.hyperledger.besu.ethereum.api.graphql.scalar; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.graphql.internal.Scalars; +import org.hyperledger.besu.ethereum.api.graphql.internal.Scalars; import graphql.language.StringValue; import graphql.schema.CoercingParseLiteralException; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/AbstractJsonRpcHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpBySpecTest.java similarity index 99% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/AbstractJsonRpcHttpBySpecTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpBySpecTest.java index 6ad2be068c..885c943c2d 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/AbstractJsonRpcHttpBySpecTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpBySpecTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import static com.google.common.base.Preconditions.checkState; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java similarity index 78% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java index 4fc334f841..9d5856d330 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import static com.google.common.base.Preconditions.checkArgument; import static org.mockito.ArgumentMatchers.any; @@ -18,30 +18,30 @@ import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.config.StubGenesisConfigOptions; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.HealthService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterIdGenerator; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterRepository; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; -import tech.pegasys.pantheon.testutil.BlockTestUtil.ChainResources; +import org.hyperledger.besu.config.StubGenesisConfigOptions; +import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterIdGenerator; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterRepository; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.testutil.BlockTestUtil.ChainResources; import java.math.BigInteger; import java.net.URL; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/AdminJsonRpcHttpServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AdminJsonRpcHttpServiceTest.java similarity index 93% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/AdminJsonRpcHttpServiceTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AdminJsonRpcHttpServiceTest.java index 40fefc31c1..414fc5d53d 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/AdminJsonRpcHttpServiceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AdminJsonRpcHttpServiceTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.util.bytes.BytesValue; import java.net.InetSocketAddress; import java.util.ArrayList; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/DebugJsonRpcHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/DebugJsonRpcHttpBySpecTest.java similarity index 90% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/DebugJsonRpcHttpBySpecTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/DebugJsonRpcHttpBySpecTest.java index 53d23d560d..0925f2b3bb 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/DebugJsonRpcHttpBySpecTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/DebugJsonRpcHttpBySpecTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import java.net.URL; @@ -33,6 +33,6 @@ public class DebugJsonRpcHttpBySpecTest extends AbstractJsonRpcHttpBySpecTest { @Parameters(name = "{index}: {0}") public static Object[][] specs() { - return AbstractJsonRpcHttpBySpecTest.findSpecFiles("debug"); + return findSpecFiles("debug"); } } diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/EthJsonRpcHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/EthJsonRpcHttpBySpecTest.java similarity index 90% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/EthJsonRpcHttpBySpecTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/EthJsonRpcHttpBySpecTest.java index 81444113ba..08f8888623 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/EthJsonRpcHttpBySpecTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/EthJsonRpcHttpBySpecTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import java.net.URL; @@ -33,6 +33,6 @@ public class EthJsonRpcHttpBySpecTest extends AbstractJsonRpcHttpBySpecTest { @Parameters(name = "{index}: {0}") public static Object[][] specs() { - return AbstractJsonRpcHttpBySpecTest.findSpecFiles("eth"); + return findSpecFiles("eth"); } } diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcConfigurationTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfigurationTest.java similarity index 98% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcConfigurationTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfigurationTest.java index 6b5dc2a437..26bc70d86c 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcConfigurationTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfigurationTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpServiceCorsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceCorsTest.java similarity index 97% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpServiceCorsTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceCorsTest.java index 8b59ee353a..beb6bb0955 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpServiceCorsTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceCorsTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.HealthService; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.util.HashMap; import java.util.Optional; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpServiceHostWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostWhitelistTest.java similarity index 82% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpServiceHostWhitelistTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostWhitelistTest.java index b647729444..bde3a4303a 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpServiceHostWhitelistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostWhitelistTest.java @@ -10,30 +10,30 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; -import tech.pegasys.pantheon.config.StubGenesisConfigOptions; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.HealthService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.config.StubGenesisConfigOptions; +import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; import java.io.IOException; import java.math.BigInteger; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java similarity index 92% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java index 685fc9f5fd..dc256f28a9 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java @@ -10,34 +10,34 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; -import tech.pegasys.pantheon.config.StubGenesisConfigOptions; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.authentication.AuthenticationUtils; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.HealthService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthAccounts; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthBlockNumber; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.NetVersion; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.Web3ClientVersion; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.Web3Sha3; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.config.StubGenesisConfigOptions; +import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationUtils; +import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthAccounts; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthBlockNumber; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.NetVersion; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.Web3ClientVersion; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.Web3Sha3; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -75,6 +75,7 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; +import org.assertj.core.api.Assertions; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; @@ -408,7 +409,7 @@ public class JsonRpcHttpServiceLoginTest { assertThat(r.succeeded()).isTrue(); final User user = r.result(); // single eth/blockNumber method permitted - assertThat( + Assertions.assertThat( AuthenticationUtils.isPermitted( service.authenticationService, Optional.of(user), ethBlockNumber)) .isTrue(); diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java similarity index 89% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java index 218d643332..c90684f22a 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java @@ -10,37 +10,37 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; -import tech.pegasys.pantheon.config.StubGenesisConfigOptions; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.HealthService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.config.RlpxConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.network.DefaultP2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.config.StubGenesisConfigOptions; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration; +import org.hyperledger.besu.ethereum.p2p.network.DefaultP2PNetwork; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; import java.math.BigInteger; import java.util.ArrayList; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java similarity index 97% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java index af171ba823..5d89f2e2e0 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; @@ -19,39 +19,39 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.config.StubGenesisConfigOptions; -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.HealthService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogsBloomFilter; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.SyncStatus; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.config.StubGenesisConfigOptions; +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.LogsBloomFilter; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.SyncStatus; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.net.InetSocketAddress; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcTestHelper.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestHelper.java similarity index 98% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcTestHelper.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestHelper.java index 7070548895..f49ab28696 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/JsonRpcTestHelper.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestHelper.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/LatestNonceProviderTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/LatestNonceProviderTest.java similarity index 88% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/LatestNonceProviderTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/LatestNonceProviderTest.java index 603b32571c..67e327c0a3 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/LatestNonceProviderTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/LatestNonceProviderTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; import java.util.OptionalLong; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/MockPeerConnection.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/MockPeerConnection.java similarity index 87% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/MockPeerConnection.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/MockPeerConnection.java index a65781e15a..0b8ea0fb36 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/MockPeerConnection.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/MockPeerConnection.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; import java.net.InetSocketAddress; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/SimpleTestTransactionBuilder.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/SimpleTestTransactionBuilder.java similarity index 95% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/SimpleTestTransactionBuilder.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/SimpleTestTransactionBuilder.java index 458e9d4c33..0b0a68752d 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/SimpleTestTransactionBuilder.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/SimpleTestTransactionBuilder.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; import java.util.Optional; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/TraceJsonRpcHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/TraceJsonRpcHttpBySpecTest.java similarity index 80% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/TraceJsonRpcHttpBySpecTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/TraceJsonRpcHttpBySpecTest.java index 3f54c25194..4123049f70 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/TraceJsonRpcHttpBySpecTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/TraceJsonRpcHttpBySpecTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc; +package org.hyperledger.besu.ethereum.api.jsonrpc; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.TraceReplayBlockTransactions; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockReplay; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockTracer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.TraceReplayBlockTransactions; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockReplay; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; import java.net.URL; import java.util.Map; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/AuthenticationUtilsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtilsTest.java similarity index 96% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/AuthenticationUtilsTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtilsTest.java index a42e4d2ba0..4b3671da81 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/AuthenticationUtilsTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtilsTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.authentication; +package org.hyperledger.besu.ethereum.api.jsonrpc.authentication; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/TomlAuthTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuthTest.java similarity index 98% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/TomlAuthTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuthTest.java index 903aadca60..9513dcc601 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/authentication/TomlAuthTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuthTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.authentication; +package org.hyperledger.besu.ethereum.api.jsonrpc.authentication; import java.net.URISyntaxException; import java.nio.file.NoSuchFileException; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/health/ReadinessCheckTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/ReadinessCheckTest.java similarity index 91% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/health/ReadinessCheckTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/ReadinessCheckTest.java index 00e0f67eef..bb1571eea9 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/health/ReadinessCheckTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/ReadinessCheckTest.java @@ -10,16 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.health; +package org.hyperledger.besu.ethereum.api.jsonrpc.health; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.HealthService.ParamSource; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.plugin.data.SyncStatus; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.plugin.data.SyncStatus; import java.util.HashMap; import java.util.Map; @@ -34,7 +33,7 @@ public class ReadinessCheckTest { private final Synchronizer synchronizer = mock(Synchronizer.class); private final Map params = new HashMap<>(); - private final ParamSource paramSource = params::get; + private final HealthService.ParamSource paramSource = params::get; private final ReadinessCheck readinessCheck = new ReadinessCheck(p2pNetwork, synchronizer); @@ -142,6 +141,6 @@ public class ReadinessCheckTest { private Optional createSyncStatus(final int currentBlock, final int highestBlock) { return Optional.of( - new tech.pegasys.pantheon.ethereum.core.SyncStatus(0, currentBlock, highestBlock)); + new org.hyperledger.besu.ethereum.core.SyncStatus(0, currentBlock, highestBlock)); } } diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/EthJsonRpcHttpServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/EthJsonRpcHttpServiceTest.java similarity index 93% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/EthJsonRpcHttpServiceTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/EthJsonRpcHttpServiceTest.java index 7fc32a47a8..4729a8764f 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/EthJsonRpcHttpServiceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/EthJsonRpcHttpServiceTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.AbstractJsonRpcHttpServiceTest; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.api.jsonrpc.AbstractJsonRpcHttpServiceTest; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; import java.io.IOException; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterIdGeneratorTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterIdGeneratorTest.java similarity index 89% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterIdGeneratorTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterIdGeneratorTest.java index 8c46f20922..e13b14a79f 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterIdGeneratorTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterIdGeneratorTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.util.uint.UInt256; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterManagerLogFilterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerLogFilterTest.java similarity index 89% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterManagerLogFilterTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerLogFilterTest.java index 7a59e48579..4db0df5a36 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterManagerLogFilterTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerLogFilterTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -23,18 +23,18 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; -import tech.pegasys.pantheon.ethereum.api.LogsQuery; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.api.LogsQuery; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterManagerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerTest.java similarity index 94% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterManagerTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerTest.java index b74ba123cb..ba0c444d15 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterManagerTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -20,14 +20,14 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; import java.util.List; import java.util.Optional; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterRepositoryTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterRepositoryTest.java similarity index 98% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterRepositoryTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterRepositoryTest.java index 0f2d401495..db4320b8dd 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterRepositoryTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterRepositoryTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterTest.java similarity index 95% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterTest.java index 71359206e8..aed9671e1e 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterTimeoutMonitorTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterTimeoutMonitorTest.java similarity index 97% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterTimeoutMonitorTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterTimeoutMonitorTest.java index e2cd1c7663..0e15642f44 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/FilterTimeoutMonitorTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterTimeoutMonitorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/LogsQueryTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/LogsQueryTest.java similarity index 98% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/LogsQueryTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/LogsQueryTest.java index 01e5825a49..b28861add9 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/filter/LogsQueryTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/LogsQueryTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.LogsQuery; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Log; -import tech.pegasys.pantheon.ethereum.core.LogTopic; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.LogsQuery; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Log; +import org.hyperledger.besu.ethereum.core.LogTopic; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminAddPeerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeerTest.java similarity index 88% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminAddPeerTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeerTest.java index 28dfc862c3..7cfce897a6 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminAddPeerTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeerTest.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.P2PDisabledException; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.P2PDisabledException; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevelTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevelTest.java similarity index 90% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevelTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevelTest.java index 154dabbb67..4bb8c10c47 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevelTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevelTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminNodeInfoTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfoTest.java similarity index 90% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminNodeInfoTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfoTest.java index ef47bf16a4..258279faf0 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminNodeInfoTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfoTest.java @@ -10,28 +10,28 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.config.GenesisConfigOptions; -import tech.pegasys.pantheon.config.StubGenesisConfigOptions; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.ChainHead; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.config.GenesisConfigOptions; +import org.hyperledger.besu.config.StubGenesisConfigOptions; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.ChainHead; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.util.Collections; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminPeersTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminPeersTest.java similarity index 74% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminPeersTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminPeersTest.java index e9b56291c2..acb9109f57 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/AdminPeersTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminPeersTest.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.MockPeerConnection; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.PeerResult; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.P2PDisabledException; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.jsonrpc.MockPeerConnection; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.PeerResult; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.P2PDisabledException; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.util.bytes.BytesValue; import java.net.InetSocketAddress; import java.util.Collection; @@ -35,6 +35,7 @@ import java.util.List; import java.util.stream.Collectors; import com.google.common.collect.Lists; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -94,7 +95,8 @@ public class AdminPeersTest { final JsonRpcResponse expectedResponse = new JsonRpcErrorResponse(request.getId(), JsonRpcError.P2P_DISABLED); - assertThat(adminPeers.response(request)).isEqualToComparingFieldByField(expectedResponse); + Assertions.assertThat(adminPeers.response(request)) + .isEqualToComparingFieldByField(expectedResponse); } private Collection peerList() { diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugMetricsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugMetricsTest.java similarity index 86% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugMetricsTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugMetricsTest.java index ceaf8e17e2..8721100519 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugMetricsTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugMetricsTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.metrics.BesuMetricCategory.PEERS; +import static org.hyperledger.besu.metrics.BesuMetricCategory.RPC; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.metrics.PantheonMetricCategory.PEERS; -import static tech.pegasys.pantheon.metrics.PantheonMetricCategory.RPC; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; -import tech.pegasys.pantheon.metrics.Observation; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.metrics.ObservableMetricsSystem; +import org.hyperledger.besu.metrics.Observation; import java.util.Collections; import java.util.stream.Stream; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAtTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAtTest.java similarity index 73% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAtTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAtTest.java index 796bae2056..9469772fdc 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAtTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAtTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; @@ -19,27 +19,25 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockReplay; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockReplay.TransactionAction; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.DebugStorageRangeAtResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.DebugStorageRangeAtResult.StorageEntry; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.AccountStorageEntry; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockReplay; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugStorageRangeAtResult; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.AccountStorageEntry; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.Collections; @@ -131,14 +129,20 @@ public class DebugStorageRangeAtTest { entries.sort(Comparator.comparing(AccountStorageEntry::getKeyHash)); assertThat(result.getStorage()) .containsExactly( - entry(entries.get(0).getKeyHash().toString(), new StorageEntry(entries.get(0), false)), - entry(entries.get(1).getKeyHash().toString(), new StorageEntry(entries.get(1), false)), - entry(entries.get(2).getKeyHash().toString(), new StorageEntry(entries.get(2), false))); + entry( + entries.get(0).getKeyHash().toString(), + new DebugStorageRangeAtResult.StorageEntry(entries.get(0), false)), + entry( + entries.get(1).getKeyHash().toString(), + new DebugStorageRangeAtResult.StorageEntry(entries.get(1), false)), + entry( + entries.get(2).getKeyHash().toString(), + new DebugStorageRangeAtResult.StorageEntry(entries.get(2), false))); } private Object callAction(final InvocationOnMock invocation) { return Optional.of( - ((TransactionAction) invocation.getArgument(2)) + ((BlockReplay.TransactionAction) invocation.getArgument(2)) .performAction(transaction, blockHeader, blockchain, worldState, transactionProcessor)); } } diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHashTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHashTest.java similarity index 78% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHashTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHashTest.java index 6bea14dd65..8fded6ff4e 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHashTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHashTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -18,18 +18,18 @@ import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockTrace; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockTracer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.TransactionTrace; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.debug.TraceFrame; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.debug.TraceFrame; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; import java.util.Collection; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumberTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumberTest.java similarity index 78% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumberTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumberTest.java index 9b04f73e24..4a08c9b3f2 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumberTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumberTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; @@ -20,20 +20,20 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockTrace; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockTracer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.TransactionTrace; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.debug.TraceFrame; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.debug.TraceFrame; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collection; import java.util.EnumSet; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockTest.java similarity index 78% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockTest.java index 8d71eab654..032df924f2 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; @@ -19,24 +19,24 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockTrace; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockTracer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.TransactionTrace; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.debug.TraceFrame; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.debug.TraceFrame; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collection; import java.util.Collections; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceTransactionTest.java similarity index 81% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceTransactionTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceTransactionTest.java index 1e9305e205..28865c4bf1 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/DebugTraceTransactionTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceTransactionTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -18,23 +18,23 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.TransactionTrace; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.TransactionTracer; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.StructLog; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.debug.TraceFrame; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor.Result; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTracer; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.StructLog; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.debug.TraceFrame; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor.Result; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collections; import java.util.EnumSet; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthBlockNumberTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlockNumberTest.java similarity index 79% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthBlockNumberTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlockNumberTest.java index 200eb4dc23..33aec6f667 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthBlockNumberTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlockNumberTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthCallTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCallTest.java similarity index 83% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthCallTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCallTest.java index d172d3d1ae..d3e3da1cb2 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthCallTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCallTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; @@ -21,19 +21,19 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; -import tech.pegasys.pantheon.ethereum.transaction.CallParameter; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulator; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulatorResult; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.ethereum.transaction.CallParameter; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthChainIdTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthChainIdTest.java similarity index 82% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthChainIdTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthChainIdTest.java index 32d26d9766..5bbc1fd30f 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthChainIdTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthChainIdTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; import java.math.BigInteger; import java.util.Optional; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthCoinbaseTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbaseTest.java similarity index 82% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthCoinbaseTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbaseTest.java index 350a1b5a37..0ea7e22e02 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthCoinbaseTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbaseTest.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.core.Address; import java.util.Optional; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java similarity index 70% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java index c7fede5522..7f39b3a231 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java @@ -10,30 +10,31 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.transaction.CallParameter; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulator; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulatorResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.transaction.CallParameter; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult; import java.util.Optional; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -75,7 +76,8 @@ public class EthEstimateGasTest { final JsonRpcResponse expectedResponse = new JsonRpcErrorResponse(null, JsonRpcError.INTERNAL_ERROR); - assertThat(method.response(request)).isEqualToComparingFieldByField(expectedResponse); + Assertions.assertThat(method.response(request)) + .isEqualToComparingFieldByField(expectedResponse); } @Test @@ -85,7 +87,8 @@ public class EthEstimateGasTest { final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, Quantity.create(1L)); - assertThat(method.response(request)).isEqualToComparingFieldByField(expectedResponse); + Assertions.assertThat(method.response(request)) + .isEqualToComparingFieldByField(expectedResponse); } private void mockTransientProcessorResultGasEstimate(final long gasEstimate) { diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java similarity index 82% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java index 795773f624..62a5d13723 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.core.Wei; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHashTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHashTest.java similarity index 86% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHashTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHashTest.java index aa212ecd80..057df560bf 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHashTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHashTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verifyNoMoreInteractions; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.BlockResultFactory; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory; +import org.hyperledger.besu.ethereum.core.Hash; import org.junit.Before; import org.junit.Rule; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetFilterChangesTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChangesTest.java similarity index 87% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetFilterChangesTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChangesTest.java index dcef142833..a970be327b 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetFilterChangesTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChangesTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; @@ -20,19 +20,19 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.LogsResult; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.LogsResult; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.stream.Collectors; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogsTest.java similarity index 80% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogsTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogsTest.java index 45d75c143e..8e62ed89dc 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogsTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogsTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; @@ -18,19 +18,19 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.LogsResult; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.LogsResult; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java similarity index 84% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java index 3fbd254618..54ddcdd8db 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyList; @@ -18,23 +18,23 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.proof.GetProofResult; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.proof.WorldStateProof; -import tech.pegasys.pantheon.ethereum.worldstate.StateTrieAccountValue; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.proof.GetProofResult; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.proof.WorldStateProof; +import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Collections; import java.util.Optional; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndexTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndexTest.java similarity index 72% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndexTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndexTest.java index cf7c67a86e..09cf885b9d 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndexTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndexTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.crypto.Hash; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCountTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCountTest.java similarity index 82% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCountTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCountTest.java index 8c797f0ccc..9a567588f8 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCountTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCountTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; import java.util.OptionalLong; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java similarity index 80% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java index d558db03f8..5652c63043 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java @@ -10,29 +10,29 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.TransactionReceiptWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionReceiptRootResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionReceiptStatusResult; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.TransactionReceiptWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionReceiptRootResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionReceiptStatusResult; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; import java.util.Collections; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java similarity index 81% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java index d2ba86149c..1f7c26c644 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java @@ -10,31 +10,31 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.BlockResult; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionTestFixture; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResult; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionTestFixture; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java similarity index 78% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java index f6e1dca66d..a7d51392bc 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java @@ -10,31 +10,31 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.BlockResult; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionTestFixture; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResult; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionTestFixture; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetWorkTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWorkTest.java similarity index 83% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetWorkTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWorkTest.java index 5686619855..aa33489bcb 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthGetWorkTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWorkTest.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import tech.pegasys.pantheon.ethereum.mainnet.DirectAcyclicGraphSeed; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolverInputs; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.mainnet.DirectAcyclicGraphSeed; +import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Optional; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthHashrateTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthHashrateTest.java similarity index 85% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthHashrateTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthHashrateTest.java index b8368e3af9..408c6482ff 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthHashrateTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthHashrateTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; import java.util.Optional; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthMiningTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMiningTest.java similarity index 86% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthMiningTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMiningTest.java index 118bdfabb6..39ec721516 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthMiningTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMiningTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilterTest.java similarity index 82% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilterTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilterTest.java index 5c61e10da2..21d2b868fc 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilterTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilterTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthNewFilterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewFilterTest.java similarity index 88% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthNewFilterTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewFilterTest.java index 0bc37e1629..1b77939703 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthNewFilterTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewFilterTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -18,16 +18,16 @@ import static org.mockito.ArgumentMatchers.refEq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.LogsQuery; -import tech.pegasys.pantheon.ethereum.api.TopicsParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.filter.FilterManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.BlockParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.FilterParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.api.LogsQuery; +import org.hyperledger.besu.ethereum.api.TopicsParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; import java.util.Arrays; import java.util.List; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthProtocolVersionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthProtocolVersionTest.java similarity index 87% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthProtocolVersionTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthProtocolVersionTest.java index ee94553353..4d248327fa 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthProtocolVersionTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthProtocolVersionTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; import java.util.HashSet; import java.util.Set; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSendRawTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransactionTest.java similarity index 88% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSendRawTransactionTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransactionTest.java index 99b7107085..2b1c29818d 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSendRawTransactionTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransactionTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -18,16 +18,16 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSendTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendTransactionTest.java similarity index 78% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSendTransactionTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendTransactionTest.java index bedb012686..6e9fc89007 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSendTransactionTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendTransactionTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSyncingTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSyncingTest.java similarity index 83% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSyncingTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSyncingTest.java index eff57bb301..7a5e4e7785 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/EthSyncingTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSyncingTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.SyncingResult; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.plugin.data.SyncStatus; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.SyncingResult; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.plugin.data.SyncStatus; import java.util.Optional; @@ -67,7 +67,7 @@ public class EthSyncingTest { public void shouldReturnExpectedValueWhenSyncStatusIsNotEmpty() { final JsonRpcRequest request = requestWithParams(); final SyncStatus expectedSyncStatus = - new tech.pegasys.pantheon.ethereum.core.SyncStatus(0, 1, 2); + new org.hyperledger.besu.ethereum.core.SyncStatus(0, 1, 2); final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(request.getId(), new SyncingResult(expectedSyncStatus)); final Optional optionalSyncStatus = Optional.of(expectedSyncStatus); diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetEnodeTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnodeTest.java similarity index 73% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetEnodeTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnodeTest.java index 400b2e41b1..f1dcea9bec 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetEnodeTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnodeTest.java @@ -10,24 +10,25 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -75,7 +76,8 @@ public class NetEnodeTest { final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(request.getId(), enodeURL.get().toString()); - assertThat(method.response(request)).isEqualToComparingFieldByField(expectedResponse); + Assertions.assertThat(method.response(request)) + .isEqualToComparingFieldByField(expectedResponse); } @Test @@ -86,7 +88,8 @@ public class NetEnodeTest { final JsonRpcResponse expectedResponse = new JsonRpcErrorResponse(request.getId(), JsonRpcError.P2P_DISABLED); - assertThat(method.response(request)).isEqualToComparingFieldByField(expectedResponse); + Assertions.assertThat(method.response(request)) + .isEqualToComparingFieldByField(expectedResponse); } @Test @@ -98,7 +101,8 @@ public class NetEnodeTest { final JsonRpcResponse expectedResponse = new JsonRpcErrorResponse(request.getId(), JsonRpcError.P2P_NETWORK_NOT_RUNNING); - assertThat(method.response(request)).isEqualToComparingFieldByField(expectedResponse); + Assertions.assertThat(method.response(request)) + .isEqualToComparingFieldByField(expectedResponse); } private JsonRpcRequest netEnodeRequest() { diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetListeningTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetListeningTest.java similarity index 75% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetListeningTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetListeningTest.java index c1376b70e5..9b3b80dc11 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetListeningTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetListeningTest.java @@ -10,18 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; import java.util.List; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,7 +48,8 @@ public class NetListeningTest { final JsonRpcRequest request = netListeningRequest(); final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, true); - assertThat(method.response(request)).isEqualToComparingFieldByField(expectedResponse); + Assertions.assertThat(method.response(request)) + .isEqualToComparingFieldByField(expectedResponse); } @Test @@ -57,7 +59,8 @@ public class NetListeningTest { final JsonRpcRequest request = netListeningRequest(); final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, false); - assertThat(method.response(request)).isEqualToComparingFieldByField(expectedResponse); + Assertions.assertThat(method.response(request)) + .isEqualToComparingFieldByField(expectedResponse); } @Test diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetVersionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetVersionTest.java similarity index 84% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetVersionTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetVersionTest.java index 9eb44e316e..c2579e557a 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/NetVersionTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetVersionTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.math.BigInteger; import java.util.Optional; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/RpcModulesTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModulesTest.java similarity index 80% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/RpcModulesTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModulesTest.java index 9af528f614..aa8404a5b9 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/RpcModulesTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModulesTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApis; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TxPoolPantheonStatisticsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuStatisticsTest.java similarity index 78% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TxPoolPantheonStatisticsTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuStatisticsTest.java index 5f245d15d8..c25b981c82 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TxPoolPantheonStatisticsTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuStatisticsTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.PendingTransactionsStatisticsResult; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions.TransactionInfo; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.PendingTransactionsStatisticsResult; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo; import com.google.common.collect.Sets; import org.junit.Before; @@ -30,16 +30,16 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) -public class TxPoolPantheonStatisticsTest { +public class TxPoolBesuStatisticsTest { @Mock private PendingTransactions pendingTransactions; - private TxPoolPantheonStatistics method; + private TxPoolBesuStatistics method; private final String JSON_RPC_VERSION = "2.0"; - private final String TXPOOL_PENDING_TRANSACTIONS_METHOD = "txpool_pantheonStatistics"; + private final String TXPOOL_PENDING_TRANSACTIONS_METHOD = "txpool_besuStatistics"; @Before public void setUp() { - method = new TxPoolPantheonStatistics(pendingTransactions); + method = new TxPoolBesuStatistics(pendingTransactions); } @Test diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TxPoolPantheonTransactionsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuTransactionsTest.java similarity index 77% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TxPoolPantheonTransactionsTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuTransactionsTest.java index 0d3e357758..c556ff33d6 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/TxPoolPantheonTransactionsTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuTransactionsTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.PendingTransactionsResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.TransactionInfoResult; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions.TransactionInfo; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.PendingTransactionsResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionInfoResult; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo; import java.time.Instant; @@ -34,18 +34,18 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) -public class TxPoolPantheonTransactionsTest { +public class TxPoolBesuTransactionsTest { @Mock private PendingTransactions pendingTransactions; - private TxPoolPantheonTransactions method; + private TxPoolBesuTransactions method; private final String JSON_RPC_VERSION = "2.0"; - private final String TXPOOL_PENDING_TRANSACTIONS_METHOD = "txpool_pantheonTransactions"; + private final String TXPOOL_PENDING_TRANSACTIONS_METHOD = "txpool_besuTransactions"; private static final String TRANSACTION_HASH = "0xbac263fb39f2a51053fb5e1e52aeb4e980fba9e151aa7e4f12eca95a697aeac9"; @Before public void setUp() { - method = new TxPoolPantheonTransactions(pendingTransactions); + method = new TxPoolBesuTransactions(pendingTransactions); } @Test diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/Web3ClientVersionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3ClientVersionTest.java similarity index 78% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/Web3ClientVersionTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3ClientVersionTest.java index db79d35a53..5e06180b44 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/Web3ClientVersionTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3ClientVersionTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; import org.junit.Test; public class Web3ClientVersionTest { - private final String CLIENT_VERSION = "pantheon/1.0.0"; + private final String CLIENT_VERSION = "besu/1.0.0"; private final String JSON_RPC_VERSION = "2.0"; private final String ETH_METHOD = "web3_clientVersion"; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/Web3Sha3Test.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3Sha3Test.java similarity index 90% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/Web3Sha3Test.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3Sha3Test.java index 72f3bfabb1..1f22c18313 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/Web3Sha3Test.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3Sha3Test.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java similarity index 80% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java index 03766516c8..34f3fd7883 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.miner; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; @@ -19,15 +19,15 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.verify; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.blockcreation.MiningCoordinator; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator; +import org.hyperledger.besu.ethereum.core.Address; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java similarity index 88% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java index 997a358b9c..85c7505d06 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.miner; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerStartTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStartTest.java similarity index 76% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerStartTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStartTest.java index 03a9dc90c2..10dbfd6ab6 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerStartTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStartTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.miner; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doThrow; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.blockcreation.CoinbaseNotSetException; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.blockcreation.CoinbaseNotSetException; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerStopTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStopTest.java similarity index 80% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerStopTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStopTest.java index 2676f89050..8096ff4423 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/miner/MinerStopTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStopTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.miner; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelistTest.java similarity index 84% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelistTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelistTest.java index ed2d5cfa5e..da96023c23 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelistTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; @@ -18,15 +18,15 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.WhitelistOperationResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.WhitelistOperationResult; import java.util.ArrayList; import java.util.Arrays; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelistTest.java similarity index 87% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelistTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelistTest.java index 0e253def9e..027561dc75 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelistTest.java @@ -10,30 +10,31 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController.NodesWhitelistResult; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController.NodesWhitelistResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.WhitelistOperationResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.WhitelistOperationResult; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import org.assertj.core.api.Assertions; import org.assertj.core.util.Lists; import org.junit.Before; import org.junit.Test; @@ -183,7 +184,8 @@ public class PermAddNodesToWhitelistTest { final JsonRpcResponse expectedResponse = new JsonRpcErrorResponse(request.getId(), JsonRpcError.NODE_WHITELIST_NOT_ENABLED); - assertThat(method.response(request)).isEqualToComparingFieldByField(expectedResponse); + Assertions.assertThat(method.response(request)) + .isEqualToComparingFieldByField(expectedResponse); } private JsonRpcRequest buildRequest(final List enodeList) { diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelistTest.java similarity index 84% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelistTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelistTest.java index baf0a3984b..2a8e9a8f19 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelistTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; import java.util.ArrayList; import java.util.Arrays; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelistTest.java similarity index 84% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelistTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelistTest.java index f28be3c1cc..e466d15e14 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelistTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.times; @@ -18,16 +18,17 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; import java.util.List; import java.util.Optional; +import org.assertj.core.api.Assertions; import org.assertj.core.util.Lists; import org.junit.Before; import org.junit.Test; @@ -100,7 +101,8 @@ public class PermGetNodesWhitelistTest { final JsonRpcResponse expectedResponse = new JsonRpcErrorResponse(request.getId(), JsonRpcError.NODE_WHITELIST_NOT_ENABLED); - assertThat(method.response(request)).isEqualToComparingFieldByField(expectedResponse); + Assertions.assertThat(method.response(request)) + .isEqualToComparingFieldByField(expectedResponse); } private JsonRpcRequest buildRequest() { diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java similarity index 81% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java index a8caaa9fd0..aca5f412f3 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; import java.util.Optional; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelistTest.java similarity index 84% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelistTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelistTest.java index 3e999466ca..5876a93a9f 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelistTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; @@ -18,15 +18,15 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.WhitelistOperationResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.WhitelistOperationResult; import java.util.ArrayList; import java.util.Arrays; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelistTest.java similarity index 87% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelistTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelistTest.java index 30ff4281ce..8e43a53f13 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelistTest.java @@ -10,30 +10,31 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.permissioning; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController.NodesWhitelistResult; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController.NodesWhitelistResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.WhitelistOperationResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.WhitelistOperationResult; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import org.assertj.core.api.Assertions; import org.assertj.core.util.Lists; import org.junit.Before; import org.junit.Test; @@ -138,7 +139,8 @@ public class PermRemoveNodesFromWhitelistTest { final JsonRpcResponse expectedResponse = new JsonRpcErrorResponse(request.getId(), JsonRpcError.NODE_WHITELIST_NOT_ENABLED); - assertThat(method.response(request)).isEqualToComparingFieldByField(expectedResponse); + Assertions.assertThat(method.response(request)) + .isEqualToComparingFieldByField(expectedResponse); } @Test diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/privacy/eea/EeaGetTransactionCountTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/privacy/eea/EeaGetTransactionCountTest.java similarity index 79% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/privacy/eea/EeaGetTransactionCountTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/privacy/eea/EeaGetTransactionCountTest.java index 9cc022a04b..139c6678d5 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/privacy/eea/EeaGetTransactionCountTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/privacy/eea/EeaGetTransactionCountTest.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.privacy.eea; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.privacy.eea; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaGetTransactionCount; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaPrivateNonceProvider; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaGetTransactionCount; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaPrivateNonceProvider; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/privacy/eea/EeaPrivateNonceProviderTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/privacy/eea/EeaPrivateNonceProviderTest.java similarity index 87% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/privacy/eea/EeaPrivateNonceProviderTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/privacy/eea/EeaPrivateNonceProviderTest.java index df39aa6b58..307216db4d 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/methods/privacy/eea/EeaPrivateNonceProviderTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/privacy/eea/EeaPrivateNonceProviderTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.privacy.eea; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.privacy.eea; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -18,14 +18,14 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.EnclaveException; -import tech.pegasys.pantheon.enclave.types.FindPrivacyGroupRequest; -import tech.pegasys.pantheon.enclave.types.PrivacyGroup; -import tech.pegasys.pantheon.enclave.types.PrivacyGroup.Type; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaPrivateNonceProvider; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionHandler; +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.EnclaveException; +import org.hyperledger.besu.enclave.types.FindPrivacyGroupRequest; +import org.hyperledger.besu.enclave.types.PrivacyGroup; +import org.hyperledger.besu.enclave.types.PrivacyGroup.Type; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaPrivateNonceProvider; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionHandler; import com.google.common.collect.Lists; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/FilterParameterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameterTest.java similarity index 97% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/FilterParameterTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameterTest.java index 8fb5168b26..a5c8bee1ff 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/parameters/FilterParameterTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameterTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.TopicsParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.TopicsParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; import java.util.Arrays; import java.util.Collections; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceiptTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceiptTest.java similarity index 84% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceiptTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceiptTest.java index a2c2990937..29fc1757fc 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceiptTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaGetTransactionReceiptTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.eea; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; @@ -20,31 +20,31 @@ import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.EnclaveException; -import tech.pegasys.pantheon.enclave.types.ReceiveRequest; -import tech.pegasys.pantheon.enclave.types.ReceiveResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionReceiptResult; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.TransactionLocation; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionStorage; -import tech.pegasys.pantheon.ethereum.privacy.Restriction; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.EnclaveException; +import org.hyperledger.besu.enclave.types.ReceiveRequest; +import org.hyperledger.besu.enclave.types.ReceiveResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionReceiptResult; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.TransactionLocation; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionStorage; +import org.hyperledger.besu.ethereum.privacy.Restriction; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; import java.util.Base64; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransactionTest.java similarity index 92% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransactionTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransactionTest.java index a12599efbd..2746138fa2 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransactionTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransactionTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.eea; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -19,22 +19,22 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionHandler; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionHandler; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.math.BigInteger; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroupTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroupTest.java similarity index 89% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroupTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroupTest.java index 04c59c8fde..8f390b53bd 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroupTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroupTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowableOfType; @@ -18,18 +18,18 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.EnclaveException; -import tech.pegasys.pantheon.enclave.types.CreatePrivacyGroupRequest; -import tech.pegasys.pantheon.enclave.types.PrivacyGroup; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.parameters.CreatePrivacyGroupParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.EnclaveException; +import org.hyperledger.besu.enclave.types.CreatePrivacyGroupRequest; +import org.hyperledger.besu.enclave.types.PrivacyGroup; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.parameters.CreatePrivacyGroupParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddressTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddressTest.java similarity index 74% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddressTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddressTest.java index 33373848e1..0458728c31 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddressTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddressTest.java @@ -10,21 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.assertj.core.api.Assertions; import org.junit.Test; public class PrivGetPrivacyPrecompileAddressTest { @@ -64,7 +65,7 @@ public class PrivGetPrivacyPrecompileAddressTest { final JsonRpcResponse response = privGetPrivacyPrecompileAddress.response(request); assertThat(response.getType()).isEqualByComparingTo(JsonRpcResponseType.ERROR); - assertThat(((JsonRpcErrorResponse) response).getError()) + Assertions.assertThat(((JsonRpcErrorResponse) response).getError()) .isEqualByComparingTo(JsonRpcError.PRIVACY_NOT_ENABLED); } } diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java similarity index 80% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java index 983669197f..095aa0bd02 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; @@ -18,28 +18,28 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.types.ReceiveRequest; -import tech.pegasys.pantheon.enclave.types.ReceiveResponse; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionGroupResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionLegacyResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionResult; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.ethereum.privacy.Restriction; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.types.ReceiveRequest; +import org.hyperledger.besu.enclave.types.ReceiveResponse; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionGroupResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionLegacyResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionResult; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.ethereum.privacy.Restriction; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.math.BigInteger; import java.util.Base64; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCountTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCountTest.java similarity index 77% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCountTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCountTest.java index 69081a4e1f..bd5fbdd69f 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCountTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCountTest.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.privacy.methods.priv; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionHandler; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionHandler; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/TransactionTracerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTracerTest.java similarity index 88% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/TransactionTracerTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTracerTest.java index 6b657eb5a1..91effbbe53 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/processor/TransactionTracerTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTracerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -18,21 +18,21 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.debug.TraceFrame; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor.Result; -import tech.pegasys.pantheon.ethereum.vm.DebugOperationTracer; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.debug.TraceFrame; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor.Result; +import org.hyperledger.besu.ethereum.vm.DebugOperationTracer; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; import java.util.Arrays; import java.util.Collections; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/queries/BlockchainQueriesTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/queries/BlockchainQueriesTest.java similarity index 94% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/queries/BlockchainQueriesTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/queries/BlockchainQueriesTest.java index c22ecf1efe..8f58645d87 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/queries/BlockchainQueriesTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/queries/BlockchainQueriesTest.java @@ -10,31 +10,31 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries; import static com.google.common.base.Preconditions.checkArgument; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; - -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; -import tech.pegasys.pantheon.ethereum.api.LogsQuery; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator.BlockOptions; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.uint.UInt256; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; + +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.api.LogsQuery; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.Arrays; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/NetworkResultTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/NetworkResultTest.java similarity index 94% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/NetworkResultTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/NetworkResultTest.java index 27dbb32a8d..9c604db236 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/internal/results/NetworkResultTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/NetworkResultTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results; +package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketConfigurationTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketConfigurationTest.java similarity index 90% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketConfigurationTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketConfigurationTest.java index 6af64dc468..e1d8803514 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketConfigurationTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketConfigurationTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.RpcApis; +import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis; import org.junit.Test; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketHostWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketHostWhitelistTest.java similarity index 94% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketHostWhitelistTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketHostWhitelistTest.java index 5760acef64..9d80ca780a 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketHostWhitelistTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketHostWhitelistTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods.WebSocketMethodsFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketMethodsFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.net.InetSocketAddress; import java.util.Arrays; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketRequestHandlerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketRequestHandlerTest.java similarity index 91% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketRequestHandlerTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketRequestHandlerTest.java index f324a82bab..e29b46bd00 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketRequestHandlerTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketRequestHandlerTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods.WebSocketRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketRpcRequest; import java.util.HashMap; import java.util.Map; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketServiceLoginTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceLoginTest.java similarity index 94% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketServiceLoginTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceLoginTest.java index bac5a29ca6..33672ce394 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketServiceLoginTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceLoginTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods.WebSocketMethodsFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketMethodsFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.net.URISyntaxException; import java.nio.file.Paths; @@ -43,6 +43,7 @@ import io.vertx.ext.jwt.JWTOptions; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -148,7 +149,7 @@ public class WebSocketServiceLoginTest { .authenticate( new JsonObject().put("jwt", token), (r) -> { - assertThat(r.succeeded()).isTrue(); + Assertions.assertThat(r.succeeded()).isTrue(); final User user = r.result(); user.isAuthorized( "noauths", diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceTest.java similarity index 93% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketServiceTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceTest.java index 104854b3c3..7400264b53 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/WebSocketServiceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods.WebSocketMethodsFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketMethodsFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.util.Arrays; import java.util.Collections; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthSubscribeIntegrationTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthSubscribeIntegrationTest.java similarity index 83% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthSubscribeIntegrationTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthSubscribeIntegrationTest.java index 53b60013bb..d368d7f760 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthSubscribeIntegrationTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthSubscribeIntegrationTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketRequestHandler; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.Subscription; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.syncing.SyncingSubscription; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketRequestHandler; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.Subscription; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.syncing.SyncingSubscription; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.util.HashMap; import java.util.List; @@ -32,6 +32,7 @@ import io.vertx.core.json.Json; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -68,7 +69,8 @@ public class EthSubscribeIntegrationTest { msg -> { final List syncingSubscriptions = getSubscriptions(); assertThat(syncingSubscriptions).hasSize(1); - assertThat(syncingSubscriptions.get(0).getConnectionId()).isEqualTo(CONNECTION_ID_1); + Assertions.assertThat(syncingSubscriptions.get(0).getConnectionId()) + .isEqualTo(CONNECTION_ID_1); async.complete(); }) .completionHandler( @@ -93,7 +95,8 @@ public class EthSubscribeIntegrationTest { msg -> { final List subscriptions = getSubscriptions(); assertThat(subscriptions).hasSize(1); - assertThat(subscriptions.get(0).getConnectionId()).isEqualTo(CONNECTION_ID_1); + Assertions.assertThat(subscriptions.get(0).getConnectionId()) + .isEqualTo(CONNECTION_ID_1); async.countDown(); vertx diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthSubscribeTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthSubscribeTest.java similarity index 78% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthSubscribeTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthSubscribeTest.java index 3c44f8af5d..f7cb65bf78 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthSubscribeTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthSubscribeTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -18,15 +18,15 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.Quantity; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; import io.vertx.core.json.Json; import org.junit.Before; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeIntegrationTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeIntegrationTest.java similarity index 88% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeIntegrationTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeIntegrationTest.java index b4ef786057..2dd78659b9 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeIntegrationTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeIntegrationTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.WebSocketRequestHandler; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketRequestHandler; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.util.HashMap; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeTest.java similarity index 80% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeTest.java index 3b8e2ff13a..91f0b93369 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -18,15 +18,15 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionNotFoundException; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.UnsubscribeRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionNotFoundException; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.UnsubscribeRequest; import io.vertx.core.json.Json; import org.junit.Before; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/WebSocketMethodsFactoryTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/WebSocketMethodsFactoryTest.java similarity index 91% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/WebSocketMethodsFactoryTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/WebSocketMethodsFactoryTest.java index 2718823d78..cbeb071ff2 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/methods/WebSocketMethodsFactoryTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/WebSocketMethodsFactoryTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; import java.util.HashMap; import java.util.Map; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java similarity index 89% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java index 872fd106ca..ee8df76495 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.FilterParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.blockheaders.NewBlockHeadersSubscription; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.logs.LogsSubscription; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.syncing.SyncingSubscription; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.blockheaders.NewBlockHeadersSubscription; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.logs.LogsSubscription; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.syncing.SyncingSubscription; import java.util.function.Function; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerSendMessageTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerSendMessageTest.java similarity index 85% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerSendMessageTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerSendMessageTest.java index 809860e754..2529d7bb8b 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerSendMessageTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerSendMessageTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription; import static junit.framework.TestCase.fail; import static org.mockito.Mockito.mock; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.JsonRpcResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.response.SubscriptionResponse; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.JsonRpcResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.response.SubscriptionResponse; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.util.UUID; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerTest.java similarity index 92% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerTest.java index 90935c1c75..883a294931 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; @@ -19,12 +19,12 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.blockheaders.NewBlockHeadersSubscription; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.UnsubscribeRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.syncing.SyncingSubscription; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.blockheaders.NewBlockHeadersSubscription; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.UnsubscribeRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.syncing.SyncingSubscription; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.util.List; import java.util.UUID; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionServiceTest.java similarity index 87% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionServiceTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionServiceTest.java index ad5fcb13b5..93ae2f9778 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionServiceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionServiceTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.blockheaders; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.blockheaders; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -20,22 +20,22 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.api.BlockWithMetadata; -import tech.pegasys.pantheon.ethereum.api.TransactionWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.BlockResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.BlockResultFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.JsonRpcResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.TransactionTestFixture; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.api.BlockWithMetadata; +import org.hyperledger.besu.ethereum.api.TransactionWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.JsonRpcResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.TransactionTestFixture; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionServiceTest.java similarity index 85% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionServiceTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionServiceTest.java index a8949925f1..7764fdbd1d 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionServiceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionServiceTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.logs; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.logs; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -20,25 +20,25 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.api.LogWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.FilterParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.TransactionReceiptWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.LogResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Log; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.core.TransactionTestFixture; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.api.LogWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.TransactionReceiptWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.LogResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Log; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.TransactionTestFixture; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Collections; @@ -49,6 +49,7 @@ import com.google.common.collect.Lists; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; @@ -81,7 +82,8 @@ public class LogsSubscriptionServiceTest { logsSubscriptionService.onBlockAdded(createBlockAddedEvent(transaction, null), blockchain); verify(subscriptionManager) - .sendMessage(eq(subscription.getSubscriptionId()), refEq(expectedLogResult)); + .sendMessage( + ArgumentMatchers.eq(subscription.getSubscriptionId()), refEq(expectedLogResult)); } @Test @@ -95,7 +97,8 @@ public class LogsSubscriptionServiceTest { logsSubscriptionService.onBlockAdded(createBlockAddedEvent(null, transaction), blockchain); verify(subscriptionManager) - .sendMessage(eq(subscription.getSubscriptionId()), refEq(expectedLogResult)); + .sendMessage( + ArgumentMatchers.eq(subscription.getSubscriptionId()), refEq(expectedLogResult)); } @Test @@ -112,7 +115,7 @@ public class LogsSubscriptionServiceTest { final int totalOfLogs = addedTransactions.size() + removedTransactions.size(); verify(subscriptionManager, times(totalOfLogs)) - .sendMessage(eq(subscription.getSubscriptionId()), any()); + .sendMessage(ArgumentMatchers.eq(subscription.getSubscriptionId()), any()); } @Test diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionServiceTest.java similarity index 86% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionServiceTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionServiceTest.java index a7a8ab18e8..3680c34ea2 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionServiceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionServiceTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.pending; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.pending; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -21,13 +21,13 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.Subscription; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.Subscription; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; import java.util.Arrays; import java.util.HashMap; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionServiceTest.java similarity index 88% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionServiceTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionServiceTest.java index 6a6b778ab3..821a6d9508 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionServiceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionServiceTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.pending; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.pending; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -20,14 +20,14 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.SimpleTestTransactionBuilder; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.Subscription; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.api.jsonrpc.SimpleTestTransactionBuilder; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.Subscription; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; import java.util.Arrays; import java.util.HashMap; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java similarity index 96% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java index 0915eb710b..c8e9578f38 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.both; @@ -18,12 +18,12 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage; -import tech.pegasys.pantheon.ethereum.api.TopicsParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.FilterParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.methods.WebSocketRpcRequest; +import org.hyperledger.besu.ethereum.api.TopicsParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketRpcRequest; import java.util.Arrays; import java.util.Collections; diff --git a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionServiceTest.java similarity index 79% rename from ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionServiceTest.java rename to ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionServiceTest.java index 3846ce46be..cfb0f3199b 100644 --- a/ethereum/api/src/test/java/tech/pegasys/pantheon/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionServiceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionServiceTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.syncing; +package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.syncing; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -18,12 +18,12 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.SyncingResult; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; -import tech.pegasys.pantheon.ethereum.core.SyncStatus; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.plugin.services.PantheonEvents.SyncStatusListener; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.SyncingResult; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager; +import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType; +import org.hyperledger.besu.ethereum.core.SyncStatus; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.plugin.services.BesuEvents.SyncStatusListener; import java.util.Collections; import java.util.List; @@ -33,6 +33,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; @@ -72,7 +73,8 @@ public class SyncingSubscriptionServiceTest { syncStatusListener.onSyncStatusChanged(syncStatus); verify(subscriptionManager) - .sendMessage(eq(subscription.getSubscriptionId()), eq(expectedSyncingResult)); + .sendMessage( + ArgumentMatchers.eq(subscription.getSubscriptionId()), eq(expectedSyncingResult)); } @Test @@ -94,6 +96,8 @@ public class SyncingSubscriptionServiceTest { syncStatusListener.onSyncStatusChanged(syncStatus); verify(subscriptionManager) - .sendMessage(eq(subscription.getSubscriptionId()), any(NotSynchronisingResult.class)); + .sendMessage( + ArgumentMatchers.eq(subscription.getSubscriptionId()), + any(NotSynchronisingResult.class)); } } diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_blockNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_blockNumber.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_blockNumber.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_blockNumber.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_call_Block8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_call_Block8.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_call_BlockLatest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_BlockLatest.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_call_BlockLatest.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_BlockLatest.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_estimateGas_contractDeploy.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_contractDeploy.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_estimateGas_contractDeploy.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_contractDeploy.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_estimateGas_noParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_noParams.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_estimateGas_noParams.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_noParams.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_estimateGas_transfer.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_transfer.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_estimateGas_transfer.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_transfer.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_gasPrice.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_gasPrice.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_gasPrice.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_gasPrice.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBalance_0x19.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_0x19.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBalance_0x19.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_0x19.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBalance_invalidAccountBlockNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_invalidAccountBlockNumber.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBalance_invalidAccountBlockNumber.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_invalidAccountBlockNumber.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBalance_invalidAccountLatest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_invalidAccountLatest.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBalance_invalidAccountLatest.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_invalidAccountLatest.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBalance_latest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_latest.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBalance_latest.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_latest.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBalance_toobig_bn.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_toobig_bn.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBalance_toobig_bn.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_toobig_bn.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBalance_without_addr.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_without_addr.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBalance_without_addr.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_without_addr.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBlockTransactionCount_byHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byHash.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBlockTransactionCount_byHash.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byHash.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBlockTransactionCount_byNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byNumber.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBlockTransactionCount_byNumber.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byNumber.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBlock_byHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHash.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBlock_byHash.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHash.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBlock_byHashInvalid.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHashInvalid.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBlock_byHashInvalid.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHashInvalid.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBlock_byNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byNumber.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBlock_byNumber.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byNumber.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBlock_byNumberInvalid.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byNumberInvalid.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBlock_byNumberInvalid.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byNumberInvalid.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBlock_wrongParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_wrongParams.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getBlock_wrongParams.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_wrongParams.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getCode.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getCode.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getCode_noCode.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode_noCode.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getCode_noCode.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode_noCode.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getLogs_matchTopic.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchTopic.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getLogs_matchTopic.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchTopic.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getStorageAt.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getStorageAt.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getStorageAt_illegalRangeGreaterThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt_illegalRangeGreaterThan.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getStorageAt_illegalRangeGreaterThan.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt_illegalRangeGreaterThan.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getTransactionCount.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionCount.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getTransactionCount.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionCount.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getTransactionReceipt.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionReceipt.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getTransactionReceipt.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionReceipt.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getTransaction_byBlockHashAndIndex.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockHashAndIndex.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getTransaction_byBlockHashAndIndex.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockHashAndIndex.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndIndex.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndIndex.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndIndex.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndIndex.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndInvalidIndex.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndInvalidIndex.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndInvalidIndex.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndInvalidIndex.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getTransaction_byHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHash.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getTransaction_byHash.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHash.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getTransaction_byHashNull.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHashNull.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_getTransaction_byHashNull.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHashNull.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_sendRawTransaction_contractCreation.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_contractCreation.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_sendRawTransaction_contractCreation.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_contractCreation.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_sendRawTransaction_messageCall.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_messageCall.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_sendRawTransaction_messageCall.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_messageCall.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_sendRawTransaction_nonceTooLow.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_nonceTooLow.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_sendRawTransaction_nonceTooLow.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_nonceTooLow.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_sendRawTransaction_transferEther.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_transferEther.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_sendRawTransaction_transferEther.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_transferEther.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_sendRawTransaction_unsignedTransaction.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_unsignedTransaction.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_sendRawTransaction_unsignedTransaction.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_unsignedTransaction.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_syncing.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_syncing.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/eth_syncing.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_syncing.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/graphql_blocks_byFrom.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byFrom.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/graphql_blocks_byFrom.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byFrom.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/graphql_blocks_byRange.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byRange.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/graphql_blocks_byRange.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byRange.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/graphql_blocks_byWrongRange.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byWrongRange.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/graphql_blocks_byWrongRange.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byWrongRange.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/graphql_pending.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_pending.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/graphql/graphql_pending.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_pending.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/debug/debug_accountRange_blockHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_accountRange_blockHash.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/debug/debug_accountRange_blockHash.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_accountRange_blockHash.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/debug/debug_accountRange_complete.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_accountRange_complete.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/debug/debug_accountRange_complete.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_accountRange_complete.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/debug/debug_accountRange_partial.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_accountRange_partial.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/debug/debug_accountRange_partial.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_accountRange_partial.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/debug/debug_storageRangeAt_blockHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_storageRangeAt_blockHash.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/debug/debug_storageRangeAt_blockHash.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_storageRangeAt_blockHash.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/debug/debug_storageRangeAt_blockNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_storageRangeAt_blockNumber.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/debug/debug_storageRangeAt_blockNumber.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_storageRangeAt_blockNumber.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/debug/debug_storageRangeAt_midBlock.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_storageRangeAt_midBlock.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/debug/debug_storageRangeAt_midBlock.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_storageRangeAt_midBlock.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_blockNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_blockNumber.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_blockNumber.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_blockNumber.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_block_8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_block_8.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_block_8.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_block_8.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_callParamsMissing_block_8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_callParamsMissing_block_8.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_callParamsMissing_block_8.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_callParamsMissing_block_8.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_earliestBlock.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_earliestBlock.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_earliestBlock.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_earliestBlock.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_gasLimitTooLow_block_8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_gasLimitTooLow_block_8.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_gasLimitTooLow_block_8.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_gasLimitTooLow_block_8.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_gasPriceTooHigh_block_8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_gasPriceTooHigh_block_8.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_gasPriceTooHigh_block_8.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_gasPriceTooHigh_block_8.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_latestBlock.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_latestBlock.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_latestBlock.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_latestBlock.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_pending.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_pending.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_pending.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_pending.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_toMissing_block_8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_toMissing_block_8.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_toMissing_block_8.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_toMissing_block_8.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_valueTooHigh_block_8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_valueTooHigh_block_8.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_call_valueTooHigh_block_8.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_valueTooHigh_block_8.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_estimateGas_contractDeploy.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_contractDeploy.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_estimateGas_contractDeploy.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_contractDeploy.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_estimateGas_insufficientGas.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_insufficientGas.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_estimateGas_insufficientGas.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_insufficientGas.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_estimateGas_noParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_noParams.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_estimateGas_noParams.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_noParams.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_estimateGas_transfer.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_transfer.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_estimateGas_transfer.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_transfer.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeGreaterThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeGreaterThan.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeGreaterThan.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeGreaterThan.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeLessThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeLessThan.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeLessThan.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeLessThan.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBalance_invalidParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_invalidParams.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBalance_invalidParams.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_invalidParams.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBalance_latest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_latest.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBalance_latest.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_latest.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBalance_pending.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_pending.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBalance_pending.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_pending.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_hashes.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_hashes.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_hashes.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_hashes.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_00.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_00.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_00.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_00.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_01.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_01.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_01.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_01.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_02.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_02.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_02.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_02.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_03.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_03.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_03.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_03.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_04.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_04.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_04.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_04.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_05.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_05.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_05.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_05.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_06.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_06.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_06.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_06.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_07.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_07.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_07.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_07.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_08.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_08.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_08.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_08.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_09.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_09.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_09.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_09.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_10.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_10.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_10.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_10.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_11.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_11.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_11.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_11.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_invalidParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_invalidParams.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_invalidParams.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_invalidParams.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_noResult.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_noResult.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_noResult.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_noResult.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_00.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_00.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_00.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_00.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_earliest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_earliest.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_earliest.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_earliest.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_illegalRangeGreaterThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_illegalRangeGreaterThan.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_illegalRangeGreaterThan.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_illegalRangeGreaterThan.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_illegalRangeLessThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_illegalRangeLessThan.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_illegalRangeLessThan.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_illegalRangeLessThan.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_invalidParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_invalidParams.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_invalidParams.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_invalidParams.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_latest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_latest.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_latest.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_latest.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_null.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_null.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_null.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_null.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeGreaterThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeGreaterThan.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeGreaterThan.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeGreaterThan.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeLessThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeLessThan.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeLessThan.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeLessThan.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getCode_invalidParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_invalidParams.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getCode_invalidParams.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_invalidParams.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getCode_noCodeLatest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_noCodeLatest.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getCode_noCodeLatest.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_noCodeLatest.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getCode_noCodeNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_noCodeNumber.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getCode_noCodeNumber.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_noCodeNumber.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getCode_pending.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_pending.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getCode_pending.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_pending.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getCode_success.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_success.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getCode_success.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_success.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getFilterChanges_FilterIdNegative.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getFilterChanges_FilterIdNegative.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getFilterChanges_FilterIdNegative.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getFilterChanges_FilterIdNegative.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getFilterChanges_FilterIdTooLong.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getFilterChanges_FilterIdTooLong.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getFilterChanges_FilterIdTooLong.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getFilterChanges_FilterIdTooLong.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getFilterChanges_NonexistentFilter.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getFilterChanges_NonexistentFilter.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getFilterChanges_NonexistentFilter.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getFilterChanges_NonexistentFilter.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getLogs_blockhash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_blockhash.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getLogs_blockhash.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_blockhash.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getLogs_blockhash_missingBlockHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_blockhash_missingBlockHash.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getLogs_blockhash_missingBlockHash.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_blockhash_missingBlockHash.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getLogs_failTopicPosition.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_failTopicPosition.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getLogs_failTopicPosition.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_failTopicPosition.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getLogs_fromBlockExceedToBlock.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_fromBlockExceedToBlock.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getLogs_fromBlockExceedToBlock.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_fromBlockExceedToBlock.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getLogs_invalidInput.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_invalidInput.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getLogs_invalidInput.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_invalidInput.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getLogs_matchTopic.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_matchTopic.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getLogs_matchTopic.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_matchTopic.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getLogs_nullParam.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_nullParam.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getLogs_nullParam.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_nullParam.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getLogs_toBlockOutOfRange.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_toBlockOutOfRange.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getLogs_toBlockOutOfRange.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_toBlockOutOfRange.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getNewFilter_addressOnly.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getNewFilter_addressOnly.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getNewFilter_addressOnly.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getNewFilter_addressOnly.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getNewFilter_emptyFilter.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getNewFilter_emptyFilter.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getNewFilter_emptyFilter.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getNewFilter_emptyFilter.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getNewFilter_invalidFilter.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getNewFilter_invalidFilter.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getNewFilter_invalidFilter.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getNewFilter_invalidFilter.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getNewFilter_topicOnly.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getNewFilter_topicOnly.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getNewFilter_topicOnly.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getNewFilter_topicOnly.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getNewFilter_validFilterLatestBlock.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getNewFilter_validFilterLatestBlock.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getNewFilter_validFilterLatestBlock.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getNewFilter_validFilterLatestBlock.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getNewFilter_validFilterWithBlockNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getNewFilter_validFilterWithBlockNumber.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getNewFilter_validFilterWithBlockNumber.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getNewFilter_validFilterWithBlockNumber.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeGreaterThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeGreaterThan.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeGreaterThan.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeGreaterThan.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeLessThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeLessThan.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeLessThan.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeLessThan.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getStorageAt_invalidParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_invalidParams.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getStorageAt_invalidParams.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_invalidParams.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getStorageAt_latest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_latest.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getStorageAt_latest.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_latest.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getStorageAt_pending.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_pending.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getStorageAt_pending.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_pending.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_00.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_00.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_00.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_00.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_01.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_01.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_01.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_01.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_02.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_02.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_02.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_02.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_intOverflow.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_intOverflow.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_intOverflow.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_intOverflow.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_00.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_00.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_00.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_00.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_01.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_01.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_01.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_01.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParams.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParams.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParams.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_null.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_null.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_null.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_null.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_wrongParamType.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_wrongParamType.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_wrongParamType.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_wrongParamType.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_00.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_00.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_00.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_00.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_01.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_01.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_01.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_01.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_earliestNull.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_earliestNull.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_earliestNull.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_earliestNull.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_invalidParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_invalidParams.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_invalidParams.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_invalidParams.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_latest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_latest.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_latest.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_latest.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_null.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_null.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_null.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_null.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_pending.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_pending.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_pending.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_pending.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_addressReceiver.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_addressReceiver.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_addressReceiver.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_addressReceiver.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_contractCreation.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_contractCreation.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_contractCreation.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_contractCreation.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidHashAndIndex.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidHashAndIndex.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidHashAndIndex.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidHashAndIndex.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidParams.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidParams.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidParams.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_null.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_null.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_null.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_null.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_typeMismatch.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_typeMismatch.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_typeMismatch.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_typeMismatch.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockNumber.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockNumber.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockNumber.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionCount_earliest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_earliest.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionCount_earliest.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_earliest.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionCount_illegalRange.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_illegalRange.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionCount_illegalRange.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_illegalRange.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionCount_latest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_latest.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionCount_latest.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_latest.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionCount_missingArgument.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_missingArgument.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionCount_missingArgument.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_missingArgument.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionCount_pending.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_pending.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionCount_pending.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_pending.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_contractAddress.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_contractAddress.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_contractAddress.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_contractAddress.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_logs.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_logs.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_logs.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_logs.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_nullContractAddress.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_nullContractAddress.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_nullContractAddress.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_nullContractAddress.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_newBlockFilter.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_newBlockFilter.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_newBlockFilter.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_newBlockFilter.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_newPendingTransactionFilter.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_newPendingTransactionFilter.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_newPendingTransactionFilter.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_newPendingTransactionFilter.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_protocolVersion.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_protocolVersion.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_protocolVersion.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_protocolVersion.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_contractCreation.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_contractCreation.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_contractCreation.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_contractCreation.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidByteValueHex.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidByteValueHex.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidByteValueHex.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidByteValueHex.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidNonceTooLow.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidNonceTooLow.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidNonceTooLow.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidNonceTooLow.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidRawTransaction.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidRawTransaction.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidRawTransaction.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidRawTransaction.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_messageCall.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_messageCall.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_messageCall.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_messageCall.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_transferEther.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_transferEther.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_transferEther.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_transferEther.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_unsignedTransaction.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_unsignedTransaction.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_unsignedTransaction.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_unsignedTransaction.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_uninstallFilter_FilterIdNegative.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_uninstallFilter_FilterIdNegative.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_uninstallFilter_FilterIdNegative.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_uninstallFilter_FilterIdNegative.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_uninstallFilter_FilterIdTooLong.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_uninstallFilter_FilterIdTooLong.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_uninstallFilter_FilterIdTooLong.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_uninstallFilter_FilterIdTooLong.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_uninstallFilter_NonexistentFilter.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_uninstallFilter_NonexistentFilter.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/eth/eth_uninstallFilter_NonexistentFilter.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_uninstallFilter_NonexistentFilter.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/chain-data/blocks.bin b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/blocks.bin similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/chain-data/blocks.bin rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/blocks.bin diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/chain-data/genesis.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/genesis.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/chain-data/genesis.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/genesis.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/chain-data/src/blocks.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/src/blocks.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/chain-data/src/blocks.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/src/blocks.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x2.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x2.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x2.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x2.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x3.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x3.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x3.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x3.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x4.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x4.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x4.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x4.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x5.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x5.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x5.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x5.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x6.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x6.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x6.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x6.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x7.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x7.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x7.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x7.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x8.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x8.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x8.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x9.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x9.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x9.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_0x9.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_latest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_latest.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_latest.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/to-implement/trace_replayBlockTransactions_latest.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x0.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x0.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x0.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x0.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x1.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x1.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x1.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x1.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x2.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x2.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x2.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x2.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x3.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x3.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x3.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x3.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x4.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x4.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x4.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x4.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x5.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x5.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x5.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x5.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x6.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x6.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x6.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x6.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x7.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x7.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x7.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x7.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x8.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x8.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x8.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x9.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x9.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x9.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_0x9.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_earliest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_earliest.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_earliest.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_earliest.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_invalidBlockParam.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_invalidBlockParam.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_invalidBlockParam.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_invalidBlockParam.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_invalidTraceOptions.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_invalidTraceOptions.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_invalidTraceOptions.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_invalidTraceOptions.json diff --git a/ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_pending.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_pending.json similarity index 100% rename from ethereum/api/src/test/resources/tech/pegasys/pantheon/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_pending.json rename to ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/trace_replayBlockTransactions_pending.json diff --git a/ethereum/blockcreation/build.gradle b/ethereum/blockcreation/build.gradle index 92352e0a04..b435692540 100644 --- a/ethereum/blockcreation/build.gradle +++ b/ethereum/blockcreation/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-blockcreation' + baseName 'besu-blockcreation' manifest { attributes( 'Specification-Title': baseName, diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractBlockCreator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreator.java similarity index 86% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractBlockCreator.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreator.java index 837f13631d..d6d20234fb 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractBlockCreator.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreator.java @@ -10,33 +10,33 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableAccount; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.ProcessableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.SealableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.mainnet.BodyValidation; -import tech.pegasys.pantheon.ethereum.mainnet.DifficultyCalculator; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockProcessor.TransactionReceiptFactory; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.blockcreation; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableAccount; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader; +import org.hyperledger.besu.ethereum.core.SealableBlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.mainnet.BodyValidation; +import org.hyperledger.besu.ethereum.mainnet.DifficultyCalculator; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockProcessor; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.util.List; @@ -197,7 +197,7 @@ public abstract class AbstractBlockCreator implements AsyncBlockCreator { final TransactionProcessor transactionProcessor = protocolSchedule.getByBlockNumber(blockNumber).getTransactionProcessor(); - final TransactionReceiptFactory transactionReceiptFactory = + final MainnetBlockProcessor.TransactionReceiptFactory transactionReceiptFactory = protocolSchedule.getByBlockNumber(blockNumber).getTransactionReceiptFactory(); final BlockTransactionSelector selector = diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractBlockScheduler.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockScheduler.java similarity index 93% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractBlockScheduler.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockScheduler.java index 71026802d4..a73c54c398 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractBlockScheduler.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockScheduler.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.time.Clock; diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMinerExecutor.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMinerExecutor.java similarity index 79% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMinerExecutor.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMinerExecutor.java index f92b660481..d3b49f044e 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMinerExecutor.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMinerExecutor.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MinedBlockObserver; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.util.Subscribers; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MinedBlockObserver; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.util.Subscribers; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; import java.util.concurrent.ExecutorService; diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMiningCoordinator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinator.java similarity index 85% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMiningCoordinator.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinator.java index 9b90972e92..2f1ae300bc 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMiningCoordinator.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinator.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedObserver; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.MinedBlockObserver; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.util.Subscribers; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.BlockAddedObserver; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.MinedBlockObserver; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.util.Subscribers; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AsyncBlockCreator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AsyncBlockCreator.java similarity index 92% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AsyncBlockCreator.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AsyncBlockCreator.java index 3ca7a3b7d3..c6570b9d9d 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AsyncBlockCreator.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AsyncBlockCreator.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; public interface AsyncBlockCreator extends BlockCreator { diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockCreator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockCreator.java similarity index 78% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockCreator.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockCreator.java index fba44b632d..8095b95062 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockCreator.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockCreator.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; import java.util.List; diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockMiner.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockMiner.java similarity index 91% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockMiner.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockMiner.java index 70f14ad492..727381c71f 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockMiner.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockMiner.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MinedBlockObserver; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.util.Subscribers; +package org.hyperledger.besu.ethereum.blockcreation; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MinedBlockObserver; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.util.Subscribers; import java.util.List; import java.util.concurrent.CancellationException; diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelector.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelector.java similarity index 86% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelector.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelector.java index 9e0318daf8..26c67cfab3 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelector.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelector.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; - -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.ProcessableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions.TransactionSelectionResult; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockProcessor.TransactionReceiptFactory; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidationParams; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; +package org.hyperledger.besu.ethereum.blockcreation; + +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionSelectionResult; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockProcessor; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator; +import org.hyperledger.besu.ethereum.vm.BlockHashLookup; import java.util.List; import java.util.concurrent.CancellationException; @@ -92,7 +92,7 @@ public class BlockTransactionSelector { private final Blockchain blockchain; private final MutableWorldState worldState; private final PendingTransactions pendingTransactions; - private final TransactionReceiptFactory transactionReceiptFactory; + private final MainnetBlockProcessor.TransactionReceiptFactory transactionReceiptFactory; private final Address miningBeneficiary; private final TransactionSelectionResults transactionSelectionResult = @@ -104,7 +104,7 @@ public class BlockTransactionSelector { final MutableWorldState worldState, final PendingTransactions pendingTransactions, final ProcessableBlockHeader processableBlockHeader, - final TransactionReceiptFactory transactionReceiptFactory, + final MainnetBlockProcessor.TransactionReceiptFactory transactionReceiptFactory, final Wei minTransactionGasPrice, final Supplier isCancelled, final Address miningBeneficiary) { @@ -191,7 +191,7 @@ public class BlockTransactionSelector { if (result .getValidationResult() .getInvalidReason() - .equals(TransactionInvalidReason.INCORRECT_NONCE)) { + .equals(TransactionValidator.TransactionInvalidReason.INCORRECT_NONCE)) { return TransactionSelectionResult.CONTINUE; } // If the transaction was invalid for any other reason, delete it, and continue. diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/CoinbaseNotSetException.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/CoinbaseNotSetException.java similarity index 93% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/CoinbaseNotSetException.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/CoinbaseNotSetException.java index 69b04f7bce..349e040d73 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/CoinbaseNotSetException.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/CoinbaseNotSetException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; public class CoinbaseNotSetException extends RuntimeException { diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/DefaultBlockScheduler.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/DefaultBlockScheduler.java similarity index 94% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/DefaultBlockScheduler.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/DefaultBlockScheduler.java index b454e73b3c..198b1b259c 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/DefaultBlockScheduler.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/DefaultBlockScheduler.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.time.Clock; import java.util.concurrent.TimeUnit; diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashBlockCreator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockCreator.java similarity index 75% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashBlockCreator.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockCreator.java index 9de3913033..fb7da245b6 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashBlockCreator.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockCreator.java @@ -10,23 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.SealableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.mainnet.EthHash; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolution; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolver; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolver.EthHashSolverJob; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolverInputs; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.util.bytes.BytesValues; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.SealableBlockHeader; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.mainnet.EthHash; +import org.hyperledger.besu.ethereum.mainnet.EthHashSolution; +import org.hyperledger.besu.ethereum.mainnet.EthHashSolver; +import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.util.Optional; @@ -67,7 +66,8 @@ public class EthHashBlockCreator extends AbstractBlockCreator { final EthHashSolverInputs workDefinition = generateNonceSolverInputs(sealableBlockHeader); final EthHashSolution solution; try { - solution = nonceSolver.solveFor(EthHashSolverJob.createFromInputs(workDefinition)); + solution = + nonceSolver.solveFor(EthHashSolver.EthHashSolverJob.createFromInputs(workDefinition)); } catch (final InterruptedException ex) { throw new CancellationException(); } catch (final ExecutionException ex) { diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashBlockMiner.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockMiner.java similarity index 79% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashBlockMiner.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockMiner.java index dc3f1d824d..69f55de090 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashBlockMiner.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockMiner.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MinedBlockObserver; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolution; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolverInputs; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MinedBlockObserver; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.EthHashSolution; +import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.util.Subscribers; import java.util.Optional; import java.util.function.Function; diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutor.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMinerExecutor.java similarity index 82% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutor.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMinerExecutor.java index 6041890cf8..44d22a21f2 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutor.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMinerExecutor.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MinedBlockObserver; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolver; -import tech.pegasys.pantheon.ethereum.mainnet.EthHasher; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MinedBlockObserver; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.mainnet.EthHashSolver; +import org.hyperledger.besu.ethereum.mainnet.EthHasher; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.util.Subscribers; import java.util.Optional; import java.util.concurrent.ExecutorService; diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMiningCoordinator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMiningCoordinator.java similarity index 84% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMiningCoordinator.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMiningCoordinator.java index 24c440e4ea..09916e8f17 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMiningCoordinator.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMiningCoordinator.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedObserver; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolution; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolverInputs; +import org.hyperledger.besu.ethereum.chain.BlockAddedObserver; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.EthHashSolution; +import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs; import java.util.Optional; diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/IncrementingNonceGenerator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/IncrementingNonceGenerator.java similarity index 95% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/IncrementingNonceGenerator.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/IncrementingNonceGenerator.java index 1dfbb3964d..aab5745c4c 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/IncrementingNonceGenerator.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/IncrementingNonceGenerator.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; import java.util.Iterator; diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/MiningCoordinator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/MiningCoordinator.java similarity index 79% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/MiningCoordinator.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/MiningCoordinator.java index e612fd2427..25ad846337 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/MiningCoordinator.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/MiningCoordinator.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolution; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolverInputs; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.mainnet.EthHashSolution; +import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/RandomNonceGenerator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/RandomNonceGenerator.java similarity index 91% rename from ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/RandomNonceGenerator.java rename to ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/RandomNonceGenerator.java index 06c6a5fcb1..030f2d32db 100644 --- a/ethereum/blockcreation/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/RandomNonceGenerator.java +++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/RandomNonceGenerator.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; -import tech.pegasys.pantheon.crypto.SecureRandomProvider; +import org.hyperledger.besu.crypto.SecureRandomProvider; import java.util.Iterator; import java.util.Random; diff --git a/ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMiningCoordinatorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinatorTest.java similarity index 90% rename from ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMiningCoordinatorTest.java rename to ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinatorTest.java index b7b5d3e648..19584aa484 100644 --- a/ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMiningCoordinatorTest.java +++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinatorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; @@ -20,13 +20,13 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; import java.util.Collections; diff --git a/ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockMinerTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/BlockMinerTest.java similarity index 87% rename from ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockMinerTest.java rename to ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/BlockMinerTest.java index a5794002cc..bdaeb9d6f0 100644 --- a/ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockMinerTest.java +++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/BlockMinerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; @@ -19,18 +19,18 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MinedBlockObserver; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.MutableProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MinedBlockObserver; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.MutableProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.util.Subscribers; import java.math.BigInteger; import java.util.Optional; diff --git a/ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelectorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelectorTest.java similarity index 82% rename from ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelectorTest.java rename to ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelectorTest.java index 17f959b250..dcb7415c95 100644 --- a/ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelectorTest.java +++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelectorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -18,40 +18,38 @@ import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldState; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.NONCE_TOO_LOW; - -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogSeries; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.ProcessableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.core.TransactionTestFixture; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetTransactionProcessor; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetTransactionProcessor.Result; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; -import tech.pegasys.pantheon.ethereum.vm.TestBlockchain; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; + +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider; +import org.hyperledger.besu.ethereum.core.LogSeries; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.TransactionTestFixture; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.ethereum.vm.TestBlockchain; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.time.Instant; @@ -60,6 +58,7 @@ import java.util.Optional; import java.util.function.Supplier; import com.google.common.collect.Lists; +import org.assertj.core.api.Assertions; import org.junit.Test; public class BlockTransactionSelectorTest { @@ -74,7 +73,7 @@ public class BlockTransactionSelectorTest { TestClock.fixed(), metricsSystem); private final Blockchain blockchain = new TestBlockchain(); - private final MutableWorldState worldState = createInMemoryWorldState(); + private final MutableWorldState worldState = InMemoryStorageProvider.createInMemoryWorldState(); private final Supplier isCancelled = () -> false; private final TransactionProcessor transactionProcessor = mock(TransactionProcessor.class); @@ -153,7 +152,7 @@ public class BlockTransactionSelectorTest { selector.buildTransactionListForBlock(); assertThat(results.getTransactions().size()).isEqualTo(1); - assertThat(results.getTransactions()).contains(transaction); + Assertions.assertThat(results.getTransactions()).contains(transaction); assertThat(results.getReceipts().size()).isEqualTo(1); assertThat(results.getCumulativeGasUsed()).isEqualTo(95L); } @@ -185,7 +184,9 @@ public class BlockTransactionSelectorTest { anyBoolean(), any())) .thenReturn( - MainnetTransactionProcessor.Result.invalid(ValidationResult.invalid(NONCE_TOO_LOW))); + MainnetTransactionProcessor.Result.invalid( + ValidationResult.invalid( + TransactionValidator.TransactionInvalidReason.NONCE_TOO_LOW))); // The block should fit 3 transactions only final ProcessableBlockHeader blockHeader = createBlockWithGasLimit(5000); @@ -258,9 +259,9 @@ public class BlockTransactionSelectorTest { assertThat(results.getCumulativeGasUsed()).isEqualTo(300); // Ensure receipts have the correct cumulative gas - assertThat(results.getReceipts().get(0).getCumulativeGasUsed()).isEqualTo(100); - assertThat(results.getReceipts().get(1).getCumulativeGasUsed()).isEqualTo(200); - assertThat(results.getReceipts().get(2).getCumulativeGasUsed()).isEqualTo(300); + Assertions.assertThat(results.getReceipts().get(0).getCumulativeGasUsed()).isEqualTo(100); + Assertions.assertThat(results.getReceipts().get(1).getCumulativeGasUsed()).isEqualTo(200); + Assertions.assertThat(results.getReceipts().get(2).getCumulativeGasUsed()).isEqualTo(300); } @Test @@ -342,8 +343,8 @@ public class BlockTransactionSelectorTest { selector.buildTransactionListForBlock(); assertThat(results.getTransactions().size()).isEqualTo(2); - assertThat(results.getTransactions().get(0)).isEqualTo(transactionsToInject.get(0)); - assertThat(results.getTransactions().get(1)).isEqualTo(transactionsToInject.get(2)); + Assertions.assertThat(results.getTransactions().get(0)).isEqualTo(transactionsToInject.get(0)); + Assertions.assertThat(results.getTransactions().get(1)).isEqualTo(transactionsToInject.get(2)); } @Test @@ -408,8 +409,8 @@ public class BlockTransactionSelectorTest { selector.buildTransactionListForBlock(); assertThat(results.getTransactions().size()).isEqualTo(2); - assertThat(results.getTransactions().get(0)).isEqualTo(transaction1); - assertThat(results.getTransactions().get(1)).isEqualTo(transaction2); + Assertions.assertThat(results.getTransactions().get(0)).isEqualTo(transaction1); + Assertions.assertThat(results.getTransactions().get(1)).isEqualTo(transaction2); assertThat(results.getTransactions().contains(transaction4)).isFalse(); assertThat(results.getTransactions().contains(transaction3)).isFalse(); } @@ -450,7 +451,7 @@ public class BlockTransactionSelectorTest { anyBoolean(), any())) .thenReturn( - Result.successful( + MainnetTransactionProcessor.Result.successful( LogSeries.empty(), 10000, BytesValue.EMPTY, ValidationResult.valid())); when(transactionProcessor.processTransaction( eq(blockchain), @@ -462,13 +463,16 @@ public class BlockTransactionSelectorTest { anyBoolean(), any())) .thenReturn( - Result.invalid( - ValidationResult.invalid(TransactionInvalidReason.EXCEEDS_BLOCK_GAS_LIMIT))); + MainnetTransactionProcessor.Result.invalid( + ValidationResult.invalid( + TransactionValidator.TransactionInvalidReason.EXCEEDS_BLOCK_GAS_LIMIT))); selector.buildTransactionListForBlock(); - assertThat(pendingTransactions.getTransactionByHash(validTransaction.hash())).isPresent(); - assertThat(pendingTransactions.getTransactionByHash(invalidTransaction.hash())).isNotPresent(); + Assertions.assertThat(pendingTransactions.getTransactionByHash(validTransaction.hash())) + .isPresent(); + Assertions.assertThat(pendingTransactions.getTransactionByHash(invalidTransaction.hash())) + .isNotPresent(); } @Test @@ -491,7 +495,9 @@ public class BlockTransactionSelectorTest { anyBoolean(), any())) .thenReturn( - Result.invalid(ValidationResult.invalid(TransactionInvalidReason.INCORRECT_NONCE))); + MainnetTransactionProcessor.Result.invalid( + ValidationResult.invalid( + TransactionValidator.TransactionInvalidReason.INCORRECT_NONCE))); final Address miningBeneficiary = AddressHelpers.ofValue(1); final BlockTransactionSelector selector = @@ -509,7 +515,8 @@ public class BlockTransactionSelectorTest { final BlockTransactionSelector.TransactionSelectionResults results = selector.buildTransactionListForBlock(); - assertThat(pendingTransactions.getTransactionByHash(futureTransaction.hash())).isPresent(); + Assertions.assertThat(pendingTransactions.getTransactionByHash(futureTransaction.hash())) + .isPresent(); assertThat(results.getTransactions().size()).isEqualTo(0); } diff --git a/ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/DefaultBlockSchedulerTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/DefaultBlockSchedulerTest.java similarity index 85% rename from ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/DefaultBlockSchedulerTest.java rename to ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/DefaultBlockSchedulerTest.java index 46684ce370..16db2d9311 100644 --- a/ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/DefaultBlockSchedulerTest.java +++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/DefaultBlockSchedulerTest.java @@ -10,15 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.blockcreation.AbstractBlockScheduler.BlockCreationTimeResult; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; import java.time.Clock; @@ -43,7 +42,8 @@ public class DefaultBlockSchedulerTest { final BlockHeaderTestFixture headerBuilder = new BlockHeaderTestFixture(); final BlockHeader parentBlock = headerBuilder.timestamp(parentTimeStamp).buildHeader(); - final BlockCreationTimeResult result = scheduler.getNextTimestamp(parentBlock); + final AbstractBlockScheduler.BlockCreationTimeResult result = + scheduler.getNextTimestamp(parentBlock); assertThat(result.getTimestampForHeader()).isEqualTo(parentTimeStamp + interBlockSeconds); assertThat(result.getMillisecondsUntilValid()).isEqualTo(0); @@ -59,7 +59,8 @@ public class DefaultBlockSchedulerTest { final BlockHeaderTestFixture headerBuilder = new BlockHeaderTestFixture(); final BlockHeader parentBlock = headerBuilder.timestamp(parentTimeStamp).buildHeader(); - final BlockCreationTimeResult result = scheduler.getNextTimestamp(parentBlock); + final AbstractBlockScheduler.BlockCreationTimeResult result = + scheduler.getNextTimestamp(parentBlock); assertThat(result.getMillisecondsUntilValid()).isEqualTo(0); } @@ -75,7 +76,8 @@ public class DefaultBlockSchedulerTest { final BlockHeaderTestFixture headerBuilder = new BlockHeaderTestFixture(); final BlockHeader parentBlock = headerBuilder.timestamp(parentTimeStamp).buildHeader(); - final BlockCreationTimeResult result = scheduler.getNextTimestamp(parentBlock); + final AbstractBlockScheduler.BlockCreationTimeResult result = + scheduler.getNextTimestamp(parentBlock); assertThat(result.getMillisecondsUntilValid()).isEqualTo(interBlockSeconds * 1000); } @@ -92,7 +94,8 @@ public class DefaultBlockSchedulerTest { final BlockHeaderTestFixture headerBuilder = new BlockHeaderTestFixture(); final BlockHeader parentBlock = headerBuilder.timestamp(parentTimeStamp).buildHeader(); - final BlockCreationTimeResult result = scheduler.getNextTimestamp(parentBlock); + final AbstractBlockScheduler.BlockCreationTimeResult result = + scheduler.getNextTimestamp(parentBlock); assertThat(result.getTimestampForHeader()).isEqualTo(secondsSinceEpoch); } diff --git a/ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashBlockCreatorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockCreatorTest.java similarity index 83% rename from ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashBlockCreatorTest.java rename to ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockCreatorTest.java index ffbac64041..91858fbd7b 100644 --- a/ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashBlockCreatorTest.java +++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockCreatorTest.java @@ -10,31 +10,31 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.ExecutionContextTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.ProcessableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolver; -import tech.pegasys.pantheon.ethereum.mainnet.EthHasher.Light; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolScheduleBuilder; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationTestUtils; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.mainnet.EthHashSolver; +import org.hyperledger.besu.ethereum.mainnet.EthHasher; +import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder; +import org.hyperledger.besu.ethereum.mainnet.ValidationTestUtils; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.io.IOException; import java.math.BigInteger; @@ -71,7 +71,8 @@ public class EthHashBlockCreatorTest { .createProtocolSchedule()) .build(); - final EthHashSolver solver = new EthHashSolver(Lists.newArrayList(BLOCK_1_NONCE), new Light()); + final EthHashSolver solver = + new EthHashSolver(Lists.newArrayList(BLOCK_1_NONCE), new EthHasher.Light()); final PendingTransactions pendingTransactions = new PendingTransactions( @@ -118,7 +119,8 @@ public class EthHashBlockCreatorTest { .createProtocolSchedule()) .build(); - final EthHashSolver solver = new EthHashSolver(Lists.newArrayList(BLOCK_1_NONCE), new Light()); + final EthHashSolver solver = + new EthHashSolver(Lists.newArrayList(BLOCK_1_NONCE), new EthHasher.Light()); final PendingTransactions pendingTransactions = new PendingTransactions( @@ -160,7 +162,8 @@ public class EthHashBlockCreatorTest { .createProtocolSchedule()) .build(); - final EthHashSolver solver = new EthHashSolver(Lists.newArrayList(BLOCK_1_NONCE), new Light()); + final EthHashSolver solver = + new EthHashSolver(Lists.newArrayList(BLOCK_1_NONCE), new EthHasher.Light()); final PendingTransactions pendingTransactions = new PendingTransactions( @@ -218,7 +221,8 @@ public class EthHashBlockCreatorTest { .createProtocolSchedule()) .build(); - final EthHashSolver solver = new EthHashSolver(Lists.newArrayList(BLOCK_1_NONCE), new Light()); + final EthHashSolver solver = + new EthHashSolver(Lists.newArrayList(BLOCK_1_NONCE), new EthHasher.Light()); final PendingTransactions pendingTransactions = new PendingTransactions( diff --git a/ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMinerExecutorTest.java similarity index 82% rename from ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutorTest.java rename to ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMinerExecutorTest.java index a67f42e5db..5fc373c1ab 100644 --- a/ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutorTest.java +++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMinerExecutorTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import tech.pegasys.pantheon.ethereum.core.MiningParameters; -import tech.pegasys.pantheon.ethereum.core.MiningParametersTestBuilder; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.ethereum.core.MiningParameters; +import org.hyperledger.besu.ethereum.core.MiningParametersTestBuilder; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.Subscribers; import java.util.concurrent.Executors; diff --git a/ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMiningCoordinatorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMiningCoordinatorTest.java similarity index 88% rename from ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMiningCoordinatorTest.java rename to ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMiningCoordinatorTest.java index c5fa8fd9e5..7d4940c312 100644 --- a/ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMiningCoordinatorTest.java +++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMiningCoordinatorTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.core.ExecutionContextTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolution; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.EthHashSolution; +import org.hyperledger.besu.util.bytes.Bytes32; import java.util.Optional; diff --git a/ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/IncrementingNonceGeneratorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/IncrementingNonceGeneratorTest.java similarity index 96% rename from ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/IncrementingNonceGeneratorTest.java rename to ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/IncrementingNonceGeneratorTest.java index 9ea20927c9..9dc2469965 100644 --- a/ethereum/blockcreation/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/IncrementingNonceGeneratorTest.java +++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/IncrementingNonceGeneratorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.blockcreation; +package org.hyperledger.besu.ethereum.blockcreation; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/core/build.gradle b/ethereum/core/build.gradle index 91dc292775..0185ca0aef 100644 --- a/ethereum/core/build.gradle +++ b/ethereum/core/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-core' + baseName 'besu-core' manifest { attributes( 'Specification-Title': baseName, @@ -88,10 +88,10 @@ task testJar (type: Jar) { } test { - exclude 'tech/pegasys/pantheon/ethereum/vm/**ReferenceTest.class' - exclude 'tech/pegasys/pantheon/ethereum/vm/blockchain/**.class' - exclude 'tech/pegasys/pantheon/ethereum/vm/generalstate/**.class' - exclude 'tech/pegasys/pantheon/ethereum/core/TransactionTest.class' + exclude 'org/hyperledger/besu/ethereum/vm/**ReferenceTest.class' + exclude 'org/hyperledger/besu/ethereum/vm/blockchain/**.class' + exclude 'org/hyperledger/besu/ethereum/vm/generalstate/**.class' + exclude 'org/hyperledger/besu/ethereum/core/TransactionTest.class' } def generateTestFiles(FileTree jsonPath, File templateFile, String pathstrip, String destination, String namePrefix) { @@ -128,9 +128,9 @@ def generateTestFiles(FileTree jsonPath, File templateFile, String pathstrip, St task blockchainReferenceTestsSetup { generateTestFiles( fileTree('../referencetests/src/test/resources/BlockchainTests'), - file("./src/test/resources/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTest.java.template"), + file("./src/test/resources/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTest.java.template"), "BlockchainTests", - "./src/test/java/tech/pegasys/pantheon/ethereum/vm/blockchain", + "./src/test/java/org/hyperledger/besu/ethereum/vm/blockchain", "BlockchainReferenceTest" ) } @@ -138,9 +138,9 @@ task blockchainReferenceTestsSetup { task generalstateReferenceTestsSetup { generateTestFiles( fileTree("../referencetests/src/test/resources/GeneralStateTests"), - file("./src/test/resources/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTest.java.template"), + file("./src/test/resources/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTest.java.template"), "GeneralStateTests", - "./src/test/java/tech/pegasys/pantheon/ethereum/vm/generalstate", + "./src/test/java/org/hyperledger/besu/ethereum/vm/generalstate", "GeneralStateReferenceTest" ) } @@ -148,19 +148,19 @@ task generalstateReferenceTestsSetup { task generalstateRegressionReferenceTestsSetup { generateTestFiles( fileTree("./src/test/resources/regressions/generalstate"), - file("./src/test/resources/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTest.java.template"), + file("./src/test/resources/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTest.java.template"), "regressions", - "./src/test/java/tech/pegasys/pantheon/ethereum/vm/generalstate", + "./src/test/java/org/hyperledger/besu/ethereum/vm/generalstate", "GeneralStateRegressionReferenceTest" ) } task cleanupReferenceTests(type: Delete) { - delete fileTree("./src/test/java/tech/pegasys/pantheon/ethereum/vm/generalstate/") { + delete fileTree("./src/test/java/org/hyperledger/besu/ethereum/vm/generalstate/") { include("**/GeneralStateReferenceTest*.java") include("**/GeneralStateRegressionReferenceTest*.java") } - delete fileTree("./src/test/java/tech/pegasys/pantheon/ethereum/vm/blockchain/") { include("**/BlockchainReferenceTest*.java") } + delete fileTree("./src/test/java/org/hyperledger/besu/ethereum/vm/blockchain/") { include("**/BlockchainReferenceTest*.java") } } clean.dependsOn(cleanupReferenceTests) @@ -181,10 +181,10 @@ task referenceTests(type: Test, dependsOn: [ } scanForTestClasses = false enableAssertions = true - include 'tech/pegasys/pantheon/ethereum/vm/**ReferenceTest.class' - include 'tech/pegasys/pantheon/ethereum/vm/blockchain/**.class' - include 'tech/pegasys/pantheon/ethereum/vm/generalstate/**.class' - include 'tech/pegasys/pantheon/ethereum/core/TransactionTest.class' + include 'org/hyperledger/besu/ethereum/vm/**ReferenceTest.class' + include 'org/hyperledger/besu/ethereum/vm/blockchain/**.class' + include 'org/hyperledger/besu/ethereum/vm/generalstate/**.class' + include 'org/hyperledger/besu/ethereum/core/TransactionTest.class' } artifacts { diff --git a/ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractIntegrationTest.java b/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractIntegrationTest.java similarity index 83% rename from ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractIntegrationTest.java rename to ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractIntegrationTest.java index 13bd6fdc10..8425a85396 100644 --- a/ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractIntegrationTest.java +++ b/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractIntegrationTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.precompiles.privacy; +package org.hyperledger.besu.ethereum.mainnet.precompiles.privacy; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; @@ -20,30 +20,30 @@ import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.orion.testutil.OrionKeyConfiguration; -import tech.pegasys.orion.testutil.OrionTestHarness; -import tech.pegasys.orion.testutil.OrionTestHarnessFactory; -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.types.SendRequest; -import tech.pegasys.pantheon.enclave.types.SendRequestLegacy; -import tech.pegasys.pantheon.enclave.types.SendResponse; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.ProcessableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.mainnet.SpuriousDragonGasCalculator; -import tech.pegasys.pantheon.ethereum.privacy.PrivateStateStorage; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionProcessor; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionStorage; -import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.OperationTracer; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.types.SendRequest; +import org.hyperledger.besu.enclave.types.SendRequestLegacy; +import org.hyperledger.besu.enclave.types.SendResponse; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.mainnet.SpuriousDragonGasCalculator; +import org.hyperledger.besu.ethereum.privacy.PrivateStateStorage; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionProcessor; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionStorage; +import org.hyperledger.besu.ethereum.vm.BlockHashLookup; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.OperationTracer; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.orion.testutil.OrionKeyConfiguration; +import org.hyperledger.orion.testutil.OrionTestHarness; +import org.hyperledger.orion.testutil.OrionTestHarnessFactory; import java.io.IOException; import java.util.Base64; diff --git a/ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/vm/EntriesFromIntegrationTest.java b/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/vm/EntriesFromIntegrationTest.java similarity index 77% rename from ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/vm/EntriesFromIntegrationTest.java rename to ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/vm/EntriesFromIntegrationTest.java index cd11e29cd5..6f97a50b64 100644 --- a/ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/vm/EntriesFromIntegrationTest.java +++ b/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/vm/EntriesFromIntegrationTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; -import tech.pegasys.pantheon.ethereum.core.AccountStorageEntry; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableAccount; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.AccountStorageEntry; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider; +import org.hyperledger.besu.ethereum.core.MutableAccount; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Map; import java.util.Random; @@ -35,7 +35,8 @@ public class EntriesFromIntegrationTest { @Test @SuppressWarnings("MathAbsoluteRandom") public void shouldCollectStateEntries() { - final MutableWorldState worldState = createInMemoryWorldStateArchive().getMutable(); + final MutableWorldState worldState = + InMemoryStorageProvider.createInMemoryWorldStateArchive().getMutable(); final WorldUpdater updater = worldState.updater(); MutableAccount account = updater.getOrCreate(Address.fromHexString("0x56")); final Map expectedValues = new TreeMap<>(); diff --git a/ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/vm/TraceTransactionIntegrationTest.java b/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/vm/TraceTransactionIntegrationTest.java similarity index 90% rename from ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/vm/TraceTransactionIntegrationTest.java rename to ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/vm/TraceTransactionIntegrationTest.java index a0cecb33d7..2f21e5c4c1 100644 --- a/ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/vm/TraceTransactionIntegrationTest.java +++ b/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/vm/TraceTransactionIntegrationTest.java @@ -10,32 +10,32 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.ExecutionContextTestFixture; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.debug.TraceFrame; -import tech.pegasys.pantheon.ethereum.debug.TraceOptions; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor.Result; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidationParams; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.debug.TraceFrame; +import org.hyperledger.besu.ethereum.debug.TraceOptions; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor.Result; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.List; import java.util.Map.Entry; diff --git a/ethereum/core/src/jmh/java/tech/pegasys/pantheon/ethereum/vm/operations/BlockHashOperationBenchmark.java b/ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperationBenchmark.java similarity index 86% rename from ethereum/core/src/jmh/java/tech/pegasys/pantheon/ethereum/vm/operations/BlockHashOperationBenchmark.java rename to ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperationBenchmark.java index 8fb6658efd..68f0ca7391 100644 --- a/ethereum/core/src/jmh/java/tech/pegasys/pantheon/ethereum/vm/operations/BlockHashOperationBenchmark.java +++ b/ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperationBenchmark.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.mainnet.ConstantinopleFixGasCalculator; -import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.mainnet.ConstantinopleFixGasCalculator; +import org.hyperledger.besu.ethereum.vm.BlockHashLookup; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; diff --git a/ethereum/core/src/jmh/java/tech/pegasys/pantheon/ethereum/vm/operations/OperationBenchmarkHelper.java b/ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/OperationBenchmarkHelper.java similarity index 82% rename from ethereum/core/src/jmh/java/tech/pegasys/pantheon/ethereum/vm/operations/OperationBenchmarkHelper.java rename to ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/OperationBenchmarkHelper.java index d511ff3f25..4e420bcf4e 100644 --- a/ethereum/core/src/jmh/java/tech/pegasys/pantheon/ethereum/vm/operations/OperationBenchmarkHelper.java +++ b/ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/OperationBenchmarkHelper.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; import static java.util.Collections.emptyList; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.ExecutionContextTestFixture; -import tech.pegasys.pantheon.ethereum.core.MessageFrameTestFixture; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBConfigurationBuilder; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.unsegmented.RocksDBKeyValueStorage; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture; +import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfigurationBuilder; +import org.hyperledger.besu.plugin.services.storage.rocksdb.unsegmented.RocksDBKeyValueStorage; +import org.hyperledger.besu.util.uint.UInt256; import java.io.IOException; import java.nio.file.Files; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/BlockValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockValidator.java similarity index 84% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/BlockValidator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockValidator.java index 2b685cf206..9b7bb3a66f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/BlockValidator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockValidator.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum; +package org.hyperledger.besu.ethereum; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; import java.util.List; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/MainnetBlockValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/MainnetBlockValidator.java similarity index 86% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/MainnetBlockValidator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/MainnetBlockValidator.java index f2880c65ae..3658b848f1 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/MainnetBlockValidator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/MainnetBlockValidator.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum; +package org.hyperledger.besu.ethereum; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.mainnet.BlockBodyValidator; -import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import tech.pegasys.pantheon.ethereum.mainnet.BlockProcessor; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.mainnet.BlockBodyValidator; +import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator; +import org.hyperledger.besu.ethereum.mainnet.BlockProcessor; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; import java.util.List; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/ProtocolContext.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/ProtocolContext.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/ProtocolContext.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/ProtocolContext.java index adfa127ad4..a977d3b28f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/ProtocolContext.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/ProtocolContext.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum; +package org.hyperledger.besu.ethereum; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.BlockchainStorage; -import tech.pegasys.pantheon.ethereum.chain.DefaultBlockchain; -import tech.pegasys.pantheon.ethereum.chain.GenesisState; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.storage.StorageProvider; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStatePreimageStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.BlockchainStorage; +import org.hyperledger.besu.ethereum.chain.DefaultBlockchain; +import org.hyperledger.besu.ethereum.chain.GenesisState; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.storage.StorageProvider; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.function.BiFunction; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/BlockAddedEvent.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockAddedEvent.java similarity index 93% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/BlockAddedEvent.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockAddedEvent.java index 13db0335c1..1ae3d323cf 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/BlockAddedEvent.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockAddedEvent.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.chain; +package org.hyperledger.besu.ethereum.chain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Transaction; import java.util.Collections; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/BlockAddedObserver.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockAddedObserver.java similarity index 93% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/BlockAddedObserver.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockAddedObserver.java index 7982803bca..49254a9ca2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/BlockAddedObserver.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockAddedObserver.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.chain; +package org.hyperledger.besu.ethereum.chain; @FunctionalInterface public interface BlockAddedObserver { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/Blockchain.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/Blockchain.java similarity index 94% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/Blockchain.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/Blockchain.java index bf6e7e1dd0..a31d2c4a4c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/Blockchain.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/Blockchain.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.chain; - -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.chain; + +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.util.uint.UInt256; import java.util.List; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/BlockchainStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockchainStorage.java similarity index 85% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/BlockchainStorage.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockchainStorage.java index 112bc70a51..f7d457291d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/BlockchainStorage.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockchainStorage.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.chain; +package org.hyperledger.besu.ethereum.chain; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Collection; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/ChainHead.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/ChainHead.java similarity index 88% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/ChainHead.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/ChainHead.java index d2993502f0..9ff602d159 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/ChainHead.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/ChainHead.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.chain; +package org.hyperledger.besu.ethereum.chain; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.uint.UInt256; /** Head of a blockchain. */ public final class ChainHead { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/DefaultBlockchain.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchain.java similarity index 95% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/DefaultBlockchain.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchain.java index 6fa08a57bb..3345b31e77 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/DefaultBlockchain.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchain.java @@ -10,25 +10,25 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.chain; +package org.hyperledger.besu.ethereum.chain; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static java.util.Collections.emptyList; import static java.util.stream.Collectors.toList; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.InvalidConfigurationException; -import tech.pegasys.pantheon.util.Subscribers; -import tech.pegasys.pantheon.util.bytes.BytesValues; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.InvalidConfigurationException; +import org.hyperledger.besu.util.Subscribers; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.Collection; @@ -72,12 +72,12 @@ public class DefaultBlockchain implements MutableBlockchain { chainHeadOmmerCount = chainHeadBody.getOmmers().size(); metricsSystem.createLongGauge( - PantheonMetricCategory.ETHEREUM, + BesuMetricCategory.ETHEREUM, "blockchain_height", "The current height of the canonical chain", this::getChainHeadBlockNumber); metricsSystem.createLongGauge( - PantheonMetricCategory.BLOCKCHAIN, + BesuMetricCategory.BLOCKCHAIN, "difficulty_total", "Total difficulty of the chainhead", () -> @@ -85,31 +85,31 @@ public class DefaultBlockchain implements MutableBlockchain { .longValue()); metricsSystem.createLongGauge( - PantheonMetricCategory.BLOCKCHAIN, + BesuMetricCategory.BLOCKCHAIN, "chain_head_timestamp", "Timestamp from the current chain head", () -> getChainHeadHeader().getTimestamp()); metricsSystem.createLongGauge( - PantheonMetricCategory.BLOCKCHAIN, + BesuMetricCategory.BLOCKCHAIN, "chain_head_gas_used", "Gas used by the current chain head block", () -> getChainHeadHeader().getGasUsed()); metricsSystem.createLongGauge( - PantheonMetricCategory.BLOCKCHAIN, + BesuMetricCategory.BLOCKCHAIN, "chain_head_gas_limit", "Block gas limit of the current chain head block", () -> getChainHeadHeader().getGasLimit()); metricsSystem.createIntegerGauge( - PantheonMetricCategory.BLOCKCHAIN, + BesuMetricCategory.BLOCKCHAIN, "chain_head_transaction_count", "Number of transactions in the current chain head block", () -> chainHeadTransactionCount); metricsSystem.createIntegerGauge( - PantheonMetricCategory.BLOCKCHAIN, + BesuMetricCategory.BLOCKCHAIN, "chain_head_ommer_count", "Number of ommers in the current chain head block", () -> chainHeadOmmerCount); diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/GenesisState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java similarity index 87% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/GenesisState.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java index ef95c61379..483ef07f7f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/GenesisState.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java @@ -10,30 +10,30 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.chain; - -import tech.pegasys.pantheon.config.GenesisAllocation; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogsBloomFilter; -import tech.pegasys.pantheon.ethereum.core.MutableAccount; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStateKeyValueStorage; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage; -import tech.pegasys.pantheon.ethereum.worldstate.DefaultMutableWorldState; -import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.chain; + +import org.hyperledger.besu.config.GenesisAllocation; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.LogsBloomFilter; +import org.hyperledger.besu.ethereum.core.MutableAccount; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage; +import org.hyperledger.besu.ethereum.worldstate.DefaultMutableWorldState; +import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.util.Collections; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/MinedBlockObserver.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/MinedBlockObserver.java similarity index 87% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/MinedBlockObserver.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/MinedBlockObserver.java index f5800975a5..3ce1cfaad1 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/MinedBlockObserver.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/MinedBlockObserver.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.chain; +package org.hyperledger.besu.ethereum.chain; -import tech.pegasys.pantheon.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Block; public interface MinedBlockObserver { void blockMined(Block block); diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/MutableBlockchain.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/MutableBlockchain.java similarity index 90% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/MutableBlockchain.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/MutableBlockchain.java index d3986fa38c..aba3f01b41 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/MutableBlockchain.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/MutableBlockchain.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.chain; +package org.hyperledger.besu.ethereum.chain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/TransactionLocation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/TransactionLocation.java similarity index 91% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/TransactionLocation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/TransactionLocation.java index 9603603152..ccc21f31e4 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/TransactionLocation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/TransactionLocation.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.chain; +package org.hyperledger.besu.ethereum.chain; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; import java.util.Objects; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AbstractWorldUpdater.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AbstractWorldUpdater.java similarity index 98% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AbstractWorldUpdater.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AbstractWorldUpdater.java index 53776729ca..411eb9e6a2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AbstractWorldUpdater.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AbstractWorldUpdater.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static com.google.common.base.Preconditions.checkNotNull; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Account.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Account.java similarity index 95% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Account.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Account.java index e8cd5ab2e6..94679a79a4 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Account.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Account.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; /** * A world state account. diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AccountState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccountState.java similarity index 96% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AccountState.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccountState.java index 78c90e57e9..b91c79eb1a 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AccountState.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccountState.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.NavigableMap; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AccountStorageEntry.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccountStorageEntry.java similarity index 95% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AccountStorageEntry.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccountStorageEntry.java index 1f0849cbcd..9e09f628e2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AccountStorageEntry.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccountStorageEntry.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Objects; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AccountTransactionOrder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccountTransactionOrder.java similarity index 98% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AccountTransactionOrder.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccountTransactionOrder.java index e87498755a..8d41d7da82 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AccountTransactionOrder.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccountTransactionOrder.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import java.util.ArrayList; import java.util.Comparator; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Address.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Address.java similarity index 93% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Address.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Address.java index a0c996a77c..122fcbbb3f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Address.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Address.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.crypto.SECP256K1.PublicKey; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.DelegatingBytesValue; +import org.hyperledger.besu.crypto.SECP256K1.PublicKey; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.DelegatingBytesValue; import com.fasterxml.jackson.annotation.JsonCreator; /** A 160-bits account address. */ public class Address extends DelegatingBytesValue - implements tech.pegasys.pantheon.plugin.data.Address { + implements org.hyperledger.besu.plugin.data.Address { public static final int SIZE = 20; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Block.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Block.java similarity index 90% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Block.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Block.java index fecb5d8a5d..daa3a7ed4e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Block.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Block.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Objects; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockBody.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockBody.java similarity index 94% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockBody.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockBody.java index a21dfc671d..0ec567d05b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockBody.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockBody.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; import java.util.Collections; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeader.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeader.java similarity index 93% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeader.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeader.java index ef63ff8bff..e94b460bd3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeader.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeader.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Objects; import java.util.function.Supplier; @@ -24,7 +24,7 @@ import com.google.common.base.Suppliers; /** A mined Ethereum block header. */ public class BlockHeader extends SealableBlockHeader - implements tech.pegasys.pantheon.plugin.data.BlockHeader { + implements org.hyperledger.besu.plugin.data.BlockHeader { public static final int MAX_EXTRA_DATA_BYTES = 32; @@ -113,7 +113,7 @@ public class BlockHeader extends SealableBlockHeader } @Override - public tech.pegasys.pantheon.plugin.data.Hash getBlockHash() { + public org.hyperledger.besu.plugin.data.Hash getBlockHash() { return hash.get(); } diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderBuilder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderBuilder.java similarity index 98% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderBuilder.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderBuilder.java index 06bf6a8040..270372fa42 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderBuilder.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderBuilder.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.time.Instant; import java.util.OptionalLong; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderFunctions.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderFunctions.java similarity index 97% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderFunctions.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderFunctions.java index f0fbc96d66..24d735af07 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderFunctions.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderFunctions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; /** * An interface for calculating pars of a {@link BlockHeader} which vary based on the consensus diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockImporter.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockImporter.java similarity index 94% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockImporter.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockImporter.java index 84df395dd2..82d4ec2db7 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockImporter.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockImporter.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Gas.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Gas.java similarity index 96% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Gas.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Gas.java index 003375b049..8c67eb35a9 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Gas.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Gas.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import javax.annotation.concurrent.Immutable; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Hash.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Hash.java similarity index 84% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Hash.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Hash.java index 5ce7cc39f7..6b9af748c7 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Hash.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Hash.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import static tech.pegasys.pantheon.crypto.Hash.keccak256; +import static org.hyperledger.besu.crypto.Hash.keccak256; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.DelegatingBytes32; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.DelegatingBytes32; import com.fasterxml.jackson.annotation.JsonCreator; /** A 32-bytes hash value as used in Ethereum blocks, that is the result of the KEC algorithm. */ -public class Hash extends DelegatingBytes32 implements tech.pegasys.pantheon.plugin.data.Hash { +public class Hash extends DelegatingBytes32 implements org.hyperledger.besu.plugin.data.Hash { public static final Hash ZERO = new Hash(Bytes32.ZERO); diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Log.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Log.java similarity index 91% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Log.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Log.java index 9438348d04..6693e3e34b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Log.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Log.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Objects; @@ -26,7 +26,7 @@ import com.google.common.collect.ImmutableList; * A log entry is a tuple of a logger’s address (the address of the contract that added the logs), a * series of 32-bytes log topics, and some number of bytes of data. */ -public class Log implements tech.pegasys.pantheon.plugin.data.Log { +public class Log implements org.hyperledger.besu.plugin.data.Log { private final Address logger; private final BytesValue data; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogSeries.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogSeries.java similarity index 94% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogSeries.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogSeries.java index 1592887ae3..548d93bad3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogSeries.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogSeries.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; import java.util.AbstractList; import java.util.ArrayList; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogTopic.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogTopic.java similarity index 87% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogTopic.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogTopic.java index 8444f676e2..f1c71926a7 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogTopic.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogTopic.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.DelegatingBytesValue; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.DelegatingBytesValue; public class LogTopic extends DelegatingBytesValue { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogsBloomFilter.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogsBloomFilter.java similarity index 92% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogsBloomFilter.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogsBloomFilter.java index 3203c74986..5fd5a61bcd 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogsBloomFilter.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogsBloomFilter.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static com.google.common.base.Preconditions.checkArgument; -import static tech.pegasys.pantheon.crypto.Hash.keccak256; +import static org.hyperledger.besu.crypto.Hash.keccak256; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.plugin.data.UnformattedData; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.plugin.data.UnformattedData; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytesValue; import java.util.Collection; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MiningParameters.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningParameters.java similarity index 96% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MiningParameters.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningParameters.java index 9aa9fafc46..9d89972ca1 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MiningParameters.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningParameters.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Objects; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableAccount.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableAccount.java similarity index 95% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableAccount.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableAccount.java index a4d98ab273..7411170145 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableAccount.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableAccount.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Map; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableWorldState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableWorldState.java similarity index 95% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableWorldState.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableWorldState.java index 1bb0cc95dc..cc3087926d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableWorldState.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableWorldState.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; public interface MutableWorldState extends WorldState, MutableWorldView { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableWorldView.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableWorldView.java similarity index 95% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableWorldView.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableWorldView.java index de452ce886..05bcc90ade 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableWorldView.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableWorldView.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; public interface MutableWorldView extends WorldView { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/ParsedExtraData.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/ParsedExtraData.java similarity index 94% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/ParsedExtraData.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/ParsedExtraData.java index 2bf8db3b75..2a7ad40582 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/ParsedExtraData.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/ParsedExtraData.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; /** * Marker interface for the classes that may be returned from {@link diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/PrivacyParameters.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/PrivacyParameters.java similarity index 91% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/PrivacyParameters.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/PrivacyParameters.java index 27453f6496..75be1d1de3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/PrivacyParameters.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/PrivacyParameters.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static java.nio.charset.StandardCharsets.UTF_8; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.privacy.PrivateStateStorage; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionStorage; -import tech.pegasys.pantheon.ethereum.storage.StorageProvider; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStatePreimageStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.privacy.PrivateStateStorage; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionStorage; +import org.hyperledger.besu.ethereum.storage.StorageProvider; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; import java.io.File; import java.io.IOException; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/ProcessableBlockHeader.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/ProcessableBlockHeader.java similarity index 95% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/ProcessableBlockHeader.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/ProcessableBlockHeader.java index 0a8a8ebc2f..97df166244 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/ProcessableBlockHeader.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/ProcessableBlockHeader.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.util.uint.UInt256; /** A block header capable of being processed. */ public class ProcessableBlockHeader { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/SealableBlockHeader.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/SealableBlockHeader.java similarity index 95% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/SealableBlockHeader.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/SealableBlockHeader.java index f376f5f4ca..dff4316858 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/SealableBlockHeader.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/SealableBlockHeader.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; /** A block header capable of being sealed. */ public class SealableBlockHeader extends ProcessableBlockHeader { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/SyncStatus.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/SyncStatus.java similarity index 92% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/SyncStatus.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/SyncStatus.java index 72596546b1..ab2e734730 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/SyncStatus.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/SyncStatus.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import java.util.Objects; -public final class SyncStatus implements tech.pegasys.pantheon.plugin.data.SyncStatus { +public final class SyncStatus implements org.hyperledger.besu.plugin.data.SyncStatus { private final long startingBlock; private final long currentBlock; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Synchronizer.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Synchronizer.java similarity index 80% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Synchronizer.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Synchronizer.java index eb2ed49400..b7356badaf 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Synchronizer.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Synchronizer.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.plugin.data.SyncStatus; -import tech.pegasys.pantheon.plugin.services.PantheonEvents; +import org.hyperledger.besu.plugin.data.SyncStatus; +import org.hyperledger.besu.plugin.services.BesuEvents; import java.util.Optional; @@ -30,7 +30,7 @@ public interface Synchronizer { */ Optional getSyncStatus(); - long observeSyncStatus(final PantheonEvents.SyncStatusListener listener); + long observeSyncStatus(final BesuEvents.SyncStatusListener listener); boolean removeObserver(long observerId); } diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Transaction.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Transaction.java similarity index 95% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Transaction.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Transaction.java index a5812818f6..921066b9cb 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Transaction.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Transaction.java @@ -10,27 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static com.google.common.base.Preconditions.checkState; -import static tech.pegasys.pantheon.crypto.Hash.keccak256; - -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; -import tech.pegasys.pantheon.util.uint.UInt256; +import static org.hyperledger.besu.crypto.Hash.keccak256; + +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.util.Objects; import java.util.Optional; /** An operation submitted by an external actor to be applied to the system. */ -public class Transaction implements tech.pegasys.pantheon.plugin.data.Transaction { +public class Transaction implements org.hyperledger.besu.plugin.data.Transaction { // Used for transactions that are not tied to a specific chain // (e.g. does not have a chain id associated with it). diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionFilter.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/TransactionFilter.java similarity index 94% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionFilter.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/TransactionFilter.java index 2fede0d089..222d028dca 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionFilter.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/TransactionFilter.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; @FunctionalInterface public interface TransactionFilter { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionReceipt.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/TransactionReceipt.java similarity index 96% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionReceipt.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/TransactionReceipt.java index d9e38b5a5a..ac1209394f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionReceipt.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/TransactionReceipt.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionReceiptType; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.mainnet.TransactionReceiptType; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Objects; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Util.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Util.java similarity index 91% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Util.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Util.java index 6a4cb11767..cf6b42b1b4 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Util.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Util.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.crypto.SECP256K1.PublicKey; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; +import org.hyperledger.besu.crypto.SECP256K1.PublicKey; +import org.hyperledger.besu.crypto.SECP256K1.Signature; public class Util { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Wei.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Wei.java similarity index 87% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Wei.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Wei.java index c2b5e6b392..9fc76163e9 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Wei.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Wei.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.BaseUInt256Value; -import tech.pegasys.pantheon.util.uint.Counter; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.BaseUInt256Value; +import org.hyperledger.besu.util.uint.Counter; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldState.java similarity index 94% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldState.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldState.java index 1538b5d1cb..effe387574 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldState.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldState.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.NavigableMap; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldUpdater.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldUpdater.java similarity index 98% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldUpdater.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldUpdater.java index 71696471c7..0b1c723463 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldUpdater.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldUpdater.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import java.util.Collection; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldView.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldView.java similarity index 95% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldView.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldView.java index c6495f6ac9..103b3c53b5 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldView.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldView.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; /** Generic interface for a view over the accounts of the world state. */ public interface WorldView { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/debug/TraceFrame.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/debug/TraceFrame.java similarity index 91% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/debug/TraceFrame.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/debug/TraceFrame.java index e74866850b..c412e534a8 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/debug/TraceFrame.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/debug/TraceFrame.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.debug; - -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.debug; + +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.EnumSet; import java.util.Map; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/debug/TraceOptions.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/debug/TraceOptions.java similarity index 96% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/debug/TraceOptions.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/debug/TraceOptions.java index 728c4821ca..d9e707c577 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/debug/TraceOptions.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/debug/TraceOptions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.debug; +package org.hyperledger.besu.ethereum.debug; public class TraceOptions { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/difficulty/fixed/FixedDifficultyCalculators.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedDifficultyCalculators.java similarity index 88% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/difficulty/fixed/FixedDifficultyCalculators.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedDifficultyCalculators.java index 0795d1d15d..3f785b5542 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/difficulty/fixed/FixedDifficultyCalculators.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedDifficultyCalculators.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.difficulty.fixed; +package org.hyperledger.besu.ethereum.difficulty.fixed; -import tech.pegasys.pantheon.config.GenesisConfigOptions; -import tech.pegasys.pantheon.ethereum.mainnet.DifficultyCalculator; +import org.hyperledger.besu.config.GenesisConfigOptions; +import org.hyperledger.besu.ethereum.mainnet.DifficultyCalculator; import java.math.BigInteger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/difficulty/fixed/FixedDifficultyProtocolSchedule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedDifficultyProtocolSchedule.java similarity index 83% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/difficulty/fixed/FixedDifficultyProtocolSchedule.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedDifficultyProtocolSchedule.java index d9df25023d..6fdc8d5a50 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/difficulty/fixed/FixedDifficultyProtocolSchedule.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedDifficultyProtocolSchedule.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.difficulty.fixed; +package org.hyperledger.besu.ethereum.difficulty.fixed; -import tech.pegasys.pantheon.config.GenesisConfigOptions; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolScheduleBuilder; +import org.hyperledger.besu.config.GenesisConfigOptions; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder; /** A ProtocolSchedule which behaves similarly to MainNet, but with a much reduced difficulty. */ public class FixedDifficultyProtocolSchedule { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AbstractMessageProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractMessageProcessor.java similarity index 93% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AbstractMessageProcessor.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractMessageProcessor.java index 801eeeff5e..d187ea651e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AbstractMessageProcessor.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractMessageProcessor.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; - -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.OperationTracer; -import tech.pegasys.pantheon.ethereum.vm.ehalt.ExceptionalHaltException; +package org.hyperledger.besu.ethereum.mainnet; + +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.OperationTracer; +import org.hyperledger.besu.ethereum.vm.ehalt.ExceptionalHaltException; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AbstractPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractPrecompiledContract.java similarity index 83% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AbstractPrecompiledContract.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractPrecompiledContract.java index ead0ed515c..2f78b37199 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AbstractPrecompiledContract.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractPrecompiledContract.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; /** Skeleton class for @{link PrecompileContract} implementations. */ public abstract class AbstractPrecompiledContract implements PrecompiledContract { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AttachedBlockHeaderValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AttachedBlockHeaderValidationRule.java similarity index 87% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AttachedBlockHeaderValidationRule.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AttachedBlockHeaderValidationRule.java index 8f78b1d926..1f8448f20b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AttachedBlockHeaderValidationRule.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AttachedBlockHeaderValidationRule.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockHeader; public interface AttachedBlockHeaderValidationRule { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockBodyValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockBodyValidator.java similarity index 88% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockBodyValidator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockBodyValidator.java index 690edbbcea..78596eddc3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockBodyValidator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockBodyValidator.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockHeaderValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockHeaderValidator.java similarity index 96% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockHeaderValidator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockHeaderValidator.java index 23d5920735..c31632500a 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockHeaderValidator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockHeaderValidator.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockProcessor.java similarity index 85% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockProcessor.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockProcessor.java index ff5d5fef41..04732a4cc4 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockProcessor.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockProcessor.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BodyValidation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BodyValidation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BodyValidation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BodyValidation.java index 523359e0a4..c8eaa03044 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BodyValidation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BodyValidation.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; - -import static tech.pegasys.pantheon.crypto.Hash.keccak256; -import static tech.pegasys.pantheon.util.bytes.BytesValues.trimLeadingZeros; - -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogsBloomFilter; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.trie.MerklePatriciaTrie; -import tech.pegasys.pantheon.ethereum.trie.SimpleMerklePatriciaTrie; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.mainnet; + +import static org.hyperledger.besu.crypto.Hash.keccak256; +import static org.hyperledger.besu.util.bytes.BytesValues.trimLeadingZeros; + +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.LogsBloomFilter; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie; +import org.hyperledger.besu.ethereum.trie.SimpleMerklePatriciaTrie; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ConstantinopleFixGasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ConstantinopleFixGasCalculator.java similarity index 91% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ConstantinopleFixGasCalculator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ConstantinopleFixGasCalculator.java index 034d84bce7..a53f9829b8 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ConstantinopleFixGasCalculator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ConstantinopleFixGasCalculator.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.util.uint.UInt256; /** * Gas Calculator for Petersberg Hard Fork. Rollback EIP-1283. diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ConstantinopleGasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ConstantinopleGasCalculator.java similarity index 92% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ConstantinopleGasCalculator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ConstantinopleGasCalculator.java index cbc7c077e6..d647ab537c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ConstantinopleGasCalculator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ConstantinopleGasCalculator.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; public class ConstantinopleGasCalculator extends SpuriousDragonGasCalculator { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ContractValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ContractValidationRule.java similarity index 87% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ContractValidationRule.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ContractValidationRule.java index 2c0c83100e..312dbeb5be 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ContractValidationRule.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ContractValidationRule.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.MessageFrame; @FunctionalInterface public interface ContractValidationRule { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/DetachedBlockHeaderValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DetachedBlockHeaderValidationRule.java similarity index 90% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/DetachedBlockHeaderValidationRule.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DetachedBlockHeaderValidationRule.java index f7aff552dd..31ebfdf7db 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/DetachedBlockHeaderValidationRule.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DetachedBlockHeaderValidationRule.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeader; public interface DetachedBlockHeaderValidationRule { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/DifficultyCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculator.java similarity index 87% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/DifficultyCalculator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculator.java index 6c518db2ab..0adb6871b0 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/DifficultyCalculator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculator.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.math.BigInteger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/DirectAcyclicGraphSeed.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DirectAcyclicGraphSeed.java similarity index 87% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/DirectAcyclicGraphSeed.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DirectAcyclicGraphSeed.java index 959816e43a..3068e1379a 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/DirectAcyclicGraphSeed.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DirectAcyclicGraphSeed.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import static tech.pegasys.pantheon.ethereum.mainnet.EthHash.EPOCH_LENGTH; +import static org.hyperledger.besu.ethereum.mainnet.EthHash.EPOCH_LENGTH; -import tech.pegasys.pantheon.crypto.Hash; -import tech.pegasys.pantheon.crypto.MessageDigestFactory; +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.crypto.MessageDigestFactory; import java.security.DigestException; import java.security.MessageDigest; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHash.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHash.java similarity index 98% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHash.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHash.java index 7c92640b0f..fd161f12b3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHash.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHash.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.SealableBlockHeader; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.core.SealableBlockHeader; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; import java.math.BigInteger; import java.nio.ByteBuffer; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashCacheFactory.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashCacheFactory.java similarity index 97% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashCacheFactory.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashCacheFactory.java index b279b63e93..f9a929fb65 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashCacheFactory.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashCacheFactory.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; import java.util.concurrent.ExecutionException; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolution.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolution.java similarity index 91% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolution.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolution.java index 342870ac26..3d82276244 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolution.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolution.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Hash; public class EthHashSolution { private final long nonce; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolver.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolver.java similarity index 95% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolver.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolver.java index 33e39b87ff..1b6fd85e92 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolver.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolver.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Arrays; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolverInputs.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolverInputs.java similarity index 92% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolverInputs.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolverInputs.java index 2f39bb9780..92ab41babf 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolverInputs.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolverInputs.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.util.uint.UInt256; public class EthHashSolverInputs { private final UInt256 target; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHasher.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHasher.java similarity index 96% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHasher.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHasher.java index d1c1dd1fee..f79755096e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHasher.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHasher.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; public interface EthHasher { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/FrontierGasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/FrontierGasCalculator.java similarity index 95% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/FrontierGasCalculator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/FrontierGasCalculator.java index f2f939b696..967b9cc9ce 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/FrontierGasCalculator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/FrontierGasCalculator.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; - -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Words; -import tech.pegasys.pantheon.ethereum.vm.operations.ExpOperation; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.mainnet; + +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Words; +import org.hyperledger.besu.ethereum.vm.operations.ExpOperation; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; public class FrontierGasCalculator implements GasCalculator { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/HeaderValidationMode.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/HeaderValidationMode.java similarity index 96% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/HeaderValidationMode.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/HeaderValidationMode.java index 7c629faf37..63d21d8f0e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/HeaderValidationMode.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/HeaderValidationMode.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; public enum HeaderValidationMode { /** No Validation. data must be pre-validated */ diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/HomesteadGasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/HomesteadGasCalculator.java similarity index 89% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/HomesteadGasCalculator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/HomesteadGasCalculator.java index 27b7352560..e862d5282f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/HomesteadGasCalculator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/HomesteadGasCalculator.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Gas; public class HomesteadGasCalculator extends FrontierGasCalculator { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/IstanbulGasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/IstanbulGasCalculator.java similarity index 93% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/IstanbulGasCalculator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/IstanbulGasCalculator.java index 8a4f353e08..5cc824df30 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/IstanbulGasCalculator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/IstanbulGasCalculator.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; public class IstanbulGasCalculator extends ConstantinopleFixGasCalculator { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockBodyValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockBodyValidator.java similarity index 93% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockBodyValidator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockBodyValidator.java index 7606055485..dbb0fef4d3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockBodyValidator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockBodyValidator.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogsBloomFilter; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.util.bytes.Bytes32; +package org.hyperledger.besu.ethereum.mainnet; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.LogsBloomFilter; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.util.bytes.Bytes32; import java.util.HashSet; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderFunctions.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderFunctions.java similarity index 74% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderFunctions.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderFunctions.java index accf7b44d8..971611c83f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderFunctions.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderFunctions.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.ParsedExtraData; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.ParsedExtraData; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.BytesValue; /** Implements the block hashing algorithm for MainNet as per the yellow paper. */ public class MainnetBlockHeaderFunctions implements BlockHeaderFunctions { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidator.java similarity index 74% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderValidator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidator.java index 0b4cbb33ae..22f1a7263d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderValidator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidator.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.AncestryValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.CalculatedDifficultyValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.ConstantFieldValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.ExtraDataMaxLengthValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.GasUsageValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.ProofOfWorkValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.TimestampBoundedByFutureParameter; -import tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules.TimestampMoreRecentThanParent; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.AncestryValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.CalculatedDifficultyValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.ConstantFieldValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.ExtraDataMaxLengthValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasUsageValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.ProofOfWorkValidationRule; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampBoundedByFutureParameter; +import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampMoreRecentThanParent; +import org.hyperledger.besu.util.bytes.BytesValue; public final class MainnetBlockHeaderValidator { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockImporter.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockImporter.java similarity index 79% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockImporter.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockImporter.java index 7be5dd12b7..a8d0d24ce8 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockImporter.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockImporter.java @@ -10,15 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.BlockValidator; -import tech.pegasys.pantheon.ethereum.BlockValidator.BlockProcessingOutputs; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.BlockValidator; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; import java.util.List; import java.util.Optional; @@ -41,7 +40,7 @@ public class MainnetBlockImporter implements BlockImporter { return true; } - final Optional outputs = + final Optional outputs = blockValidator.validateAndProcessBlock( context, block, headerValidationMode, ommerValidationMode); @@ -51,7 +50,7 @@ public class MainnetBlockImporter implements BlockImporter { } private void persistState( - final BlockProcessingOutputs processingOutputs, + final BlockValidator.BlockProcessingOutputs processingOutputs, final Block block, final ProtocolContext context) { processingOutputs.worldState.persist(); diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockProcessor.java similarity index 89% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockProcessor.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockProcessor.java index 3c6588e3b6..783dcbbf8c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockProcessor.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockProcessor.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; - -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.MutableAccount; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.ProcessableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; +package org.hyperledger.besu.ethereum.mainnet; + +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.MutableAccount; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.vm.BlockHashLookup; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetContractCreationProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetContractCreationProcessor.java similarity index 92% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetContractCreationProcessor.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetContractCreationProcessor.java index 99b5dbe3e6..1f2b8853f3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetContractCreationProcessor.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetContractCreationProcessor.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; - -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.MutableAccount; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.mainnet; + +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.MutableAccount; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collection; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetDifficultyCalculators.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetDifficultyCalculators.java similarity index 96% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetDifficultyCalculators.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetDifficultyCalculators.java index e9e87aa5b7..2774bdea01 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetDifficultyCalculators.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetDifficultyCalculators.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetEvmRegistries.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetEvmRegistries.java similarity index 64% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetEvmRegistries.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetEvmRegistries.java index ee4006e1f4..755a788dc3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetEvmRegistries.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetEvmRegistries.java @@ -10,91 +10,91 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.OperationRegistry; -import tech.pegasys.pantheon.ethereum.vm.operations.AddModOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.AddOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.AddressOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.AndOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.BalanceOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.BlockHashOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.ByteOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.CallCodeOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.CallDataCopyOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.CallDataLoadOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.CallDataSizeOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.CallOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.CallValueOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.CallerOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.ChainIdOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.CodeCopyOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.CodeSizeOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.CoinbaseOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.Create2Operation; -import tech.pegasys.pantheon.ethereum.vm.operations.CreateOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.DelegateCallOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.DifficultyOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.DivOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.DupOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.EqOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.ExpOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.ExtCodeCopyOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.ExtCodeHashOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.ExtCodeSizeOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.GasLimitOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.GasOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.GasPriceOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.GtOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.InvalidOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.IsZeroOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.JumpDestOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.JumpOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.JumpiOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.LogOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.LtOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.MLoadOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.MSizeOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.MStore8Operation; -import tech.pegasys.pantheon.ethereum.vm.operations.MStoreOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.ModOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.MulModOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.MulOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.NotOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.NumberOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.OrOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.OriginOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.PCOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.PopOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.PushOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.ReturnDataCopyOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.ReturnDataSizeOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.ReturnOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.RevertOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.SDivOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.SGtOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.SLoadOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.SLtOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.SModOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.SStoreOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.SarOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.SelfBalanceOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.SelfDestructOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.Sha3Operation; -import tech.pegasys.pantheon.ethereum.vm.operations.ShlOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.ShrOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.SignExtendOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.StaticCallOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.StopOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.SubOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.SwapOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.TimestampOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.XorOperation; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.OperationRegistry; +import org.hyperledger.besu.ethereum.vm.operations.AddModOperation; +import org.hyperledger.besu.ethereum.vm.operations.AddOperation; +import org.hyperledger.besu.ethereum.vm.operations.AddressOperation; +import org.hyperledger.besu.ethereum.vm.operations.AndOperation; +import org.hyperledger.besu.ethereum.vm.operations.BalanceOperation; +import org.hyperledger.besu.ethereum.vm.operations.BlockHashOperation; +import org.hyperledger.besu.ethereum.vm.operations.ByteOperation; +import org.hyperledger.besu.ethereum.vm.operations.CallCodeOperation; +import org.hyperledger.besu.ethereum.vm.operations.CallDataCopyOperation; +import org.hyperledger.besu.ethereum.vm.operations.CallDataLoadOperation; +import org.hyperledger.besu.ethereum.vm.operations.CallDataSizeOperation; +import org.hyperledger.besu.ethereum.vm.operations.CallOperation; +import org.hyperledger.besu.ethereum.vm.operations.CallValueOperation; +import org.hyperledger.besu.ethereum.vm.operations.CallerOperation; +import org.hyperledger.besu.ethereum.vm.operations.ChainIdOperation; +import org.hyperledger.besu.ethereum.vm.operations.CodeCopyOperation; +import org.hyperledger.besu.ethereum.vm.operations.CodeSizeOperation; +import org.hyperledger.besu.ethereum.vm.operations.CoinbaseOperation; +import org.hyperledger.besu.ethereum.vm.operations.Create2Operation; +import org.hyperledger.besu.ethereum.vm.operations.CreateOperation; +import org.hyperledger.besu.ethereum.vm.operations.DelegateCallOperation; +import org.hyperledger.besu.ethereum.vm.operations.DifficultyOperation; +import org.hyperledger.besu.ethereum.vm.operations.DivOperation; +import org.hyperledger.besu.ethereum.vm.operations.DupOperation; +import org.hyperledger.besu.ethereum.vm.operations.EqOperation; +import org.hyperledger.besu.ethereum.vm.operations.ExpOperation; +import org.hyperledger.besu.ethereum.vm.operations.ExtCodeCopyOperation; +import org.hyperledger.besu.ethereum.vm.operations.ExtCodeHashOperation; +import org.hyperledger.besu.ethereum.vm.operations.ExtCodeSizeOperation; +import org.hyperledger.besu.ethereum.vm.operations.GasLimitOperation; +import org.hyperledger.besu.ethereum.vm.operations.GasOperation; +import org.hyperledger.besu.ethereum.vm.operations.GasPriceOperation; +import org.hyperledger.besu.ethereum.vm.operations.GtOperation; +import org.hyperledger.besu.ethereum.vm.operations.InvalidOperation; +import org.hyperledger.besu.ethereum.vm.operations.IsZeroOperation; +import org.hyperledger.besu.ethereum.vm.operations.JumpDestOperation; +import org.hyperledger.besu.ethereum.vm.operations.JumpOperation; +import org.hyperledger.besu.ethereum.vm.operations.JumpiOperation; +import org.hyperledger.besu.ethereum.vm.operations.LogOperation; +import org.hyperledger.besu.ethereum.vm.operations.LtOperation; +import org.hyperledger.besu.ethereum.vm.operations.MLoadOperation; +import org.hyperledger.besu.ethereum.vm.operations.MSizeOperation; +import org.hyperledger.besu.ethereum.vm.operations.MStore8Operation; +import org.hyperledger.besu.ethereum.vm.operations.MStoreOperation; +import org.hyperledger.besu.ethereum.vm.operations.ModOperation; +import org.hyperledger.besu.ethereum.vm.operations.MulModOperation; +import org.hyperledger.besu.ethereum.vm.operations.MulOperation; +import org.hyperledger.besu.ethereum.vm.operations.NotOperation; +import org.hyperledger.besu.ethereum.vm.operations.NumberOperation; +import org.hyperledger.besu.ethereum.vm.operations.OrOperation; +import org.hyperledger.besu.ethereum.vm.operations.OriginOperation; +import org.hyperledger.besu.ethereum.vm.operations.PCOperation; +import org.hyperledger.besu.ethereum.vm.operations.PopOperation; +import org.hyperledger.besu.ethereum.vm.operations.PushOperation; +import org.hyperledger.besu.ethereum.vm.operations.ReturnDataCopyOperation; +import org.hyperledger.besu.ethereum.vm.operations.ReturnDataSizeOperation; +import org.hyperledger.besu.ethereum.vm.operations.ReturnOperation; +import org.hyperledger.besu.ethereum.vm.operations.RevertOperation; +import org.hyperledger.besu.ethereum.vm.operations.SDivOperation; +import org.hyperledger.besu.ethereum.vm.operations.SGtOperation; +import org.hyperledger.besu.ethereum.vm.operations.SLoadOperation; +import org.hyperledger.besu.ethereum.vm.operations.SLtOperation; +import org.hyperledger.besu.ethereum.vm.operations.SModOperation; +import org.hyperledger.besu.ethereum.vm.operations.SStoreOperation; +import org.hyperledger.besu.ethereum.vm.operations.SarOperation; +import org.hyperledger.besu.ethereum.vm.operations.SelfBalanceOperation; +import org.hyperledger.besu.ethereum.vm.operations.SelfDestructOperation; +import org.hyperledger.besu.ethereum.vm.operations.Sha3Operation; +import org.hyperledger.besu.ethereum.vm.operations.ShlOperation; +import org.hyperledger.besu.ethereum.vm.operations.ShrOperation; +import org.hyperledger.besu.ethereum.vm.operations.SignExtendOperation; +import org.hyperledger.besu.ethereum.vm.operations.StaticCallOperation; +import org.hyperledger.besu.ethereum.vm.operations.StopOperation; +import org.hyperledger.besu.ethereum.vm.operations.SubOperation; +import org.hyperledger.besu.ethereum.vm.operations.SwapOperation; +import org.hyperledger.besu.ethereum.vm.operations.TimestampOperation; +import org.hyperledger.besu.ethereum.vm.operations.XorOperation; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetMessageCallProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetMessageCallProcessor.java similarity index 92% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetMessageCallProcessor.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetMessageCallProcessor.java index bddc43f408..f776ffb37c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetMessageCallProcessor.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetMessageCallProcessor.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.MutableAccount; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.MutableAccount; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collection; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetPrecompiledContractRegistries.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java similarity index 81% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetPrecompiledContractRegistries.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java index 484c9ec645..12d699a3f1 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetPrecompiledContractRegistries.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.mainnet.precompiles.AltBN128AddPrecompiledContract; -import tech.pegasys.pantheon.ethereum.mainnet.precompiles.AltBN128MulPrecompiledContract; -import tech.pegasys.pantheon.ethereum.mainnet.precompiles.AltBN128PairingPrecompiledContract; -import tech.pegasys.pantheon.ethereum.mainnet.precompiles.BLAKE2BFPrecompileContract; -import tech.pegasys.pantheon.ethereum.mainnet.precompiles.BigIntegerModularExponentiationPrecompiledContract; -import tech.pegasys.pantheon.ethereum.mainnet.precompiles.ECRECPrecompiledContract; -import tech.pegasys.pantheon.ethereum.mainnet.precompiles.IDPrecompiledContract; -import tech.pegasys.pantheon.ethereum.mainnet.precompiles.RIPEMD160PrecompiledContract; -import tech.pegasys.pantheon.ethereum.mainnet.precompiles.SHA256PrecompiledContract; -import tech.pegasys.pantheon.ethereum.mainnet.precompiles.privacy.PrivacyPrecompiledContract; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.mainnet.precompiles.AltBN128AddPrecompiledContract; +import org.hyperledger.besu.ethereum.mainnet.precompiles.AltBN128MulPrecompiledContract; +import org.hyperledger.besu.ethereum.mainnet.precompiles.AltBN128PairingPrecompiledContract; +import org.hyperledger.besu.ethereum.mainnet.precompiles.BLAKE2BFPrecompileContract; +import org.hyperledger.besu.ethereum.mainnet.precompiles.BigIntegerModularExponentiationPrecompiledContract; +import org.hyperledger.besu.ethereum.mainnet.precompiles.ECRECPrecompiledContract; +import org.hyperledger.besu.ethereum.mainnet.precompiles.IDPrecompiledContract; +import org.hyperledger.besu.ethereum.mainnet.precompiles.RIPEMD160PrecompiledContract; +import org.hyperledger.besu.ethereum.mainnet.precompiles.SHA256PrecompiledContract; +import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.PrivacyPrecompiledContract; +import org.hyperledger.besu.ethereum.vm.GasCalculator; /** Provides the various precompiled contracts used on mainnet hard forks. */ public abstract class MainnetPrecompiledContractRegistries { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolSchedule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSchedule.java similarity index 88% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolSchedule.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSchedule.java index 181203303f..5c97eb09c2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolSchedule.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSchedule.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.config.GenesisConfigOptions; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.difficulty.fixed.FixedDifficultyCalculators; -import tech.pegasys.pantheon.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.config.GenesisConfigOptions; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.difficulty.fixed.FixedDifficultyCalculators; +import org.hyperledger.besu.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule; import java.math.BigInteger; import java.util.function.Function; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolSpecs.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java similarity index 92% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolSpecs.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java index 7294659b00..9cb09ab7c6 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolSpecs.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java @@ -10,25 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; - -import static tech.pegasys.pantheon.ethereum.vm.MessageFrame.DEFAULT_MAX_STACK_SIZE; - -import tech.pegasys.pantheon.ethereum.MainnetBlockValidator; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.MutableAccount; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.mainnet.contractvalidation.MaxCodeSizeRule; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionProcessor; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionValidator; +package org.hyperledger.besu.ethereum.mainnet; + +import org.hyperledger.besu.ethereum.MainnetBlockValidator; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.MutableAccount; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.mainnet.contractvalidation.MaxCodeSizeRule; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionProcessor; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionValidator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; import java.io.IOException; import java.math.BigInteger; @@ -71,7 +70,7 @@ public abstract class MainnetProtocolSpecs { public static ProtocolSpecBuilder frontierDefinition( final OptionalInt configContractSizeLimit, final OptionalInt configStackSizeLimit) { final int contractSizeLimit = configContractSizeLimit.orElse(FRONTIER_CONTRACT_SIZE_LIMIT); - final int stackSizeLimit = configStackSizeLimit.orElse(DEFAULT_MAX_STACK_SIZE); + final int stackSizeLimit = configStackSizeLimit.orElse(MessageFrame.DEFAULT_MAX_STACK_SIZE); return new ProtocolSpecBuilder() .gasCalculator(FrontierGasCalculator::new) .evmBuilder(MainnetEvmRegistries::frontier) @@ -191,7 +190,7 @@ public abstract class MainnetProtocolSpecs { final OptionalInt configStackSizeLimit) { final int contractSizeLimit = configContractSizeLimit.orElse(SPURIOUS_DRAGON_CONTRACT_SIZE_LIMIT); - final int stackSizeLimit = configStackSizeLimit.orElse(DEFAULT_MAX_STACK_SIZE); + final int stackSizeLimit = configStackSizeLimit.orElse(MessageFrame.DEFAULT_MAX_STACK_SIZE); return tangerineWhistleDefinition(OptionalInt.empty(), configStackSizeLimit) .gasCalculator(SpuriousDragonGasCalculator::new) @@ -234,7 +233,7 @@ public abstract class MainnetProtocolSpecs { final OptionalInt contractSizeLimit, final OptionalInt configStackSizeLimit, final boolean enableRevertReason) { - final int stackSizeLimit = configStackSizeLimit.orElse(DEFAULT_MAX_STACK_SIZE); + final int stackSizeLimit = configStackSizeLimit.orElse(MessageFrame.DEFAULT_MAX_STACK_SIZE); return spuriousDragonDefinition(chainId, contractSizeLimit, configStackSizeLimit) .evmBuilder(MainnetEvmRegistries::byzantium) .precompileContractRegistryBuilder(MainnetPrecompiledContractRegistries::byzantium) diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java similarity index 88% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionProcessor.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java index cc7d65d76e..171c352f63 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionProcessor.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java @@ -10,25 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; - -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.LogSeries; -import tech.pegasys.pantheon.ethereum.core.MutableAccount; -import tech.pegasys.pantheon.ethereum.core.ProcessableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; -import tech.pegasys.pantheon.ethereum.vm.Code; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.OperationTracer; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.mainnet; + +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.LogSeries; +import org.hyperledger.besu.ethereum.core.MutableAccount; +import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.vm.BlockHashLookup; +import org.hyperledger.besu.ethereum.vm.Code; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.OperationTracer; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayDeque; import java.util.Deque; @@ -63,11 +62,11 @@ public class MainnetTransactionProcessor implements TransactionProcessor { private final BytesValue output; - private final ValidationResult validationResult; + private final ValidationResult validationResult; private final Optional revertReason; public static Result invalid( - final ValidationResult validationResult) { + final ValidationResult validationResult) { return new Result( Status.INVALID, LogSeries.empty(), @@ -79,7 +78,7 @@ public class MainnetTransactionProcessor implements TransactionProcessor { public static Result failed( final long gasRemaining, - final ValidationResult validationResult, + final ValidationResult validationResult, final Optional revertReason) { return new Result( Status.FAILED, @@ -94,7 +93,7 @@ public class MainnetTransactionProcessor implements TransactionProcessor { final LogSeries logs, final long gasRemaining, final BytesValue output, - final ValidationResult validationResult) { + final ValidationResult validationResult) { return new Result( Status.SUCCESSFUL, logs, gasRemaining, output, validationResult, Optional.empty()); } @@ -104,7 +103,7 @@ public class MainnetTransactionProcessor implements TransactionProcessor { final LogSeries logs, final long gasRemaining, final BytesValue output, - final ValidationResult validationResult, + final ValidationResult validationResult, final Optional revertReason) { this.status = status; this.logs = logs; @@ -135,7 +134,7 @@ public class MainnetTransactionProcessor implements TransactionProcessor { } @Override - public ValidationResult getValidationResult() { + public ValidationResult getValidationResult() { return validationResult; } @@ -177,7 +176,7 @@ public class MainnetTransactionProcessor implements TransactionProcessor { final TransactionValidationParams transactionValidationParams) { LOG.trace("Starting execution of {}", transaction); - ValidationResult validationResult = + ValidationResult validationResult = transactionValidator.validate(transaction); // Make sure the transaction is intrinsically valid before trying to // compare against a sender account (because the transaction may not diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java similarity index 75% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionValidator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java index d9f4421745..cca422c642 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionValidator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java @@ -10,24 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; - -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INCORRECT_NONCE; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INTRINSIC_GAS_EXCEEDS_GAS_LIMIT; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INVALID_SIGNATURE; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.NONCE_TOO_LOW; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.TX_SENDER_NOT_AUTHORIZED; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.UPFRONT_COST_EXCEEDS_BALANCE; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.WRONG_CHAIN_ID; - -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionFilter; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; +package org.hyperledger.besu.ethereum.mainnet; + +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionFilter; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.GasCalculator; import java.math.BigInteger; import java.util.Optional; @@ -68,7 +59,7 @@ public class MainnetTransactionValidator implements TransactionValidator { final Gas intrinsicGasCost = gasCalculator.transactionIntrinsicGasCost(transaction); if (intrinsicGasCost.compareTo(Gas.of(transaction.getGasLimit())) > 0) { return ValidationResult.invalid( - INTRINSIC_GAS_EXCEEDS_GAS_LIMIT, + TransactionInvalidReason.INTRINSIC_GAS_EXCEEDS_GAS_LIMIT, String.format( "intrinsic gas cost %s exceeds gas limit %s", intrinsicGasCost, transaction.getGasLimit())); @@ -92,7 +83,7 @@ public class MainnetTransactionValidator implements TransactionValidator { if (transaction.getUpfrontCost().compareTo(senderBalance) > 0) { return ValidationResult.invalid( - UPFRONT_COST_EXCEEDS_BALANCE, + TransactionInvalidReason.UPFRONT_COST_EXCEEDS_BALANCE, String.format( "transaction up-front cost %s exceeds transaction sender account balance %s", transaction.getUpfrontCost(), senderBalance)); @@ -100,7 +91,7 @@ public class MainnetTransactionValidator implements TransactionValidator { if (transaction.getNonce() < senderNonce) { return ValidationResult.invalid( - NONCE_TOO_LOW, + TransactionInvalidReason.NONCE_TOO_LOW, String.format( "transaction nonce %s below sender account nonce %s", transaction.getNonce(), senderNonce)); @@ -108,7 +99,7 @@ public class MainnetTransactionValidator implements TransactionValidator { if (!validationParams.isAllowFutureNonce() && senderNonce != transaction.getNonce()) { return ValidationResult.invalid( - INCORRECT_NONCE, + TransactionInvalidReason.INCORRECT_NONCE, String.format( "transaction nonce %s does not match sender account nonce %s.", transaction.getNonce(), senderNonce)); @@ -116,7 +107,7 @@ public class MainnetTransactionValidator implements TransactionValidator { if (!isSenderAllowed(transaction, validationParams)) { return ValidationResult.invalid( - TX_SENDER_NOT_AUTHORIZED, + TransactionInvalidReason.TX_SENDER_NOT_AUTHORIZED, String.format("Sender %s is not on the Account Whitelist", transaction.getSender())); } @@ -128,7 +119,7 @@ public class MainnetTransactionValidator implements TransactionValidator { if (chainId.isPresent() && (transaction.getChainId().isPresent() && !transaction.getChainId().equals(chainId))) { return ValidationResult.invalid( - WRONG_CHAIN_ID, + TransactionInvalidReason.WRONG_CHAIN_ID, String.format( "transaction was meant for chain id %s and not this chain id %s", transaction.getChainId().get(), chainId.get())); @@ -136,7 +127,7 @@ public class MainnetTransactionValidator implements TransactionValidator { if (!chainId.isPresent() && transaction.getChainId().isPresent()) { return ValidationResult.invalid( - REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED, + TransactionInvalidReason.REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED, "replay protected signatures is not supported"); } @@ -144,7 +135,7 @@ public class MainnetTransactionValidator implements TransactionValidator { if (disallowSignatureMalleability && signature.getS().compareTo(SECP256K1.HALF_CURVE_ORDER) > 0) { return ValidationResult.invalid( - INVALID_SIGNATURE, + TransactionInvalidReason.INVALID_SIGNATURE, String.format( "Signature s value should be less than %s, but got %s", SECP256K1.HALF_CURVE_ORDER, signature.getS())); @@ -156,7 +147,8 @@ public class MainnetTransactionValidator implements TransactionValidator { transaction.getSender(); } catch (final IllegalArgumentException e) { return ValidationResult.invalid( - INVALID_SIGNATURE, "sender could not be extracted from transaction signature"); + TransactionInvalidReason.INVALID_SIGNATURE, + "sender could not be extracted from transaction signature"); } return ValidationResult.valid(); diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MiningBeneficiaryCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MiningBeneficiaryCalculator.java similarity index 81% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MiningBeneficiaryCalculator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MiningBeneficiaryCalculator.java index d4a70782be..210a2e0b5e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MiningBeneficiaryCalculator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MiningBeneficiaryCalculator.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; @FunctionalInterface public interface MiningBeneficiaryCalculator { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MutableProtocolSchedule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MutableProtocolSchedule.java similarity index 96% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MutableProtocolSchedule.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MutableProtocolSchedule.java index 89d0345acd..847f749412 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MutableProtocolSchedule.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MutableProtocolSchedule.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.core.TransactionFilter; +import org.hyperledger.besu.ethereum.core.TransactionFilter; import java.math.BigInteger; import java.util.Comparator; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompileContractRegistry.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompileContractRegistry.java similarity index 93% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompileContractRegistry.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompileContractRegistry.java index ef2665bd98..b1ec52b591 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompileContractRegistry.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompileContractRegistry.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Address; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompiledContract.java similarity index 87% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompiledContract.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompiledContract.java index a082ff5c40..f93beac066 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompiledContract.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompiledContract.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; /** * A pre-compiled contract. diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompiledContractConfiguration.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompiledContractConfiguration.java similarity index 89% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompiledContractConfiguration.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompiledContractConfiguration.java index efa67da04c..2479101713 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompiledContractConfiguration.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompiledContractConfiguration.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.vm.GasCalculator; public class PrecompiledContractConfiguration { private GasCalculator gasCalculator; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSchedule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSchedule.java similarity index 88% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSchedule.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSchedule.java index ecb6f8ead2..2f8c5a3cf9 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSchedule.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSchedule.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.TransactionFilter; +import org.hyperledger.besu.ethereum.core.TransactionFilter; import java.math.BigInteger; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolScheduleBuilder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java similarity index 97% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolScheduleBuilder.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java index c6d3ddb611..f53219aeaa 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolScheduleBuilder.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.config.GenesisConfigOptions; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionValidator; +import org.hyperledger.besu.config.GenesisConfigOptions; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionValidator; import java.math.BigInteger; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSpec.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpec.java similarity index 91% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSpec.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpec.java index a74833453c..9354ce3de3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSpec.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpec.java @@ -10,16 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.BlockValidator; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.core.TransactionFilter; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockProcessor.TransactionReceiptFactory; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.BlockValidator; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.core.TransactionFilter; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.GasCalculator; /** A protocol specification. */ public class ProtocolSpec { @@ -47,7 +46,7 @@ public class ProtocolSpec { private final BlockHeaderFunctions blockHeaderFunctions; - private final TransactionReceiptFactory transactionReceiptFactory; + private final MainnetBlockProcessor.TransactionReceiptFactory transactionReceiptFactory; private final DifficultyCalculator difficultyCalculator; @@ -93,7 +92,7 @@ public class ProtocolSpec { final BlockImporter blockImporter, final BlockValidator blockValidator, final BlockHeaderFunctions blockHeaderFunctions, - final TransactionReceiptFactory transactionReceiptFactory, + final MainnetBlockProcessor.TransactionReceiptFactory transactionReceiptFactory, final DifficultyCalculator difficultyCalculator, final Wei blockReward, final MiningBeneficiaryCalculator miningBeneficiaryCalculator, @@ -224,7 +223,7 @@ public class ProtocolSpec { * * @return the transaction receipt factory */ - public TransactionReceiptFactory getTransactionReceiptFactory() { + public MainnetBlockProcessor.TransactionReceiptFactory getTransactionReceiptFactory() { return transactionReceiptFactory; } diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSpecBuilder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java similarity index 93% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSpecBuilder.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java index 24e5e75b23..43aa12c479 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSpecBuilder.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java @@ -10,23 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; import static com.google.common.base.Preconditions.checkNotNull; -import tech.pegasys.pantheon.ethereum.BlockValidator; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockProcessor.TransactionReceiptFactory; -import tech.pegasys.pantheon.ethereum.mainnet.precompiles.privacy.PrivacyPrecompiledContract; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionProcessor; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionValidator; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.BlockValidator; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.PrivacyPrecompiledContract; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionProcessor; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionValidator; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.GasCalculator; import java.util.function.BiFunction; import java.util.function.Function; @@ -37,7 +36,7 @@ public class ProtocolSpecBuilder { private Wei blockReward; private boolean skipZeroBlockRewards; private BlockHeaderFunctions blockHeaderFunctions; - private TransactionReceiptFactory transactionReceiptFactory; + private MainnetBlockProcessor.TransactionReceiptFactory transactionReceiptFactory; private DifficultyCalculator difficultyCalculator; private Function evmBuilder; private Function transactionValidatorBuilder; @@ -81,7 +80,7 @@ public class ProtocolSpecBuilder { } public ProtocolSpecBuilder transactionReceiptFactory( - final TransactionReceiptFactory transactionReceiptFactory) { + final MainnetBlockProcessor.TransactionReceiptFactory transactionReceiptFactory) { this.transactionReceiptFactory = transactionReceiptFactory; return this; } @@ -359,7 +358,7 @@ public class ProtocolSpecBuilder { public interface BlockProcessorBuilder { BlockProcessor apply( TransactionProcessor transactionProcessor, - TransactionReceiptFactory transactionReceiptFactory, + MainnetBlockProcessor.TransactionReceiptFactory transactionReceiptFactory, Wei blockReward, MiningBeneficiaryCalculator miningBeneficiaryCalculator, boolean skipZeroBlockRewards); diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ScheduleBasedBlockHeaderFunctions.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ScheduleBasedBlockHeaderFunctions.java similarity index 83% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ScheduleBasedBlockHeaderFunctions.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ScheduleBasedBlockHeaderFunctions.java index 80c8f1e19d..bd4c9cc3ad 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ScheduleBasedBlockHeaderFunctions.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ScheduleBasedBlockHeaderFunctions.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.ParsedExtraData; -import tech.pegasys.pantheon.ethereum.core.SealableBlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.ParsedExtraData; +import org.hyperledger.besu.ethereum.core.SealableBlockHeader; /** * Looks up the correct {@link BlockHeaderFunctions} to use based on a {@link ProtocolSchedule} to diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ScheduledProtocolSpec.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ScheduledProtocolSpec.java similarity index 95% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ScheduledProtocolSpec.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ScheduledProtocolSpec.java index d21b2fa6ca..a3d5adea23 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ScheduledProtocolSpec.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ScheduledProtocolSpec.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; /** Tuple that associates a {@link ProtocolSpec} with a given block level starting point */ public class ScheduledProtocolSpec { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/SpuriousDragonGasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/SpuriousDragonGasCalculator.java similarity index 88% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/SpuriousDragonGasCalculator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/SpuriousDragonGasCalculator.java index cd746c80e1..0e7e886706 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/SpuriousDragonGasCalculator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/SpuriousDragonGasCalculator.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class SpuriousDragonGasCalculator extends TangerineWhistleGasCalculator { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TangerineWhistleGasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TangerineWhistleGasCalculator.java similarity index 92% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TangerineWhistleGasCalculator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TangerineWhistleGasCalculator.java index 596b15d7f7..f185c67f21 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TangerineWhistleGasCalculator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TangerineWhistleGasCalculator.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class TangerineWhistleGasCalculator extends HomesteadGasCalculator { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionProcessor.java similarity index 87% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionProcessor.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionProcessor.java index 83853f210b..0282621891 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionProcessor.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionProcessor.java @@ -10,20 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; - -import static tech.pegasys.pantheon.ethereum.vm.OperationTracer.NO_TRACING; - -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.LogSeries; -import tech.pegasys.pantheon.ethereum.core.ProcessableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; -import tech.pegasys.pantheon.ethereum.vm.OperationTracer; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.mainnet; + +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.LogSeries; +import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.vm.BlockHashLookup; +import org.hyperledger.besu.ethereum.vm.OperationTracer; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; @@ -96,7 +93,7 @@ public interface TransactionProcessor { * * @return the validation result, with the reason for failure (if applicable.) */ - ValidationResult getValidationResult(); + ValidationResult getValidationResult(); /** * Returns the reason why a transaction was reverted (if applicable). @@ -137,7 +134,7 @@ public interface TransactionProcessor { blockHeader, transaction, miningBeneficiary, - NO_TRACING, + OperationTracer.NO_TRACING, blockHashLookup, isPersistingState, transactionValidationParams); diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionReceiptType.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionReceiptType.java similarity index 93% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionReceiptType.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionReceiptType.java index 935af40c08..2ff41dc637 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionReceiptType.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionReceiptType.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; public enum TransactionReceiptType { ROOT, diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionValidationParams.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParams.java similarity index 98% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionValidationParams.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParams.java index 3459a95f1a..cf8e47d4da 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionValidationParams.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParams.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; public class TransactionValidationParams { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidator.java similarity index 93% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionValidator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidator.java index 8d73a95025..0e99c0aa7f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionValidator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidator.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionFilter; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionFilter; /** Validates transaction based on some criteria. */ public interface TransactionValidator { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationResult.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ValidationResult.java similarity index 98% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationResult.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ValidationResult.java index 892d980fb9..715f265131 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationResult.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ValidationResult.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; import java.util.NoSuchElementException; import java.util.Objects; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/contractvalidation/MaxCodeSizeRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/contractvalidation/MaxCodeSizeRule.java similarity index 88% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/contractvalidation/MaxCodeSizeRule.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/contractvalidation/MaxCodeSizeRule.java index d83d6adf42..4911b64ffd 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/contractvalidation/MaxCodeSizeRule.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/contractvalidation/MaxCodeSizeRule.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.contractvalidation; +package org.hyperledger.besu.ethereum.mainnet.contractvalidation; -import tech.pegasys.pantheon.ethereum.mainnet.ContractValidationRule; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.mainnet.ContractValidationRule; +import org.hyperledger.besu.ethereum.vm.MessageFrame; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/AncestryValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AncestryValidationRule.java similarity index 88% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/AncestryValidationRule.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AncestryValidationRule.java index e901b5a5a9..b1d0c85082 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/AncestryValidationRule.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AncestryValidationRule.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; +package org.hyperledger.besu.ethereum.mainnet.headervalidationrules; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/CalculatedDifficultyValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/CalculatedDifficultyValidationRule.java similarity index 84% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/CalculatedDifficultyValidationRule.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/CalculatedDifficultyValidationRule.java index 40ee2a041b..63f8bc6470 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/CalculatedDifficultyValidationRule.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/CalculatedDifficultyValidationRule.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; +package org.hyperledger.besu.ethereum.mainnet.headervalidationrules; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.AttachedBlockHeaderValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.DifficultyCalculator; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule; +import org.hyperledger.besu.ethereum.mainnet.DifficultyCalculator; import java.math.BigInteger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRule.java similarity index 88% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRule.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRule.java index 23040ebe86..8d120dee73 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRule.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRule.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; +package org.hyperledger.besu.ethereum.mainnet.headervalidationrules; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule; import java.util.function.Function; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRule.java similarity index 86% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRule.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRule.java index b0e91b1c81..b9a847dd76 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRule.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRule.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; +package org.hyperledger.besu.ethereum.mainnet.headervalidationrules; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import org.hyperledger.besu.util.bytes.BytesValue; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRule.java similarity index 92% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRule.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRule.java index 45e44e690b..d2e91b128d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRule.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRule.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; +package org.hyperledger.besu.ethereum.mainnet.headervalidationrules; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasUsageValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasUsageValidationRule.java similarity index 86% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasUsageValidationRule.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasUsageValidationRule.java index ca4f1d416f..8c647df6a4 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasUsageValidationRule.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasUsageValidationRule.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; +package org.hyperledger.besu.ethereum.mainnet.headervalidationrules; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRule.java similarity index 85% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRule.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRule.java index b2100d8d53..90ab0a3d23 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRule.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRule.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; +package org.hyperledger.besu.ethereum.mainnet.headervalidationrules; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; -import tech.pegasys.pantheon.ethereum.mainnet.EthHasher; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import org.hyperledger.besu.ethereum.mainnet.EthHasher; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/TimestampBoundedByFutureParameter.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampBoundedByFutureParameter.java similarity index 90% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/TimestampBoundedByFutureParameter.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampBoundedByFutureParameter.java index 2d7a77e133..5ce53dacde 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/TimestampBoundedByFutureParameter.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampBoundedByFutureParameter.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; +package org.hyperledger.besu.ethereum.mainnet.headervalidationrules; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule; import java.util.concurrent.TimeUnit; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/TimestampMoreRecentThanParent.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampMoreRecentThanParent.java similarity index 90% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/TimestampMoreRecentThanParent.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampMoreRecentThanParent.java index 18cda7fc97..a6a3bebbd4 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/TimestampMoreRecentThanParent.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampMoreRecentThanParent.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; +package org.hyperledger.besu.ethereum.mainnet.headervalidationrules; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128AddPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128AddPrecompiledContract.java similarity index 83% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128AddPrecompiledContract.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128AddPrecompiledContract.java index b6a82a9bdb..16c5581e19 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128AddPrecompiledContract.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128AddPrecompiledContract.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.precompiles; +package org.hyperledger.besu.ethereum.mainnet.precompiles; -import tech.pegasys.pantheon.crypto.altbn128.AltBn128Point; -import tech.pegasys.pantheon.crypto.altbn128.Fq; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; +import org.hyperledger.besu.crypto.altbn128.AltBn128Point; +import org.hyperledger.besu.crypto.altbn128.Fq; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytesValue; import java.math.BigInteger; import java.util.Arrays; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128MulPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128MulPrecompiledContract.java similarity index 83% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128MulPrecompiledContract.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128MulPrecompiledContract.java index e5d1347f89..1d77e0c735 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128MulPrecompiledContract.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128MulPrecompiledContract.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.precompiles; +package org.hyperledger.besu.ethereum.mainnet.precompiles; -import tech.pegasys.pantheon.crypto.altbn128.AltBn128Point; -import tech.pegasys.pantheon.crypto.altbn128.Fq; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; +import org.hyperledger.besu.crypto.altbn128.AltBn128Point; +import org.hyperledger.besu.crypto.altbn128.Fq; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytesValue; import java.math.BigInteger; import java.util.Arrays; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContract.java similarity index 85% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContract.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContract.java index 471f60b221..26e077f080 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContract.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContract.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.precompiles; - -import tech.pegasys.pantheon.crypto.altbn128.AltBn128Fq12Pairer; -import tech.pegasys.pantheon.crypto.altbn128.AltBn128Fq2Point; -import tech.pegasys.pantheon.crypto.altbn128.AltBn128Point; -import tech.pegasys.pantheon.crypto.altbn128.Fq; -import tech.pegasys.pantheon.crypto.altbn128.Fq12; -import tech.pegasys.pantheon.crypto.altbn128.Fq2; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.mainnet.precompiles; + +import org.hyperledger.besu.crypto.altbn128.AltBn128Fq12Pairer; +import org.hyperledger.besu.crypto.altbn128.AltBn128Fq2Point; +import org.hyperledger.besu.crypto.altbn128.AltBn128Point; +import org.hyperledger.besu.crypto.altbn128.Fq; +import org.hyperledger.besu.crypto.altbn128.Fq12; +import org.hyperledger.besu.crypto.altbn128.Fq2; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; import java.util.ArrayList; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContract.java similarity index 81% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContract.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContract.java index 76965ceaa2..94fbec9ccd 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContract.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContract.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.precompiles; +package org.hyperledger.besu.ethereum.mainnet.precompiles; import static java.util.Arrays.copyOfRange; -import static tech.pegasys.pantheon.crypto.Blake2bfMessageDigest.Blake2bfDigest.MESSAGE_LENGTH_BYTES; +import static org.hyperledger.besu.crypto.Blake2bfMessageDigest.Blake2bfDigest.MESSAGE_LENGTH_BYTES; -import tech.pegasys.pantheon.crypto.Hash; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/BigIntegerModularExponentiationPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BigIntegerModularExponentiationPrecompiledContract.java similarity index 93% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/BigIntegerModularExponentiationPrecompiledContract.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BigIntegerModularExponentiationPrecompiledContract.java index 6a16c95611..ada24c51eb 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/BigIntegerModularExponentiationPrecompiledContract.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BigIntegerModularExponentiationPrecompiledContract.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.precompiles; - -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; +package org.hyperledger.besu.ethereum.mainnet.precompiles; + +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.besu.util.bytes.MutableBytesValue; import java.math.BigInteger; import java.util.Arrays; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/ECRECPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/ECRECPrecompiledContract.java similarity index 79% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/ECRECPrecompiledContract.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/ECRECPrecompiledContract.java index 3dd0752ac4..6d18fbeede 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/ECRECPrecompiledContract.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/ECRECPrecompiledContract.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.precompiles; +package org.hyperledger.besu.ethereum.mainnet.precompiles; -import tech.pegasys.pantheon.crypto.SECP256K1.PublicKey; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; -import tech.pegasys.pantheon.util.bytes.MutableBytes32; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; +import org.hyperledger.besu.crypto.SECP256K1.PublicKey; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.besu.util.bytes.MutableBytes32; +import org.hyperledger.besu.util.bytes.MutableBytesValue; import java.math.BigInteger; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/IDPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/IDPrecompiledContract.java similarity index 74% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/IDPrecompiledContract.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/IDPrecompiledContract.java index 63f333fd3a..496f3ce9d9 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/IDPrecompiledContract.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/IDPrecompiledContract.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.precompiles; +package org.hyperledger.besu.ethereum.mainnet.precompiles; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; public class IDPrecompiledContract extends AbstractPrecompiledContract { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/RIPEMD160PrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/RIPEMD160PrecompiledContract.java similarity index 71% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/RIPEMD160PrecompiledContract.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/RIPEMD160PrecompiledContract.java index d969498d9f..7d2a9e729e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/RIPEMD160PrecompiledContract.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/RIPEMD160PrecompiledContract.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.precompiles; +package org.hyperledger.besu.ethereum.mainnet.precompiles; -import tech.pegasys.pantheon.crypto.Hash; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; public class RIPEMD160PrecompiledContract extends AbstractPrecompiledContract { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/SHA256PrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/SHA256PrecompiledContract.java similarity index 73% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/SHA256PrecompiledContract.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/SHA256PrecompiledContract.java index a9811079ce..519e90e37e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/SHA256PrecompiledContract.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/SHA256PrecompiledContract.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.precompiles; +package org.hyperledger.besu.ethereum.mainnet.precompiles; -import tech.pegasys.pantheon.crypto.Hash; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; public class SHA256PrecompiledContract extends AbstractPrecompiledContract { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContract.java similarity index 77% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContract.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContract.java index 6982437884..5f40d91dc4 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContract.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContract.java @@ -10,35 +10,35 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.precompiles.privacy; - -import static tech.pegasys.pantheon.crypto.Hash.keccak256; - -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.types.ReceiveRequest; -import tech.pegasys.pantheon.enclave.types.ReceiveResponse; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogSeries; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.debug.TraceOptions; -import tech.pegasys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import tech.pegasys.pantheon.ethereum.privacy.PrivateStateStorage; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionProcessor; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionStorage; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.trie.MerklePatriciaTrie; -import tech.pegasys.pantheon.ethereum.vm.DebugOperationTracer; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +package org.hyperledger.besu.ethereum.mainnet.precompiles.privacy; + +import static org.hyperledger.besu.crypto.Hash.keccak256; + +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.types.ReceiveRequest; +import org.hyperledger.besu.enclave.types.ReceiveResponse; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.LogSeries; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.debug.TraceOptions; +import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract; +import org.hyperledger.besu.ethereum.privacy.PrivateStateStorage; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionProcessor; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionStorage; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie; +import org.hyperledger.besu.ethereum.vm.DebugOperationTracer; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateStateKeyValueStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateKeyValueStorage.java similarity index 85% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateStateKeyValueStorage.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateKeyValueStorage.java index d4e4484f81..b3b9cb0ba7 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateStateKeyValueStorage.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateKeyValueStorage.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy; +package org.hyperledger.besu.ethereum.privacy; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageTransaction; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateStateStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateStorage.java similarity index 82% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateStateStorage.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateStorage.java index 4e93e0b98e..c8cade8684 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateStateStorage.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateStorage.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy; +package org.hyperledger.besu.ethereum.privacy; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransaction.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransaction.java similarity index 96% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransaction.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransaction.java index 2b5169a176..caacba61e2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransaction.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransaction.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy; +package org.hyperledger.besu.ethereum.privacy; import static com.google.common.base.Preconditions.checkState; -import static tech.pegasys.pantheon.crypto.Hash.keccak256; - -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; -import tech.pegasys.pantheon.util.uint.UInt256; +import static org.hyperledger.besu.crypto.Hash.keccak256; + +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.util.Arrays; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionHandler.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionHandler.java similarity index 83% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionHandler.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionHandler.java index b18a558c00..220b1d2f57 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionHandler.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionHandler.java @@ -10,25 +10,25 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy; - -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.types.ReceiveRequest; -import tech.pegasys.pantheon.enclave.types.ReceiveResponse; -import tech.pegasys.pantheon.enclave.types.SendRequest; -import tech.pegasys.pantheon.enclave.types.SendRequestLegacy; -import tech.pegasys.pantheon.enclave.types.SendRequestPantheon; -import tech.pegasys.pantheon.enclave.types.SendResponse; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; -import tech.pegasys.pantheon.ethereum.privacy.markertransaction.PrivateMarkerTransactionFactory; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.BytesValues; +package org.hyperledger.besu.ethereum.privacy; + +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.types.ReceiveRequest; +import org.hyperledger.besu.enclave.types.ReceiveResponse; +import org.hyperledger.besu.enclave.types.SendRequest; +import org.hyperledger.besu.enclave.types.SendRequestBesu; +import org.hyperledger.besu.enclave.types.SendRequestLegacy; +import org.hyperledger.besu.enclave.types.SendResponse; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.ethereum.privacy.markertransaction.PrivateMarkerTransactionFactory; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.BytesValues; import java.math.BigInteger; import java.util.List; @@ -116,7 +116,7 @@ public class PrivateTransactionHandler { return privateMarkerTransactionFactory.create(transactionEnclaveKey, privateTransaction); } - public ValidationResult validatePrivateTransaction( + public ValidationResult validatePrivateTransaction( final PrivateTransaction privateTransaction, final String privacyGroupId) { return privateTransactionValidator.validate( privateTransaction, getSenderNonce(privateTransaction.getSender(), privacyGroupId)); @@ -128,7 +128,7 @@ public class PrivateTransactionHandler { final String payload = BytesValues.asBase64String(bvrlp.encoded()); if (privateTransaction.getPrivacyGroupId().isPresent()) { - return new SendRequestPantheon( + return new SendRequestBesu( payload, enclavePublicKey, BytesValues.asBase64String(privateTransaction.getPrivacyGroupId().get())); diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionKeyValueStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionKeyValueStorage.java similarity index 86% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionKeyValueStorage.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionKeyValueStorage.java index 0cb1c311e8..867ffafd61 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionKeyValueStorage.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionKeyValueStorage.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy; +package org.hyperledger.besu.ethereum.privacy; import static java.nio.charset.StandardCharsets.UTF_8; -import tech.pegasys.pantheon.ethereum.core.Log; -import tech.pegasys.pantheon.ethereum.core.LogSeries; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageTransaction; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.ethereum.core.Log; +import org.hyperledger.besu.ethereum.core.LogSeries; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.util.List; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionProcessor.java similarity index 83% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionProcessor.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionProcessor.java index 7ca1a1dc8a..4cb250fe61 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionProcessor.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionProcessor.java @@ -10,29 +10,28 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy; - -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.LogSeries; -import tech.pegasys.pantheon.ethereum.core.MutableAccount; -import tech.pegasys.pantheon.ethereum.core.ProcessableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.mainnet.AbstractMessageProcessor; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; -import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; -import tech.pegasys.pantheon.ethereum.vm.Code; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.OperationTracer; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.privacy; + +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.LogSeries; +import org.hyperledger.besu.ethereum.core.MutableAccount; +import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.mainnet.AbstractMessageProcessor; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.ethereum.vm.BlockHashLookup; +import org.hyperledger.besu.ethereum.vm.Code; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.OperationTracer; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayDeque; import java.util.Deque; @@ -71,11 +70,11 @@ public class PrivateTransactionProcessor { private final BytesValue output; - private final ValidationResult validationResult; + private final ValidationResult validationResult; private final Optional revertReason; public static Result invalid( - final ValidationResult validationResult) { + final ValidationResult validationResult) { return new Result( Status.INVALID, LogSeries.empty(), @@ -87,7 +86,7 @@ public class PrivateTransactionProcessor { public static Result failed( final long gasRemaining, - final ValidationResult validationResult, + final ValidationResult validationResult, final Optional revertReason) { return new Result( Status.FAILED, @@ -102,7 +101,7 @@ public class PrivateTransactionProcessor { final LogSeries logs, final long gasRemaining, final BytesValue output, - final ValidationResult validationResult) { + final ValidationResult validationResult) { return new Result( Status.SUCCESSFUL, logs, gasRemaining, output, validationResult, Optional.empty()); } @@ -112,7 +111,7 @@ public class PrivateTransactionProcessor { final LogSeries logs, final long gasRemaining, final BytesValue output, - final ValidationResult validationResult, + final ValidationResult validationResult, final Optional revertReason) { this.status = status; this.logs = logs; @@ -143,7 +142,7 @@ public class PrivateTransactionProcessor { } @Override - public ValidationResult getValidationResult() { + public ValidationResult getValidationResult() { return validationResult; } @@ -195,7 +194,7 @@ public class PrivateTransactionProcessor { ? maybePrivateSender : privateWorldState.createAccount(senderAddress, 0, Wei.ZERO); - final ValidationResult validationResult = + final ValidationResult validationResult = privateTransactionValidator.validate(transaction, sender.getNonce()); if (!validationResult.isValid()) { return Result.invalid(validationResult); @@ -293,7 +292,8 @@ public class PrivateTransactionProcessor { } else { return Result.failed( 0, - ValidationResult.invalid(TransactionInvalidReason.PRIVATE_TRANSACTION_FAILED), + ValidationResult.invalid( + TransactionValidator.TransactionInvalidReason.PRIVATE_TRANSACTION_FAILED), initialFrame.getRevertReason()); } } diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionStorage.java similarity index 81% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionStorage.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionStorage.java index c1a59a94ae..ec490013dd 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionStorage.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionStorage.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy; +package org.hyperledger.besu.ethereum.privacy; -import tech.pegasys.pantheon.ethereum.core.Log; -import tech.pegasys.pantheon.ethereum.core.LogSeries; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Log; +import org.hyperledger.besu.ethereum.core.LogSeries; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionValidator.java similarity index 68% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionValidator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionValidator.java index 78a76b4b15..3d3a04ef58 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionValidator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionValidator.java @@ -10,16 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy; +package org.hyperledger.besu.ethereum.privacy; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INCORRECT_PRIVATE_NONCE; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INVALID_SIGNATURE; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.PRIVATE_NONCE_TOO_LOW; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.WRONG_CHAIN_ID; - -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; import java.math.BigInteger; import java.util.Optional; @@ -37,12 +31,12 @@ public class PrivateTransactionValidator { this.chainId = chainId; } - public ValidationResult validate( + public ValidationResult validate( final PrivateTransaction transaction, final Long accountNonce) { LOG.debug("Validating private transaction {} signature ", transaction.hash()); - ValidationResult signatureValidationResult = + ValidationResult signatureValidationResult = validateTransactionSignature(transaction); if (!signatureValidationResult.isValid()) { return signatureValidationResult; @@ -54,7 +48,7 @@ public class PrivateTransactionValidator { if (accountNonce > transactionNonce) { return ValidationResult.invalid( - PRIVATE_NONCE_TOO_LOW, + TransactionValidator.TransactionInvalidReason.PRIVATE_NONCE_TOO_LOW, String.format( "private transaction nonce %s does not match sender account nonce %s.", transactionNonce, accountNonce)); @@ -62,7 +56,7 @@ public class PrivateTransactionValidator { if (accountNonce != transactionNonce) { return ValidationResult.invalid( - INCORRECT_PRIVATE_NONCE, + TransactionValidator.TransactionInvalidReason.INCORRECT_PRIVATE_NONCE, String.format( "private transaction nonce %s does not match sender account nonce %s.", transactionNonce, accountNonce)); @@ -71,12 +65,12 @@ public class PrivateTransactionValidator { return ValidationResult.valid(); } - public ValidationResult validateTransactionSignature( - final PrivateTransaction transaction) { + public ValidationResult + validateTransactionSignature(final PrivateTransaction transaction) { if (chainId.isPresent() && (transaction.getChainId().isPresent() && !transaction.getChainId().equals(chainId))) { return ValidationResult.invalid( - WRONG_CHAIN_ID, + TransactionValidator.TransactionInvalidReason.WRONG_CHAIN_ID, String.format( "transaction was meant for chain id %s and not this chain id %s", transaction.getChainId().get(), chainId.get())); @@ -84,7 +78,7 @@ public class PrivateTransactionValidator { if (!chainId.isPresent() && transaction.getChainId().isPresent()) { return ValidationResult.invalid( - REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED, + TransactionValidator.TransactionInvalidReason.REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED, "replay protected signatures is not supported"); } @@ -94,7 +88,8 @@ public class PrivateTransactionValidator { transaction.getSender(); } catch (final IllegalArgumentException e) { return ValidationResult.invalid( - INVALID_SIGNATURE, "sender could not be extracted from transaction signature"); + TransactionValidator.TransactionInvalidReason.INVALID_SIGNATURE, + "sender could not be extracted from transaction signature"); } return ValidationResult.valid(); diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/Restriction.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/Restriction.java similarity index 90% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/Restriction.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/Restriction.java index 6eeeb0dfae..a482da6c59 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/Restriction.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/Restriction.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy; +package org.hyperledger.besu.ethereum.privacy; import static java.nio.charset.StandardCharsets.UTF_8; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; public enum Restriction { RESTRICTED(BytesValue.wrap("restricted".getBytes(UTF_8))), diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactory.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactory.java similarity index 77% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactory.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactory.java index 12dc6a3f49..9ca59f91df 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactory.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactory.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy.markertransaction; +package org.hyperledger.besu.ethereum.privacy.markertransaction; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.ethereum.util.NonceProvider; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.ethereum.util.NonceProvider; public class FixedKeySigningPrivateMarkerTransactionFactory extends PrivateMarkerTransactionFactory { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/markertransaction/PrivateMarkerTransactionFactory.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/PrivateMarkerTransactionFactory.java similarity index 82% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/markertransaction/PrivateMarkerTransactionFactory.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/PrivateMarkerTransactionFactory.java index b1e2aaf83f..da31dadb1b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/markertransaction/PrivateMarkerTransactionFactory.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/PrivateMarkerTransactionFactory.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy.markertransaction; +package org.hyperledger.besu.ethereum.privacy.markertransaction; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.util.bytes.BytesValues; public abstract class PrivateMarkerTransactionFactory { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactory.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactory.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactory.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactory.java index 53549e8362..0d72b50e78 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactory.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactory.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy.markertransaction; +package org.hyperledger.besu.ethereum.privacy.markertransaction; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; public class RandomSigningPrivateMarkerTransactionFactory extends PrivateMarkerTransactionFactory { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/proof/WorldStateProof.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/proof/WorldStateProof.java similarity index 86% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/proof/WorldStateProof.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/proof/WorldStateProof.java index 3956c5333f..69bf1e36d3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/proof/WorldStateProof.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/proof/WorldStateProof.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.proof; +package org.hyperledger.besu.ethereum.proof; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.trie.Proof; -import tech.pegasys.pantheon.ethereum.worldstate.StateTrieAccountValue; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.trie.Proof; +import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/proof/WorldStateProofProvider.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/proof/WorldStateProofProvider.java similarity index 80% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/proof/WorldStateProofProvider.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/proof/WorldStateProofProvider.java index 86b59f60e1..15af36b509 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/proof/WorldStateProofProvider.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/proof/WorldStateProofProvider.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.proof; +package org.hyperledger.besu.ethereum.proof; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.trie.MerklePatriciaTrie; -import tech.pegasys.pantheon.ethereum.trie.Proof; -import tech.pegasys.pantheon.ethereum.trie.StoredMerklePatriciaTrie; -import tech.pegasys.pantheon.ethereum.worldstate.StateTrieAccountValue; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie; +import org.hyperledger.besu.ethereum.trie.Proof; +import org.hyperledger.besu.ethereum.trie.StoredMerklePatriciaTrie; +import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.List; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/StorageProvider.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/StorageProvider.java similarity index 66% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/StorageProvider.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/StorageProvider.java index 9e2974434b..530221ec2b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/StorageProvider.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/StorageProvider.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.storage; - -import tech.pegasys.pantheon.ethereum.chain.BlockchainStorage; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.privacy.PrivateStateStorage; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStatePreimageStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; +package org.hyperledger.besu.ethereum.storage; + +import org.hyperledger.besu.ethereum.chain.BlockchainStorage; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.privacy.PrivateStateStorage; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionStorage; +import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; import java.io.Closeable; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/KeyValueSegmentIdentifier.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueSegmentIdentifier.java similarity index 88% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/KeyValueSegmentIdentifier.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueSegmentIdentifier.java index a1c175a0db..14e32187a0 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/KeyValueSegmentIdentifier.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueSegmentIdentifier.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.storage.keyvalue; +package org.hyperledger.besu.ethereum.storage.keyvalue; -import tech.pegasys.pantheon.plugin.services.storage.SegmentIdentifier; +import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier; public enum KeyValueSegmentIdentifier implements SegmentIdentifier { BLOCKCHAIN((byte) 1), diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java similarity index 88% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java index c8725d36f7..54fda02905 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.storage.keyvalue; - -import tech.pegasys.pantheon.ethereum.chain.BlockchainStorage; -import tech.pegasys.pantheon.ethereum.chain.TransactionLocation; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageTransaction; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; -import tech.pegasys.pantheon.util.uint.UInt256; -import tech.pegasys.pantheon.util.uint.UInt256Bytes; +package org.hyperledger.besu.ethereum.storage.keyvalue; + +import org.hyperledger.besu.ethereum.chain.BlockchainStorage; +import org.hyperledger.besu.ethereum.chain.TransactionLocation; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.besu.util.uint.UInt256; +import org.hyperledger.besu.util.uint.UInt256Bytes; import java.nio.charset.StandardCharsets; import java.util.Collection; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/KeyValueStorageProvider.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageProvider.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/KeyValueStorageProvider.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageProvider.java index 68453169c1..143a1d6752 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/KeyValueStorageProvider.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageProvider.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.storage.keyvalue; +package org.hyperledger.besu.ethereum.storage.keyvalue; -import tech.pegasys.pantheon.ethereum.chain.BlockchainStorage; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.privacy.PrivateStateKeyValueStorage; -import tech.pegasys.pantheon.ethereum.privacy.PrivateStateStorage; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionKeyValueStorage; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionStorage; -import tech.pegasys.pantheon.ethereum.storage.StorageProvider; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStatePreimageStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.ethereum.chain.BlockchainStorage; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.privacy.PrivateStateKeyValueStorage; +import org.hyperledger.besu.ethereum.privacy.PrivateStateStorage; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionKeyValueStorage; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionStorage; +import org.hyperledger.besu.ethereum.storage.StorageProvider; +import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; import java.io.IOException; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/KeyValueStorageProviderBuilder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageProviderBuilder.java similarity index 69% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/KeyValueStorageProviderBuilder.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageProviderBuilder.java index afa9afa185..f2f3b1d7e2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/KeyValueStorageProviderBuilder.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageProviderBuilder.java @@ -10,27 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.storage.keyvalue; +package org.hyperledger.besu.ethereum.storage.keyvalue; import static com.google.common.base.Preconditions.checkNotNull; -import static tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.BLOCKCHAIN; -import static tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.PRIVATE_STATE; -import static tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.PRIVATE_TRANSACTIONS; -import static tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.PRUNING_STATE; -import static tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.WORLD_STATE; +import static org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.BLOCKCHAIN; +import static org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.PRIVATE_STATE; +import static org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.PRIVATE_TRANSACTIONS; +import static org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.PRUNING_STATE; +import static org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.WORLD_STATE; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.PantheonConfiguration; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageFactory; -import tech.pegasys.pantheon.services.kvstore.LimitedInMemoryKeyValueStorage; +import org.hyperledger.besu.plugin.services.BesuConfiguration; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageFactory; +import org.hyperledger.besu.services.kvstore.LimitedInMemoryKeyValueStorage; public class KeyValueStorageProviderBuilder { private static final long DEFAULT_WORLD_STATE_PRE_IMAGE_CACHE_SIZE = 5_000L; private KeyValueStorageFactory storageFactory; - private PantheonConfiguration commonConfiguration; + private BesuConfiguration commonConfiguration; private MetricsSystem metricsSystem; public KeyValueStorageProviderBuilder withStorageFactory( @@ -40,7 +40,7 @@ public class KeyValueStorageProviderBuilder { } public KeyValueStorageProviderBuilder withCommonConfiguration( - final PantheonConfiguration commonConfiguration) { + final BesuConfiguration commonConfiguration) { this.commonConfiguration = commonConfiguration; return this; } diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/WorldStateKeyValueStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/WorldStateKeyValueStorage.java similarity index 90% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/WorldStateKeyValueStorage.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/WorldStateKeyValueStorage.java index 46d3dd196d..775fc59389 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/WorldStateKeyValueStorage.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/WorldStateKeyValueStorage.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.storage.keyvalue; - -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.trie.MerklePatriciaTrie; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageTransaction; -import tech.pegasys.pantheon.util.Subscribers; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.storage.keyvalue; + +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction; +import org.hyperledger.besu.util.Subscribers; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/WorldStatePreimageKeyValueStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/WorldStatePreimageKeyValueStorage.java similarity index 83% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/WorldStatePreimageKeyValueStorage.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/WorldStatePreimageKeyValueStorage.java index c384dd14cd..53d92f1c7d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/WorldStatePreimageKeyValueStorage.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/WorldStatePreimageKeyValueStorage.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.storage.keyvalue; +package org.hyperledger.besu.ethereum.storage.keyvalue; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStatePreimageStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageTransaction; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/transaction/CallParameter.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/CallParameter.java similarity index 91% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/transaction/CallParameter.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/CallParameter.java index 8f5014adf1..6cb058d09b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/transaction/CallParameter.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/CallParameter.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.transaction; +package org.hyperledger.besu.ethereum.transaction; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Objects; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/transaction/TransactionSimulator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java similarity index 85% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/transaction/TransactionSimulator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java index 87a43de28e..4ba7cd38c7 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/transaction/TransactionSimulator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.transaction; - -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidationParams; -import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.transaction; + +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams; +import org.hyperledger.besu.ethereum.vm.BlockHashLookup; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/transaction/TransactionSimulatorResult.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorResult.java similarity index 69% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/transaction/TransactionSimulatorResult.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorResult.java index 367e78474b..1b84655c32 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/transaction/TransactionSimulatorResult.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorResult.java @@ -10,22 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.transaction; +package org.hyperledger.besu.ethereum.transaction; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor.Result; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Objects; public class TransactionSimulatorResult { private final Transaction transaction; - private final Result result; + private final TransactionProcessor.Result result; - TransactionSimulatorResult(final Transaction transaction, final Result result) { + TransactionSimulatorResult( + final Transaction transaction, final TransactionProcessor.Result result) { this.transaction = transaction; this.result = result; } @@ -42,11 +43,11 @@ public class TransactionSimulatorResult { return result.getOutput(); } - public ValidationResult getValidationResult() { + public ValidationResult getValidationResult() { return result.getValidationResult(); } - public Result getResult() { + public TransactionProcessor.Result getResult() { return result; } diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/BlockchainUtil.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/BlockchainUtil.java similarity index 94% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/BlockchainUtil.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/BlockchainUtil.java index b7fd8584b8..abf15ab6fd 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/BlockchainUtil.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/BlockchainUtil.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.util; +package org.hyperledger.besu.ethereum.util; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.Collections; import java.util.Comparator; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/ByteArrayUtil.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/ByteArrayUtil.java similarity index 97% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/ByteArrayUtil.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/ByteArrayUtil.java index 493d3f79fa..ce1bac7e2e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/ByteArrayUtil.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/ByteArrayUtil.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.util; +package org.hyperledger.besu.ethereum.util; import com.google.common.primitives.Longs; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/NonceProvider.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/NonceProvider.java similarity index 87% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/NonceProvider.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/NonceProvider.java index 2473d8b698..dd12a251b3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/NonceProvider.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/NonceProvider.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.util; +package org.hyperledger.besu.ethereum.util; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Address; @FunctionalInterface public interface NonceProvider { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/RawBlockIterator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/RawBlockIterator.java similarity index 87% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/RawBlockIterator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/RawBlockIterator.java index b454544517..a68de8a2e3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/RawBlockIterator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/RawBlockIterator.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.util; +package org.hyperledger.besu.ethereum.util; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.Closeable; import java.io.IOException; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/AbstractCallOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/AbstractCallOperation.java similarity index 95% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/AbstractCallOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/AbstractCallOperation.java index 6d3bf95b3d..ae6135271d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/AbstractCallOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/AbstractCallOperation.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; - -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.vm; + +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; /** * A skeleton class for implementing call operations. diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/AbstractOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/AbstractOperation.java similarity index 98% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/AbstractOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/AbstractOperation.java index 9245a85cca..a6987de2be 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/AbstractOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/AbstractOperation.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; /** * All {@link Operation} implementations should inherit from this class to get the setting of some diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/BlockHashLookup.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/BlockHashLookup.java similarity index 87% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/BlockHashLookup.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/BlockHashLookup.java index ae22b1f448..d9c947b0fc 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/BlockHashLookup.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/BlockHashLookup.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.ProcessableBlockHeader; -import tech.pegasys.pantheon.ethereum.vm.operations.BlockHashOperation; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader; +import org.hyperledger.besu.ethereum.vm.operations.BlockHashOperation; import java.util.HashMap; import java.util.Map; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Code.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Code.java similarity index 93% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Code.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Code.java index 681a21459b..1f37aced37 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Code.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Code.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; -import tech.pegasys.pantheon.ethereum.vm.operations.JumpDestOperation; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.vm.operations.JumpDestOperation; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.BitSet; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/DebugOperationTracer.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/DebugOperationTracer.java similarity index 87% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/DebugOperationTracer.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/DebugOperationTracer.java index 36dd8dfb41..79e067870d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/DebugOperationTracer.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/DebugOperationTracer.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; -import static tech.pegasys.pantheon.util.uint.UInt256.U_32; +import static org.hyperledger.besu.util.uint.UInt256.U_32; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.debug.TraceFrame; -import tech.pegasys.pantheon.ethereum.debug.TraceOptions; -import tech.pegasys.pantheon.ethereum.vm.ehalt.ExceptionalHaltException; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.debug.TraceFrame; +import org.hyperledger.besu.ethereum.debug.TraceOptions; +import org.hyperledger.besu.ethereum.vm.ehalt.ExceptionalHaltException; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.EnumSet; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/EVM.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/EVM.java similarity index 91% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/EVM.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/EVM.java index 1417bea784..995cfd5cdc 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/EVM.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/EVM.java @@ -10,16 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; import static org.apache.logging.log4j.LogManager.getLogger; -import static tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame.State; -import tech.pegasys.pantheon.ethereum.vm.ehalt.ExceptionalHaltException; -import tech.pegasys.pantheon.ethereum.vm.ehalt.ExceptionalHaltManager; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.MessageFrame.State; +import org.hyperledger.besu.ethereum.vm.ehalt.ExceptionalHaltException; +import org.hyperledger.besu.ethereum.vm.ehalt.ExceptionalHaltManager; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.EnumSet; import java.util.Optional; @@ -88,7 +87,9 @@ public class EVM { // Calculate the cost if, and only if, we are not halting as a result of a stack underflow, as // the operation may need all its stack items to calculate gas. // This is how existing EVM implementations behave. - if (!frame.getExceptionalHaltReasons().contains(INSUFFICIENT_STACK_ITEMS)) { + if (!frame + .getExceptionalHaltReasons() + .contains(ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS)) { try { return Optional.ofNullable(frame.getCurrentOperation().cost(frame)); } catch (final IllegalArgumentException e) { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ExceptionalHaltReason.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ExceptionalHaltReason.java similarity index 94% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ExceptionalHaltReason.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ExceptionalHaltReason.java index 250b42a8f3..98e0d4a311 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ExceptionalHaltReason.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ExceptionalHaltReason.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; public enum ExceptionalHaltReason { NONE, diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/GasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/GasCalculator.java similarity index 87% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/GasCalculator.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/GasCalculator.java index fe0f3e5ebf..a1d3ddeb55 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/GasCalculator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/GasCalculator.java @@ -10,33 +10,33 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; - -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.AbstractMessageProcessor; -import tech.pegasys.pantheon.ethereum.mainnet.precompiles.ECRECPrecompiledContract; -import tech.pegasys.pantheon.ethereum.mainnet.precompiles.IDPrecompiledContract; -import tech.pegasys.pantheon.ethereum.mainnet.precompiles.RIPEMD160PrecompiledContract; -import tech.pegasys.pantheon.ethereum.mainnet.precompiles.SHA256PrecompiledContract; -import tech.pegasys.pantheon.ethereum.vm.operations.BalanceOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.BlockHashOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.ExpOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.ExtCodeCopyOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.ExtCodeHashOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.ExtCodeSizeOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.JumpDestOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.LogOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.MLoadOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.MStore8Operation; -import tech.pegasys.pantheon.ethereum.vm.operations.MStoreOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.SLoadOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.SelfDestructOperation; -import tech.pegasys.pantheon.ethereum.vm.operations.Sha3Operation; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.vm; + +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.mainnet.AbstractMessageProcessor; +import org.hyperledger.besu.ethereum.mainnet.precompiles.ECRECPrecompiledContract; +import org.hyperledger.besu.ethereum.mainnet.precompiles.IDPrecompiledContract; +import org.hyperledger.besu.ethereum.mainnet.precompiles.RIPEMD160PrecompiledContract; +import org.hyperledger.besu.ethereum.mainnet.precompiles.SHA256PrecompiledContract; +import org.hyperledger.besu.ethereum.vm.operations.BalanceOperation; +import org.hyperledger.besu.ethereum.vm.operations.BlockHashOperation; +import org.hyperledger.besu.ethereum.vm.operations.ExpOperation; +import org.hyperledger.besu.ethereum.vm.operations.ExtCodeCopyOperation; +import org.hyperledger.besu.ethereum.vm.operations.ExtCodeHashOperation; +import org.hyperledger.besu.ethereum.vm.operations.ExtCodeSizeOperation; +import org.hyperledger.besu.ethereum.vm.operations.JumpDestOperation; +import org.hyperledger.besu.ethereum.vm.operations.LogOperation; +import org.hyperledger.besu.ethereum.vm.operations.MLoadOperation; +import org.hyperledger.besu.ethereum.vm.operations.MStore8Operation; +import org.hyperledger.besu.ethereum.vm.operations.MStoreOperation; +import org.hyperledger.besu.ethereum.vm.operations.SLoadOperation; +import org.hyperledger.besu.ethereum.vm.operations.SelfDestructOperation; +import org.hyperledger.besu.ethereum.vm.operations.Sha3Operation; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; /** * Provides various gas cost lookups and calculations used during block processing. diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Memory.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Memory.java similarity index 97% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Memory.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Memory.java index f9cb088db4..61c457c921 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Memory.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Memory.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; - -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; -import tech.pegasys.pantheon.util.bytes.MutableBytes32; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; -import tech.pegasys.pantheon.util.uint.UInt256Value; -import tech.pegasys.pantheon.util.uint.UInt256s; +package org.hyperledger.besu.ethereum.vm; + +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.besu.util.bytes.MutableBytes32; +import org.hyperledger.besu.util.bytes.MutableBytesValue; +import org.hyperledger.besu.util.uint.UInt256; +import org.hyperledger.besu.util.uint.UInt256Value; +import org.hyperledger.besu.util.uint.UInt256s; import java.math.BigInteger; import java.util.ArrayList; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/MessageFrame.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/MessageFrame.java similarity index 97% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/MessageFrame.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/MessageFrame.java index 0bc56a0dfe..00dba0028e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/MessageFrame.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/MessageFrame.java @@ -10,25 +10,25 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Log; -import tech.pegasys.pantheon.ethereum.core.LogSeries; -import tech.pegasys.pantheon.ethereum.core.ProcessableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.mainnet.AbstractMessageProcessor; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; -import tech.pegasys.pantheon.util.uint.UInt256Value; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Log; +import org.hyperledger.besu.ethereum.core.LogSeries; +import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.mainnet.AbstractMessageProcessor; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; +import org.hyperledger.besu.util.uint.UInt256Value; import java.util.Deque; import java.util.EnumSet; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperandStack.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperandStack.java similarity index 97% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperandStack.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperandStack.java index 63818f1bd0..15e7538d90 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperandStack.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperandStack.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.Bytes32; /** * An operand stack for the Ethereum Virtual machine (EVM). diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Operation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Operation.java similarity index 92% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Operation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Operation.java index f384921c1b..986b4880f5 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Operation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Operation.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.ehalt.ExceptionalHaltPredicate; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.ehalt.ExceptionalHaltPredicate; import java.util.EnumSet; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperationRegistry.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperationRegistry.java similarity index 97% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperationRegistry.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperationRegistry.java index 59dc96503f..f188705ae3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperationRegistry.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperationRegistry.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; import com.google.common.base.Preconditions; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperationTracer.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperationTracer.java similarity index 85% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperationTracer.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperationTracer.java index e360b4e152..01bc162ff5 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperationTracer.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperationTracer.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.ehalt.ExceptionalHaltException; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.ehalt.ExceptionalHaltException; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/PreAllocatedOperandStack.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/PreAllocatedOperandStack.java similarity index 96% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/PreAllocatedOperandStack.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/PreAllocatedOperandStack.java index b8d66ce26a..faa7aeaf18 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/PreAllocatedOperandStack.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/PreAllocatedOperandStack.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.Bytes32; import java.util.Arrays; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Words.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Words.java similarity index 89% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Words.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Words.java index 3909874cf0..0dc6b2115e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Words.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Words.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytes32; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytes32; /** Static utility methods to work with VM words (that is, {@link Bytes32} values). */ public abstract class Words { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltException.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/ExceptionalHaltException.java similarity index 90% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltException.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/ExceptionalHaltException.java index e3f3b1af18..15ef34bc3f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltException.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/ExceptionalHaltException.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.ehalt; +package org.hyperledger.besu.ethereum.vm.ehalt; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; import java.util.EnumSet; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltManager.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/ExceptionalHaltManager.java similarity index 89% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltManager.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/ExceptionalHaltManager.java index ca02fd6267..4ad57a7a26 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltManager.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/ExceptionalHaltManager.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.ehalt; +package org.hyperledger.besu.ethereum.vm.ehalt; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.MessageFrame; import java.util.Arrays; import java.util.EnumSet; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltPredicate.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/ExceptionalHaltPredicate.java similarity index 79% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltPredicate.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/ExceptionalHaltPredicate.java index 5acf9105ae..655f07084b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltPredicate.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/ExceptionalHaltPredicate.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.ehalt; +package org.hyperledger.besu.ethereum.vm.ehalt; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.MessageFrame; import java.util.EnumSet; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/InsufficientGasExceptionalHaltPredicate.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/InsufficientGasExceptionalHaltPredicate.java similarity index 88% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/InsufficientGasExceptionalHaltPredicate.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/InsufficientGasExceptionalHaltPredicate.java index 572f137146..f90ee3904c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/InsufficientGasExceptionalHaltPredicate.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/InsufficientGasExceptionalHaltPredicate.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.ehalt; +package org.hyperledger.besu.ethereum.vm.ehalt; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.MessageFrame; import java.util.EnumSet; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/InvalidOperationExceptionalHaltPredicate.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/InvalidOperationExceptionalHaltPredicate.java similarity index 84% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/InvalidOperationExceptionalHaltPredicate.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/InvalidOperationExceptionalHaltPredicate.java index 9d080ddac6..5c4f7ce2ed 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/InvalidOperationExceptionalHaltPredicate.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/InvalidOperationExceptionalHaltPredicate.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.ehalt; +package org.hyperledger.besu.ethereum.vm.ehalt; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.MessageFrame; import java.util.EnumSet; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/StackOverflowExceptionalHaltPredicate.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/StackOverflowExceptionalHaltPredicate.java similarity index 81% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/StackOverflowExceptionalHaltPredicate.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/StackOverflowExceptionalHaltPredicate.java index a24456a7af..e80b050ef2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/StackOverflowExceptionalHaltPredicate.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/StackOverflowExceptionalHaltPredicate.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.ehalt; +package org.hyperledger.besu.ethereum.vm.ehalt; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Operation; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Operation; import java.util.EnumSet; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/StackUnderflowExceptionalHaltPredicate.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/StackUnderflowExceptionalHaltPredicate.java similarity index 81% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/StackUnderflowExceptionalHaltPredicate.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/StackUnderflowExceptionalHaltPredicate.java index e32e42bf35..18104bb40f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/StackUnderflowExceptionalHaltPredicate.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ehalt/StackUnderflowExceptionalHaltPredicate.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.ehalt; +package org.hyperledger.besu.ethereum.vm.ehalt; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Operation; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Operation; import java.util.EnumSet; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AbstractCreateOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AbstractCreateOperation.java similarity index 86% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AbstractCreateOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AbstractCreateOperation.java index bb8a23c87e..b3be7aab30 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AbstractCreateOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AbstractCreateOperation.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; - -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.MutableAccount; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.Code; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Words; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.vm.operations; + +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.MutableAccount; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.Code; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Words; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.EnumSet; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AddModOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddModOperation.java similarity index 79% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AddModOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddModOperation.java index f48a3d5dc6..28a276ad58 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AddModOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddModOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class AddModOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AddOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddOperation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AddOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddOperation.java index 1aacae982e..42a42cca31 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AddOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class AddOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AddressOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddressOperation.java similarity index 74% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AddressOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddressOperation.java index d57c248a9f..5f58f9e040 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AddressOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddressOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Words; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Words; public class AddressOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AndOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AndOperation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AndOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AndOperation.java index 46d7def1eb..5b560fa95a 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AndOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AndOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class AndOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/BalanceOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/BalanceOperation.java similarity index 71% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/BalanceOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/BalanceOperation.java index 395b2a61f3..2cdd9d1404 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/BalanceOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/BalanceOperation.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Words; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Words; +import org.hyperledger.besu.util.bytes.Bytes32; public class BalanceOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/BlockHashOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperation.java similarity index 77% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/BlockHashOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperation.java index 347484d231..a0371f840d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/BlockHashOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperation.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.ProcessableBlockHeader; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.BlockHashLookup; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; public class BlockHashOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ByteOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ByteOperation.java similarity index 79% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ByteOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ByteOperation.java index f30c6a5531..251c854ea8 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ByteOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ByteOperation.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; - -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.Counter; -import tech.pegasys.pantheon.util.uint.UInt256; -import tech.pegasys.pantheon.util.uint.UInt256Value; +package org.hyperledger.besu.ethereum.vm.operations; + +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.Counter; +import org.hyperledger.besu.util.uint.UInt256; +import org.hyperledger.besu.util.uint.UInt256Value; public class ByteOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallCodeOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallCodeOperation.java similarity index 84% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallCodeOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallCodeOperation.java index cb8bbb3844..e9504cedd7 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallCodeOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallCodeOperation.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; - -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.vm.AbstractCallOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Words; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.vm.operations; + +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.AbstractCallOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Words; +import org.hyperledger.besu.util.uint.UInt256; public class CallCodeOperation extends AbstractCallOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallDataCopyOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataCopyOperation.java similarity index 79% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallDataCopyOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataCopyOperation.java index e0b71e7202..bc35fb85ff 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallDataCopyOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataCopyOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; - -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.vm.operations; + +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; public class CallDataCopyOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallDataLoadOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataLoadOperation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallDataLoadOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataLoadOperation.java index f1aaaf0614..f14e7cfc0d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallDataLoadOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataLoadOperation.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytes32; +import org.hyperledger.besu.util.uint.UInt256; public class CallDataLoadOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallDataSizeOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataSizeOperation.java similarity index 74% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallDataSizeOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataSizeOperation.java index 346ce7ad31..48755de818 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallDataSizeOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataSizeOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256Bytes; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256Bytes; public class CallDataSizeOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallOperation.java similarity index 84% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallOperation.java index 6e125aeb5b..5b0925b4d7 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallOperation.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; - -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.vm.AbstractCallOperation; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Words; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.vm.operations; + +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.AbstractCallOperation; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Words; +import org.hyperledger.besu.util.uint.UInt256; import java.util.EnumSet; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallValueOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallValueOperation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallValueOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallValueOperation.java index c1e395ebb5..13b2bc9e84 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallValueOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallValueOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; public class CallValueOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallerOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallerOperation.java similarity index 74% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallerOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallerOperation.java index 59d1b00628..e28d3a97e2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallerOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallerOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Words; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Words; public class CallerOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ChainIdOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ChainIdOperation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ChainIdOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ChainIdOperation.java index 1f3f6830ac..eae358b3c7 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ChainIdOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ChainIdOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; public class ChainIdOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CodeCopyOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CodeCopyOperation.java similarity index 79% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CodeCopyOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CodeCopyOperation.java index 1bdc5bbfae..6d018b2824 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CodeCopyOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CodeCopyOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; - -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.Code; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.vm.operations; + +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.Code; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class CodeCopyOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CodeSizeOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CodeSizeOperation.java similarity index 73% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CodeSizeOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CodeSizeOperation.java index ac5a932725..1c6d72cc00 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CodeSizeOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CodeSizeOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.Code; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256Bytes; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.Code; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256Bytes; public class CodeSizeOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CoinbaseOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CoinbaseOperation.java similarity index 74% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CoinbaseOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CoinbaseOperation.java index 02ef1374be..82048fa5c3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CoinbaseOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CoinbaseOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Words; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Words; public class CoinbaseOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/Create2Operation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/Create2Operation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/Create2Operation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/Create2Operation.java index b3d054a0e9..aa8f1ea115 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/Create2Operation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/Create2Operation.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; public class Create2Operation extends AbstractCreateOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CreateOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CreateOperation.java similarity index 79% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CreateOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CreateOperation.java index e5061312a4..0fd10264ac 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CreateOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CreateOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; public class CreateOperation extends AbstractCreateOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DelegateCallOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DelegateCallOperation.java similarity index 84% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DelegateCallOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DelegateCallOperation.java index 92fdf1ffa3..183bf36670 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DelegateCallOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DelegateCallOperation.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; - -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.vm.AbstractCallOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Words; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.vm.operations; + +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.AbstractCallOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Words; +import org.hyperledger.besu.util.uint.UInt256; public class DelegateCallOperation extends AbstractCallOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DifficultyOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DifficultyOperation.java similarity index 77% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DifficultyOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DifficultyOperation.java index b35195a333..e63cadbdf2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DifficultyOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DifficultyOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class DifficultyOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DivOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DivOperation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DivOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DivOperation.java index 69cc1788a8..f6acc367cb 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DivOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DivOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class DivOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DupOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DupOperation.java similarity index 80% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DupOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DupOperation.java index 8ac617a41b..9c1e69a3e2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DupOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DupOperation.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; public class DupOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/EqOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/EqOperation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/EqOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/EqOperation.java index 935ca72606..c642b10dea 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/EqOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/EqOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; public class EqOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExpOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExpOperation.java similarity index 80% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExpOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExpOperation.java index 4b801d7e89..fa7608a797 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExpOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExpOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class ExpOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeCopyOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeCopyOperation.java similarity index 75% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeCopyOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeCopyOperation.java index 48cc4fd8d3..1fac219ea1 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeCopyOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeCopyOperation.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; - -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Words; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.vm.operations; + +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Words; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; public class ExtCodeCopyOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeHashOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeHashOperation.java similarity index 72% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeHashOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeHashOperation.java index 13f4e65295..4cf5f6833a 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeHashOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeHashOperation.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Words; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Words; +import org.hyperledger.besu.util.bytes.Bytes32; public class ExtCodeHashOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeSizeOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeSizeOperation.java similarity index 69% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeSizeOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeSizeOperation.java index caa8c63371..6a023dc797 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeSizeOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeSizeOperation.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Words; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256Bytes; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Words; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256Bytes; public class ExtCodeSizeOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GasLimitOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasLimitOperation.java similarity index 75% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GasLimitOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasLimitOperation.java index 2c09dddb56..b16d285be6 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GasLimitOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasLimitOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; public class GasLimitOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GasOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasOperation.java similarity index 74% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GasOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasOperation.java index 681dd73fb9..d75ebd4a68 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GasOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; public class GasOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GasPriceOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasPriceOperation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GasPriceOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasPriceOperation.java index 61e45263fa..1ebf071c1f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GasPriceOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasPriceOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; public class GasPriceOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GtOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GtOperation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GtOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GtOperation.java index 4420f759db..1595c336b7 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GtOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GtOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; public class GtOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/InvalidOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/InvalidOperation.java similarity index 75% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/InvalidOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/InvalidOperation.java index ba28487c9b..762675ef1c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/InvalidOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/InvalidOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; public class InvalidOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/IsZeroOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/IsZeroOperation.java similarity index 74% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/IsZeroOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/IsZeroOperation.java index 20e4ac71f4..8e2134ce61 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/IsZeroOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/IsZeroOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; public class IsZeroOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/JumpDestOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpDestOperation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/JumpDestOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpDestOperation.java index 606155a581..8188a85bf1 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/JumpDestOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpDestOperation.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; public class JumpDestOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/JumpOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpOperation.java similarity index 77% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/JumpOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpOperation.java index 594687e368..bee1a373b2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/JumpOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpOperation.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; - -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.Code; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.vm.operations; + +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.Code; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; import java.util.EnumSet; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/JumpiOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpiOperation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/JumpiOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpiOperation.java index 1827c28766..fb3ba286bf 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/JumpiOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpiOperation.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.Code; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.Code; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; import java.util.EnumSet; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/LogOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/LogOperation.java similarity index 77% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/LogOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/LogOperation.java index b74b1164db..0de77805e8 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/LogOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/LogOperation.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Log; -import tech.pegasys.pantheon.ethereum.core.LogTopic; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Log; +import org.hyperledger.besu.ethereum.core.LogTopic; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.EnumSet; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/LtOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/LtOperation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/LtOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/LtOperation.java index 9baa3982c4..775227de71 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/LtOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/LtOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; public class LtOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MLoadOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MLoadOperation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MLoadOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MLoadOperation.java index 8055f9b39d..fb5e800be7 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MLoadOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MLoadOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; - -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.vm.operations; + +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; public class MLoadOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MSizeOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MSizeOperation.java similarity index 75% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MSizeOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MSizeOperation.java index b239a6f046..e10cce0b8f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MSizeOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MSizeOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256Bytes; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256Bytes; public class MSizeOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MStore8Operation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MStore8Operation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MStore8Operation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MStore8Operation.java index 594ac49c68..f1a2cea18c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MStore8Operation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MStore8Operation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; public class MStore8Operation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MStoreOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MStoreOperation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MStoreOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MStoreOperation.java index d231e6c714..a457f95ae0 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MStoreOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MStoreOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; public class MStoreOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ModOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ModOperation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ModOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ModOperation.java index 27422386db..3014cc323b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ModOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ModOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class ModOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MulModOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MulModOperation.java similarity index 79% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MulModOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MulModOperation.java index 900c97bc86..b76b7b0b54 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MulModOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MulModOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class MulModOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MulOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MulOperation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MulOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MulOperation.java index 0c74542ba0..92394bc32a 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MulOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MulOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class MulOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/NotOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/NotOperation.java similarity index 77% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/NotOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/NotOperation.java index 64c07ce128..3efc1b8146 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/NotOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/NotOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class NotOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/NumberOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/NumberOperation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/NumberOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/NumberOperation.java index fbe8631ef9..307557e9ef 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/NumberOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/NumberOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256Bytes; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256Bytes; public class NumberOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/OrOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/OrOperation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/OrOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/OrOperation.java index 48a0fd1c3f..84b37b5abf 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/OrOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/OrOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class OrOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/OriginOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/OriginOperation.java similarity index 74% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/OriginOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/OriginOperation.java index 2af1b8dc64..8af2f3e6f9 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/OriginOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/OriginOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Words; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Words; public class OriginOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/PCOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PCOperation.java similarity index 75% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/PCOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PCOperation.java index b64b3cc0cd..f5fe1a7882 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/PCOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PCOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256Bytes; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256Bytes; public class PCOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/PopOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PopOperation.java similarity index 77% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/PopOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PopOperation.java index 4539f75971..1f9ada986f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/PopOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PopOperation.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; public class PopOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/PushOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PushOperation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/PushOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PushOperation.java index 1db4d68ad7..88e0f41925 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/PushOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PushOperation.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; import static java.lang.Math.min; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytes32; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytes32; public class PushOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ReturnDataCopyOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnDataCopyOperation.java similarity index 82% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ReturnDataCopyOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnDataCopyOperation.java index c4c033ed60..da40ec7afa 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ReturnDataCopyOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnDataCopyOperation.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.EnumSet; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ReturnDataSizeOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnDataSizeOperation.java similarity index 74% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ReturnDataSizeOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnDataSizeOperation.java index 3a55af8be8..0a2eb001e0 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ReturnDataSizeOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnDataSizeOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256Bytes; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256Bytes; public class ReturnDataSizeOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ReturnOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnOperation.java similarity index 80% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ReturnOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnOperation.java index a70f530830..1b19a98b38 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ReturnOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class ReturnOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/RevertOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/RevertOperation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/RevertOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/RevertOperation.java index 916ac270b3..a00a6ce3ae 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/RevertOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/RevertOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; public class RevertOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SDivOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SDivOperation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SDivOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SDivOperation.java index 057c3ada10..2059836233 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SDivOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SDivOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.Int256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.Int256; public class SDivOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SGtOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SGtOperation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SGtOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SGtOperation.java index e110d09441..3bd057259f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SGtOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SGtOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.Int256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.Int256; public class SGtOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SLoadOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SLoadOperation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SLoadOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SLoadOperation.java index 369c38c43b..35c935565d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SLoadOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SLoadOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class SLoadOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SLtOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SLtOperation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SLtOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SLtOperation.java index 36217b2a9a..dc3812ceb2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SLtOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SLtOperation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.Int256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.Int256; public class SLtOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SModOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SModOperation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SModOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SModOperation.java index ed725f5948..76c0184bc2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SModOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SModOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.Int256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.Int256; public class SModOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SStoreOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SStoreOperation.java similarity index 81% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SStoreOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SStoreOperation.java index 569a582dda..ec59c0f695 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SStoreOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SStoreOperation.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.MutableAccount; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.MutableAccount; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; import java.util.EnumSet; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SarOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SarOperation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SarOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SarOperation.java index 2875edded6..01b658639f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SarOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SarOperation.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import static tech.pegasys.pantheon.util.uint.UInt256s.greaterThanOrEqualTo256; +import static org.hyperledger.besu.util.uint.UInt256s.greaterThanOrEqualTo256; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.Bytes32s; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.Bytes32s; +import org.hyperledger.besu.util.uint.UInt256; public class SarOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SelfBalanceOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SelfBalanceOperation.java similarity index 73% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SelfBalanceOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SelfBalanceOperation.java index d6419ebbe0..3999f8f5fe 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SelfBalanceOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SelfBalanceOperation.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; public class SelfBalanceOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SelfDestructOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SelfDestructOperation.java similarity index 77% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SelfDestructOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SelfDestructOperation.java index ff058e0e02..af981a9f81 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SelfDestructOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SelfDestructOperation.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.MutableAccount; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.EVM; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Words; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.MutableAccount; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.EVM; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Words; import java.util.EnumSet; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/Sha3Operation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/Sha3Operation.java similarity index 75% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/Sha3Operation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/Sha3Operation.java index 3b6b123aaa..a396d750cc 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/Sha3Operation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/Sha3Operation.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; public class Sha3Operation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ShlOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ShlOperation.java similarity index 71% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ShlOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ShlOperation.java index 04e38b63d7..1fcf2d5447 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ShlOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ShlOperation.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import static tech.pegasys.pantheon.util.uint.UInt256s.greaterThanOrEqualTo256; +import static org.hyperledger.besu.util.uint.UInt256s.greaterThanOrEqualTo256; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.Bytes32s; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.Bytes32s; +import org.hyperledger.besu.util.uint.UInt256; public class ShlOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ShrOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ShrOperation.java similarity index 71% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ShrOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ShrOperation.java index 43f9d0e13f..c1836069c5 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ShrOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ShrOperation.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import static tech.pegasys.pantheon.util.uint.UInt256s.greaterThanOrEqualTo256; +import static org.hyperledger.besu.util.uint.UInt256s.greaterThanOrEqualTo256; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.Bytes32s; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.Bytes32s; +import org.hyperledger.besu.util.uint.UInt256; public class ShrOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SignExtendOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SignExtendOperation.java similarity index 79% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SignExtendOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SignExtendOperation.java index 6442458a69..ed5517d15d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SignExtendOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SignExtendOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class SignExtendOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/StaticCallOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/StaticCallOperation.java similarity index 84% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/StaticCallOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/StaticCallOperation.java index af514d2cfc..8730ce6c19 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/StaticCallOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/StaticCallOperation.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; - -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.vm.AbstractCallOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Words; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.vm.operations; + +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.AbstractCallOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Words; +import org.hyperledger.besu.util.uint.UInt256; public class StaticCallOperation extends AbstractCallOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/StopOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/StopOperation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/StopOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/StopOperation.java index f6b96940fa..9a90128887 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/StopOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/StopOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; public class StopOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SubOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SubOperation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SubOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SubOperation.java index 0b4bd8c450..26a97c27f8 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SubOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SubOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class SubOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SwapOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SwapOperation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SwapOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SwapOperation.java index 2b866e5c3c..37c5964544 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SwapOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SwapOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; public class SwapOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/TimestampOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/TimestampOperation.java similarity index 76% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/TimestampOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/TimestampOperation.java index b93fb6075a..ab5e565dbc 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/TimestampOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/TimestampOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256Bytes; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256Bytes; public class TimestampOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/XorOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/XorOperation.java similarity index 78% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/XorOperation.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/XorOperation.java index a8e51a81ee..2ab6092ffc 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/XorOperation.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/XorOperation.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.AbstractOperation; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.AbstractOperation; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.uint.UInt256; public class XorOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutableWorldState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutableWorldState.java similarity index 93% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutableWorldState.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutableWorldState.java index b65cbfffa4..bfffaf0d63 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutableWorldState.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutableWorldState.java @@ -10,26 +10,26 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.worldstate; - -import tech.pegasys.pantheon.ethereum.core.AbstractWorldUpdater; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.AccountState; -import tech.pegasys.pantheon.ethereum.core.AccountStorageEntry; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.trie.MerklePatriciaTrie; -import tech.pegasys.pantheon.ethereum.trie.StoredMerklePatriciaTrie; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.worldstate; + +import org.hyperledger.besu.ethereum.core.AbstractWorldUpdater; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.AccountState; +import org.hyperledger.besu.ethereum.core.AccountStorageEntry; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie; +import org.hyperledger.besu.ethereum.trie.StoredMerklePatriciaTrie; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/MarkSweepPruner.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/MarkSweepPruner.java similarity index 87% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/MarkSweepPruner.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/MarkSweepPruner.java index 9dec4997bd..63a5cf57f1 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/MarkSweepPruner.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/MarkSweepPruner.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.worldstate; - -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.trie.MerklePatriciaTrie; -import tech.pegasys.pantheon.ethereum.trie.StoredMerklePatriciaTrie; -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageTransaction; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.worldstate; + +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie; +import org.hyperledger.besu.ethereum.trie.StoredMerklePatriciaTrie; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.metrics.ObservableMetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collection; import java.util.Collections; @@ -75,23 +75,21 @@ public class MarkSweepPruner { markedNodesCounter = metricsSystem.createCounter( - PantheonMetricCategory.PRUNER, + BesuMetricCategory.PRUNER, "marked_nodes_total", "Total number of nodes marked as in use"); markOperationCounter = metricsSystem.createCounter( - PantheonMetricCategory.PRUNER, + BesuMetricCategory.PRUNER, "mark_operations_total", "Total number of mark operations performed"); sweptNodesCounter = metricsSystem.createCounter( - PantheonMetricCategory.PRUNER, - "swept_nodes_total", - "Total number of unused nodes removed"); + BesuMetricCategory.PRUNER, "swept_nodes_total", "Total number of unused nodes removed"); sweepOperationCounter = metricsSystem.createCounter( - PantheonMetricCategory.PRUNER, + BesuMetricCategory.PRUNER, "sweep_operations_total", "Total number of sweep operations performed"); } diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/Pruner.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/Pruner.java similarity index 93% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/Pruner.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/Pruner.java index 8f5d291e44..5dd7071472 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/Pruner.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/Pruner.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.worldstate; +package org.hyperledger.besu.ethereum.worldstate; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/PruningConfiguration.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/PruningConfiguration.java similarity index 95% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/PruningConfiguration.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/PruningConfiguration.java index 650946ac47..b12bdad583 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/PruningConfiguration.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/PruningConfiguration.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.worldstate; +package org.hyperledger.besu.ethereum.worldstate; public class PruningConfiguration { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/StateTrieAccountValue.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/StateTrieAccountValue.java similarity index 91% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/StateTrieAccountValue.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/StateTrieAccountValue.java index e55d11e2d5..6c361f7185 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/StateTrieAccountValue.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/StateTrieAccountValue.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.worldstate; +package org.hyperledger.besu.ethereum.worldstate; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; /** Represents the raw values associated with an account in the world state trie. */ public class StateTrieAccountValue { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/WorldStateArchive.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStateArchive.java similarity index 80% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/WorldStateArchive.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStateArchive.java index 973c8d2b51..99d5bd593d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/WorldStateArchive.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStateArchive.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.worldstate; +package org.hyperledger.besu.ethereum.worldstate; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.proof.WorldStateProof; -import tech.pegasys.pantheon.ethereum.proof.WorldStateProofProvider; -import tech.pegasys.pantheon.ethereum.trie.MerklePatriciaTrie; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.proof.WorldStateProof; +import org.hyperledger.besu.ethereum.proof.WorldStateProofProvider; +import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.List; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/WorldStatePreimageStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStatePreimageStorage.java similarity index 83% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/WorldStatePreimageStorage.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStatePreimageStorage.java index b0303ad215..e58b35a354 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/WorldStatePreimageStorage.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStatePreimageStorage.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.worldstate; +package org.hyperledger.besu.ethereum.worldstate; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/WorldStateStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStateStorage.java similarity index 90% rename from ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/WorldStateStorage.java rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStateStorage.java index a54f5e1637..f3330f11f4 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/WorldStateStorage.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStateStorage.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.worldstate; +package org.hyperledger.besu.ethereum.worldstate; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collection; import java.util.Optional; diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/AddressHelpers.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/AddressHelpers.java similarity index 97% rename from ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/AddressHelpers.java rename to ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/AddressHelpers.java index 9c33377796..6765fcd9d8 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/AddressHelpers.java +++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/AddressHelpers.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import java.math.BigInteger; diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockDataGenerator.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockDataGenerator.java similarity index 96% rename from ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockDataGenerator.java rename to ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockDataGenerator.java index fbfc873726..64bc6efa89 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockDataGenerator.java +++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockDataGenerator.java @@ -10,19 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static com.google.common.base.Preconditions.checkArgument; import static java.util.stream.Collectors.toSet; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SecureRandomProvider; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SecureRandomProvider; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.security.InvalidAlgorithmParameterException; @@ -173,12 +172,12 @@ public class BlockDataGenerator { } public List blockSequence(final int count) { - final WorldStateArchive worldState = createInMemoryWorldStateArchive(); + final WorldStateArchive worldState = InMemoryStorageProvider.createInMemoryWorldStateArchive(); return blockSequence(count, worldState, Collections.emptyList(), Collections.emptyList()); } public List blockSequence(final Block previousBlock, final int count) { - final WorldStateArchive worldState = createInMemoryWorldStateArchive(); + final WorldStateArchive worldState = InMemoryStorageProvider.createInMemoryWorldStateArchive(); Hash parentHash = previousBlock.getHeader().getHash(); long blockNumber = previousBlock.getHeader().getNumber() + 1; return blockSequence( diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderTestFixture.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockHeaderTestFixture.java similarity index 94% rename from ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderTestFixture.java rename to ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockHeaderTestFixture.java index c5e4bc73a2..f5797f1cd5 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderTestFixture.java +++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockHeaderTestFixture.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; public class BlockHeaderTestFixture { diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockSyncTestUtils.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockSyncTestUtils.java similarity index 86% rename from ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockSyncTestUtils.java rename to ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockSyncTestUtils.java index 6a28357547..d1cb5c1e7a 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockSyncTestUtils.java +++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockSyncTestUtils.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.util.RawBlockIterator; -import tech.pegasys.pantheon.testutil.BlockTestUtil; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.util.RawBlockIterator; +import org.hyperledger.besu.testutil.BlockTestUtil; import java.io.IOException; import java.nio.file.Path; diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockchainSetupUtil.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockchainSetupUtil.java similarity index 86% rename from ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockchainSetupUtil.java rename to ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockchainSetupUtil.java index f232ab1ef5..e2eb9102eb 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockchainSetupUtil.java +++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockchainSetupUtil.java @@ -10,26 +10,26 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static org.assertj.core.util.Preconditions.checkArgument; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; - -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.GenesisState; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.util.RawBlockIterator; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.testutil.BlockTestUtil; -import tech.pegasys.pantheon.testutil.BlockTestUtil.ChainResources; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; + +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.GenesisState; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.util.RawBlockIterator; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.testutil.BlockTestUtil; +import org.hyperledger.besu.testutil.BlockTestUtil.ChainResources; import java.io.IOException; import java.net.URISyntaxException; diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/ExecutionContextTestFixture.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/ExecutionContextTestFixture.java similarity index 76% rename from ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/ExecutionContextTestFixture.java rename to ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/ExecutionContextTestFixture.java index 7d6bc47b30..d1b75da73a 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/ExecutionContextTestFixture.java +++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/ExecutionContextTestFixture.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; - -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; - -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.config.StubGenesisConfigOptions; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.DefaultBlockchain; -import tech.pegasys.pantheon.ethereum.chain.GenesisState; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolScheduleBuilder; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +package org.hyperledger.besu.ethereum.core; + +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; + +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.config.StubGenesisConfigOptions; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.DefaultBlockchain; +import org.hyperledger.besu.ethereum.chain.GenesisState; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; import java.math.BigInteger; import java.util.function.Function; diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/InMemoryStorageProvider.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/InMemoryStorageProvider.java similarity index 65% rename from ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/InMemoryStorageProvider.java rename to ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/InMemoryStorageProvider.java index 8df4550cdc..f4bf9a95da 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/InMemoryStorageProvider.java +++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/InMemoryStorageProvider.java @@ -10,29 +10,29 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.ethereum.chain.BlockchainStorage; -import tech.pegasys.pantheon.ethereum.chain.DefaultBlockchain; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.privacy.PrivateStateKeyValueStorage; -import tech.pegasys.pantheon.ethereum.privacy.PrivateStateStorage; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionKeyValueStorage; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionStorage; -import tech.pegasys.pantheon.ethereum.storage.StorageProvider; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStateKeyValueStorage; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage; -import tech.pegasys.pantheon.ethereum.worldstate.DefaultMutableWorldState; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStatePreimageStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import org.hyperledger.besu.ethereum.chain.BlockchainStorage; +import org.hyperledger.besu.ethereum.chain.DefaultBlockchain; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.privacy.PrivateStateKeyValueStorage; +import org.hyperledger.besu.ethereum.privacy.PrivateStateStorage; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionKeyValueStorage; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionStorage; +import org.hyperledger.besu.ethereum.storage.StorageProvider; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage; +import org.hyperledger.besu.ethereum.worldstate.DefaultMutableWorldState; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; public class InMemoryStorageProvider implements StorageProvider { diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/MessageFrameTestFixture.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/MessageFrameTestFixture.java similarity index 92% rename from ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/MessageFrameTestFixture.java rename to ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/MessageFrameTestFixture.java index 717676a019..4574cf273e 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/MessageFrameTestFixture.java +++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/MessageFrameTestFixture.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import static tech.pegasys.pantheon.ethereum.vm.MessageFrame.DEFAULT_MAX_STACK_SIZE; +import static org.hyperledger.besu.ethereum.vm.MessageFrame.DEFAULT_MAX_STACK_SIZE; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; -import tech.pegasys.pantheon.ethereum.vm.Code; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame.Type; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.vm.BlockHashLookup; +import org.hyperledger.besu.ethereum.vm.Code; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.MessageFrame.Type; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/MiningParametersTestBuilder.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/MiningParametersTestBuilder.java similarity index 93% rename from ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/MiningParametersTestBuilder.java rename to ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/MiningParametersTestBuilder.java index 27e5933911..6109c1d97f 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/MiningParametersTestBuilder.java +++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/MiningParametersTestBuilder.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; public class MiningParametersTestBuilder { diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/PrivateTransactionTestFixture.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionTestFixture.java similarity index 92% rename from ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/PrivateTransactionTestFixture.java rename to ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionTestFixture.java index 4f8e647792..e2870bcf1d 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/PrivateTransactionTestFixture.java +++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionTestFixture.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.ethereum.privacy.Restriction; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.ethereum.privacy.Restriction; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.math.BigInteger; import java.util.List; diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/TestCodeExecutor.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TestCodeExecutor.java similarity index 84% rename from ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/TestCodeExecutor.java rename to ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TestCodeExecutor.java index 9e1c3876a6..3f3a0057b3 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/TestCodeExecutor.java +++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TestCodeExecutor.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetMessageCallProcessor; -import tech.pegasys.pantheon.ethereum.mainnet.PrecompileContractRegistry; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.vm.Code; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.OperationTracer; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.mainnet.MainnetMessageCallProcessor; +import org.hyperledger.besu.ethereum.mainnet.PrecompileContractRegistry; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.vm.Code; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.OperationTracer; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; import java.util.ArrayDeque; diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/TransactionTestFixture.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java similarity index 93% rename from ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/TransactionTestFixture.java rename to ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java index dd14d0f912..91077b3b40 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/TransactionTestFixture.java +++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; import java.util.Optional; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/chain/DefaultBlockchainTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchainTest.java similarity index 93% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/chain/DefaultBlockchainTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchainTest.java index 538ac7cbc2..a68aff3a0b 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/chain/DefaultBlockchainTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchainTest.java @@ -10,24 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.chain; +package org.hyperledger.besu.ethereum.chain; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator.BlockOptions; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.Collections; @@ -152,8 +151,10 @@ public class DefaultBlockchainTest { final Block genesisBlock = gen.genesisBlock(); final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, genesisBlock); - final BlockOptions options = - new BlockOptions().setBlockNumber(1L).setParentHash(genesisBlock.getHash()); + final BlockDataGenerator.BlockOptions options = + new BlockDataGenerator.BlockOptions() + .setBlockNumber(1L) + .setParentHash(genesisBlock.getHash()); final Block newBlock = gen.block(options); final List receipts = gen.receipts(newBlock); blockchain.appendBlock(newBlock, receipts); @@ -171,7 +172,8 @@ public class DefaultBlockchainTest { final Block genesisBlock = gen.genesisBlock(); final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, genesisBlock); - final BlockOptions options = new BlockOptions().setBlockNumber(1L).setParentHash(Hash.ZERO); + final BlockDataGenerator.BlockOptions options = + new BlockDataGenerator.BlockOptions().setBlockNumber(1L).setParentHash(Hash.ZERO); final Block newBlock = gen.block(options); final List receipts = gen.receipts(newBlock); blockchain.appendBlock(newBlock, receipts); @@ -185,8 +187,10 @@ public class DefaultBlockchainTest { final Block genesisBlock = gen.genesisBlock(); final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, genesisBlock); - final BlockOptions options = - new BlockOptions().setBlockNumber(1L).setParentHash(genesisBlock.getHash()); + final BlockDataGenerator.BlockOptions options = + new BlockDataGenerator.BlockOptions() + .setBlockNumber(1L) + .setParentHash(genesisBlock.getHash()); final Block newBlock = gen.block(options); final List receipts = gen.receipts(newBlock); receipts.add(gen.receipt()); @@ -236,8 +240,8 @@ public class DefaultBlockchainTest { // Create parallel fork of length 1 final int forkBlock = 2; final int commonAncestor = 1; - final BlockOptions options = - new BlockOptions() + final BlockDataGenerator.BlockOptions options = + new BlockDataGenerator.BlockOptions() .setParentHash(chain.get(commonAncestor).getHash()) .setBlockNumber(forkBlock) .setDifficulty(chain.get(forkBlock).getHeader().getDifficulty().plus(10L)); @@ -294,8 +298,8 @@ public class DefaultBlockchainTest { final int forkStart = 1; final int commonAncestor = 0; // Generate first block - BlockOptions options = - new BlockOptions() + BlockDataGenerator.BlockOptions options = + new BlockDataGenerator.BlockOptions() .setParentHash(chain.get(commonAncestor).getHash()) .setBlockNumber(forkStart) .setDifficulty(chain.get(forkStart).getHeader().getDifficulty().minus(5L)); @@ -308,7 +312,7 @@ public class DefaultBlockchainTest { .getDifficulty() .plus(chain.get(forkStart + 2).getHeader().getDifficulty()); options = - new BlockOptions() + new BlockDataGenerator.BlockOptions() .setParentHash(forkBlocks.get(0).getHash()) .setBlockNumber(forkStart + 1) .setDifficulty(remainingDifficultyToOutpace.plus(10L)); @@ -392,15 +396,15 @@ public class DefaultBlockchainTest { final int forkStart = 3; final int commonAncestor = 2; // Generate first block - BlockOptions options = - new BlockOptions() + BlockDataGenerator.BlockOptions options = + new BlockDataGenerator.BlockOptions() .setParentHash(chain.get(commonAncestor).getHash()) .setBlockNumber(forkStart) .setDifficulty(chain.get(forkStart).getHeader().getDifficulty().minus(5L)); forkBlocks.add(gen.block(options)); // Generate second block options = - new BlockOptions() + new BlockDataGenerator.BlockOptions() .setParentHash(forkBlocks.get(0).getHash()) .setBlockNumber(forkStart + 1) .setDifficulty(UInt256.of(10L)); @@ -479,8 +483,8 @@ public class DefaultBlockchainTest { // Create parallel fork of length 1 final int forkBlock = 2; final int commonAncestor = 1; - final BlockOptions options = - new BlockOptions() + final BlockDataGenerator.BlockOptions options = + new BlockDataGenerator.BlockOptions() .setParentHash(chain.get(commonAncestor).getHash()) .setBlockNumber(forkBlock) .setDifficulty(chain.get(forkBlock).getHeader().getDifficulty().plus(10L)) @@ -573,15 +577,15 @@ public class DefaultBlockchainTest { final int forkStart = 2; final int commonAncestor = 1; // Generate first block - BlockOptions options = - new BlockOptions() + BlockDataGenerator.BlockOptions options = + new BlockDataGenerator.BlockOptions() .setParentHash(chain.get(commonAncestor).getHash()) .setBlockNumber(forkStart) .setDifficulty(chain.get(forkStart).getHeader().getDifficulty().minus(5L)); forkBlocks.add(gen.block(options)); // Generate second block options = - new BlockOptions() + new BlockDataGenerator.BlockOptions() .setParentHash(forkBlocks.get(0).getHash()) .setBlockNumber(forkStart + 1) .setDifficulty(chain.get(forkStart + 1).getHeader().getDifficulty().minus(5L)); @@ -615,7 +619,7 @@ public class DefaultBlockchainTest { // Add another independent fork options = - new BlockOptions() + new BlockDataGenerator.BlockOptions() .setParentHash(chain.get(commonAncestor).getHash()) .setBlockNumber(forkStart) .setDifficulty(chain.get(forkStart).getHeader().getDifficulty().minus(5L)); @@ -705,8 +709,10 @@ public class DefaultBlockchainTest { final Block genesisBlock = gen.genesisBlock(); final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, genesisBlock); - final BlockOptions options = - new BlockOptions().setBlockNumber(1L).setParentHash(genesisBlock.getHash()); + final BlockDataGenerator.BlockOptions options = + new BlockDataGenerator.BlockOptions() + .setBlockNumber(1L) + .setParentHash(genesisBlock.getHash()); final Block newBlock = gen.block(options); final List receipts = gen.receipts(newBlock); @@ -726,8 +732,10 @@ public class DefaultBlockchainTest { final Block genesisBlock = gen.genesisBlock(); final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, genesisBlock); - final BlockOptions options = - new BlockOptions().setBlockNumber(1L).setParentHash(genesisBlock.getHash()); + final BlockDataGenerator.BlockOptions options = + new BlockDataGenerator.BlockOptions() + .setBlockNumber(1L) + .setParentHash(genesisBlock.getHash()); final Block newBlock = gen.block(options); final List receipts = gen.receipts(newBlock); diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/chain/GenesisStateTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/GenesisStateTest.java similarity index 95% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/chain/GenesisStateTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/GenesisStateTest.java index 9d1e483cc3..2e637c141d 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/chain/GenesisStateTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/GenesisStateTest.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.chain; +package org.hyperledger.besu.ethereum.chain; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldState; - -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; + +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import com.google.common.base.Charsets; import com.google.common.io.Resources; @@ -59,7 +59,7 @@ public final class GenesisStateTest { assertThat(header.getOmmersHash()).isEqualTo(Hash.EMPTY_LIST_HASH); assertThat(header.getExtraData()).isEqualTo(BytesValue.EMPTY); assertThat(header.getParentHash()).isEqualTo(Hash.ZERO); - final MutableWorldState worldState = createInMemoryWorldState(); + final MutableWorldState worldState = InMemoryStorageProvider.createInMemoryWorldState(); genesisState.writeStateTo(worldState); final Account first = worldState.get(Address.fromHexString("0x0000000000000000000000000000000000000001")); @@ -95,7 +95,7 @@ public final class GenesisStateTest { final BlockHeader header = genesisState.getBlock().getHeader(); assertThat(header.getHash()).isEqualTo(Hash.fromHexString(blockHash)); - final MutableWorldState worldState = createInMemoryWorldState(); + final MutableWorldState worldState = InMemoryStorageProvider.createInMemoryWorldState(); genesisState.writeStateTo(worldState); final Account contract = worldState.get(Address.fromHexString("0x3850000000000000000000000000000000000000")); diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/AccountTransactionOrderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/AccountTransactionOrderTest.java similarity index 96% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/AccountTransactionOrderTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/AccountTransactionOrderTest.java index c131fd8703..3533e70934 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/AccountTransactionOrderTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/AccountTransactionOrderTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; import java.util.stream.Stream; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderMock.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/BlockHeaderMock.java similarity index 87% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderMock.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/BlockHeaderMock.java index f9b6047683..dd5a8eaed6 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderMock.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/BlockHeaderMock.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.vm.TestBlockchain; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.vm.TestBlockchain; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/HashTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/HashTest.java similarity index 95% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/HashTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/HashTest.java index 3ab6fa0a0a..f5f4ad1751 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/HashTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/HashTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/LogTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogTest.java similarity index 91% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/LogTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogTest.java index 3f048812f7..35fc340b00 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/LogTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLP; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/LogsBloomFilterTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTest.java similarity index 95% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/LogsBloomFilterTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTest.java index 53c16c0b3e..cfbb69cfbe 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/LogsBloomFilterTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/LogsBloomFilterTestCaseSpec.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTestCaseSpec.java similarity index 92% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/LogsBloomFilterTestCaseSpec.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTestCaseSpec.java index 1ab003c5bf..9aae817c89 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/LogsBloomFilterTestCaseSpec.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTestCaseSpec.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.ethereum.vm.LogMock; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.vm.LogMock; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionIntegrationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionIntegrationTest.java similarity index 95% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionIntegrationTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionIntegrationTest.java index 61bda28944..6bcb1936f3 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionIntegrationTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionIntegrationTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionReceiptTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionReceiptTest.java similarity index 90% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionReceiptTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionReceiptTest.java index df6b7bd1d6..fa3f3ddbba 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionReceiptTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionReceiptTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java similarity index 91% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java index 4506b97cd1..5085db998e 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assume.assumeTrue; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.vm.ReferenceTestProtocolSchedules; -import tech.pegasys.pantheon.testutil.JsonTestParameters; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.vm.ReferenceTestProtocolSchedules; +import org.hyperledger.besu.testutil.JsonTestParameters; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collection; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionTestCaseSpec.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionTestCaseSpec.java similarity index 96% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionTestCaseSpec.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionTestCaseSpec.java index 9997c4a015..1dc1fbfbf4 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionTestCaseSpec.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionTestCaseSpec.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.HashMap; import java.util.Map; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/UtilTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/UtilTest.java similarity index 96% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/UtilTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/UtilTest.java index ca2f6ad056..be59f3d87f 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/UtilTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/UtilTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.core; +package org.hyperledger.besu.ethereum.core; import static org.assertj.core.api.Java6Assertions.assertThat; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/difficulty/fixed/FixedProtocolScheduleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedProtocolScheduleTest.java similarity index 85% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/difficulty/fixed/FixedProtocolScheduleTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedProtocolScheduleTest.java index df66f56073..0f17b41667 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/difficulty/fixed/FixedProtocolScheduleTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedProtocolScheduleTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.difficulty.fixed; +package org.hyperledger.besu.ethereum.difficulty.fixed; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/BlockHeaderValidatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/BlockHeaderValidatorTest.java similarity index 97% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/BlockHeaderValidatorTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/BlockHeaderValidatorTest.java index e01f1f124c..bd037cc49e 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/BlockHeaderValidatorTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/BlockHeaderValidatorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -22,10 +22,10 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.Optional; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/BodyValidationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/BodyValidationTest.java similarity index 89% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/BodyValidationTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/BodyValidationTest.java index d84f55ee07..239c00e4e3 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/BodyValidationTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/BodyValidationTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.util.bytes.Bytes32; import java.io.IOException; import java.util.Arrays; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolverTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolverTest.java similarity index 91% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolverTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolverTest.java index 054c086c00..7f7f86378b 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolverTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolverTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -18,9 +18,8 @@ import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolver.EthHashSolverJob; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Arrays; import java.util.List; @@ -63,7 +62,7 @@ public class EthHashSolverTest { final Stopwatch operationTimer = Stopwatch.createStarted(); final EthHashSolverInputs inputs = new EthHashSolverInputs(UInt256.ONE, new byte[0], 5); - solver.solveFor(EthHashSolverJob.createFromInputs(inputs)); + solver.solveFor(EthHashSolver.EthHashSolverJob.createFromInputs(inputs)); final double runtimeSeconds = operationTimer.elapsed(TimeUnit.NANOSECONDS) / 1e9; final long worstCaseHashesPerSecond = (long) (noncesToTry.size() / runtimeSeconds); @@ -119,10 +118,11 @@ public class EthHashSolverTest { Lists.newArrayList(expectedFirstOutput.getNonce(), 0L, expectedSecondOutput.getNonce()), new EthHasher.Light()); - EthHashSolution soln = solver.solveFor(EthHashSolverJob.createFromInputs(firstInputs)); + EthHashSolution soln = + solver.solveFor(EthHashSolver.EthHashSolverJob.createFromInputs(firstInputs)); assertThat(soln.getMixHash()).isEqualTo(expectedFirstOutput.getMixHash()); - soln = solver.solveFor(EthHashSolverJob.createFromInputs(secondInputs)); + soln = solver.solveFor(EthHashSolver.EthHashSolverJob.createFromInputs(secondInputs)); assertThat(soln.getMixHash()).isEqualTo(expectedSecondOutput.getMixHash()); } } diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/EthHashTest.java similarity index 94% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/EthHashTest.java index 98dc9ff4ce..3897336faf 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/EthHashTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/IntrinsicGasTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/IntrinsicGasTest.java similarity index 91% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/IntrinsicGasTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/IntrinsicGasTest.java index ae744bb7f3..48467f5e1f 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/IntrinsicGasTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/IntrinsicGasTest.java @@ -10,19 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import static org.assertj.core.api.Assertions.assertThat; - -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; import java.util.Collection; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -109,6 +108,6 @@ public class IntrinsicGasTest { @Test public void validateGasCost() { Transaction t = Transaction.readFrom(RLP.input(BytesValue.fromHexString(txRlp))); - assertThat(gasCalculator.transactionIntrinsicGasCost(t)).isEqualTo(expectedGas); + Assertions.assertThat(gasCalculator.transactionIntrinsicGasCost(t)).isEqualTo(expectedGas); } } diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderValidatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidatorTest.java similarity index 96% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderValidatorTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidatorTest.java index c31517898c..382ae0221d 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderValidatorTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidatorTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import tech.pegasys.pantheon.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.ProtocolContext; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockImporterTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockImporterTest.java similarity index 73% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockImporterTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockImporterTest.java index 173a2d1179..27f2b2be0f 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockImporterTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockImporterTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -18,13 +18,12 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode.FULL; -import tech.pegasys.pantheon.ethereum.BlockValidator; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.BlockValidator; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; import org.junit.Before; import org.junit.Test; @@ -52,8 +51,13 @@ public class MainnetBlockImporterTest { public void doNotImportBlockIfBlockchainAlreadyHasBlock() { when(blockchain.contains(hash)).thenReturn(true); - assertThat(blockImporter.importBlock(context, block, FULL, FULL)).isTrue(); - verify(blockValidator, never()).validateAndProcessBlock(context, block, FULL, FULL); + assertThat( + blockImporter.importBlock( + context, block, HeaderValidationMode.FULL, HeaderValidationMode.FULL)) + .isTrue(); + verify(blockValidator, never()) + .validateAndProcessBlock( + context, block, HeaderValidationMode.FULL, HeaderValidationMode.FULL); verify(blockchain, never()).appendBlock(eq(block), any()); } } diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockProcessorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockProcessorTest.java similarity index 79% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockProcessorTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockProcessorTest.java index 68b6b7d6bd..f6b6a282eb 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockProcessorTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockProcessorTest.java @@ -10,30 +10,29 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockProcessor.TransactionReceiptFactory; -import tech.pegasys.pantheon.ethereum.vm.TestBlockchain; -import tech.pegasys.pantheon.ethereum.vm.WorldStateMock; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.TestBlockchain; +import org.hyperledger.besu.ethereum.vm.WorldStateMock; import org.junit.Test; public class MainnetBlockProcessorTest { private final TransactionProcessor transactionProcessor = mock(TransactionProcessor.class); - private final TransactionReceiptFactory transactionReceiptFactory = - mock(TransactionReceiptFactory.class); + private final MainnetBlockProcessor.TransactionReceiptFactory transactionReceiptFactory = + mock(MainnetBlockProcessor.TransactionReceiptFactory.class); @Test public void noAccountCreatedWhenBlockRewardIsZeroAndSkipped() { diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolScheduleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java similarity index 98% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolScheduleTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java index 6c4481668b..ee1b025698 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolScheduleTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.config.GenesisConfigFile; +import org.hyperledger.besu.config.GenesisConfigFile; import java.nio.charset.StandardCharsets; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionProcessorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessorTest.java similarity index 77% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionProcessorTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessorTest.java index d08a862510..a4b3a27ae0 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionProcessorTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessorTest.java @@ -10,23 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.mainnet.ValidationResult.invalid; -import static tech.pegasys.pantheon.ethereum.mainnet.ValidationResult.valid; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.ProcessableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.vm.BlockHashLookup; +import org.hyperledger.besu.ethereum.vm.GasCalculator; import org.junit.Before; import org.junit.Test; @@ -91,10 +88,12 @@ public class MainnetTransactionProcessorTest { private ArgumentCaptor transactionValidationParamCaptor() { final ArgumentCaptor txValidationParamCaptor = ArgumentCaptor.forClass(TransactionValidationParams.class); - when(transactionValidator.validate(any())).thenReturn(valid()); + when(transactionValidator.validate(any())).thenReturn(ValidationResult.valid()); // returning invalid transaction to halt method execution when(transactionValidator.validateForSender(any(), any(), txValidationParamCaptor.capture())) - .thenReturn(invalid(TransactionInvalidReason.INCORRECT_NONCE)); + .thenReturn( + ValidationResult.invalid( + TransactionValidator.TransactionInvalidReason.INCORRECT_NONCE)); return txValidationParamCaptor; } } diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionValidatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java similarity index 81% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionValidatorTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java index d894c47641..8f0bc6c277 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionValidatorTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -18,23 +18,16 @@ import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INCORRECT_NONCE; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INTRINSIC_GAS_EXCEEDS_GAS_LIMIT; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.NONCE_TOO_LOW; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.TX_SENDER_NOT_AUTHORIZED; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.UPFRONT_COST_EXCEEDS_BALANCE; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.WRONG_CHAIN_ID; - -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionFilter; -import tech.pegasys.pantheon.ethereum.core.TransactionTestFixture; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; + +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionFilter; +import org.hyperledger.besu.ethereum.core.TransactionTestFixture; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.vm.GasCalculator; import java.math.BigInteger; import java.util.Optional; @@ -69,7 +62,9 @@ public class MainnetTransactionValidatorTest { when(gasCalculator.transactionIntrinsicGasCost(transaction)).thenReturn(Gas.of(50)); assertThat(validator.validate(transaction)) - .isEqualTo(ValidationResult.invalid(INTRINSIC_GAS_EXCEEDS_GAS_LIMIT)); + .isEqualTo( + ValidationResult.invalid( + TransactionValidator.TransactionInvalidReason.INTRINSIC_GAS_EXCEEDS_GAS_LIMIT)); } @Test @@ -77,7 +72,10 @@ public class MainnetTransactionValidatorTest { final MainnetTransactionValidator validator = new MainnetTransactionValidator(gasCalculator, false, Optional.empty()); assertThat(validator.validate(basicTransaction)) - .isEqualTo(ValidationResult.invalid(REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED)); + .isEqualTo( + ValidationResult.invalid( + TransactionValidator.TransactionInvalidReason + .REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED)); } @Test @@ -85,7 +83,8 @@ public class MainnetTransactionValidatorTest { final MainnetTransactionValidator validator = new MainnetTransactionValidator(gasCalculator, false, Optional.of(BigInteger.valueOf(2))); assertThat(validator.validate(basicTransaction)) - .isEqualTo(ValidationResult.invalid(WRONG_CHAIN_ID)); + .isEqualTo( + ValidationResult.invalid(TransactionValidator.TransactionInvalidReason.WRONG_CHAIN_ID)); } @Test @@ -93,7 +92,9 @@ public class MainnetTransactionValidatorTest { final MainnetTransactionValidator validator = new MainnetTransactionValidator(gasCalculator, false, Optional.of(BigInteger.ONE)); assertThat(validator.validateForSender(basicTransaction, null, false)) - .isEqualTo(ValidationResult.invalid(UPFRONT_COST_EXCEEDS_BALANCE)); + .isEqualTo( + ValidationResult.invalid( + TransactionValidator.TransactionInvalidReason.UPFRONT_COST_EXCEEDS_BALANCE)); } @Test @@ -103,7 +104,8 @@ public class MainnetTransactionValidatorTest { final Account account = accountWithNonce(basicTransaction.getNonce() + 1); assertThat(validator.validateForSender(basicTransaction, account, false)) - .isEqualTo(ValidationResult.invalid(NONCE_TOO_LOW)); + .isEqualTo( + ValidationResult.invalid(TransactionValidator.TransactionInvalidReason.NONCE_TOO_LOW)); } @Test @@ -114,7 +116,9 @@ public class MainnetTransactionValidatorTest { final Account account = accountWithNonce(basicTransaction.getNonce() - 1); assertThat(validator.validateForSender(basicTransaction, account, false)) - .isEqualTo(ValidationResult.invalid(INCORRECT_NONCE)); + .isEqualTo( + ValidationResult.invalid( + TransactionValidator.TransactionInvalidReason.INCORRECT_NONCE)); } @Test @@ -138,7 +142,9 @@ public class MainnetTransactionValidatorTest { final Account account = accountWithNonce(5); assertThat(validator.validateForSender(transaction, account, false)) - .isEqualTo(ValidationResult.invalid(INCORRECT_NONCE)); + .isEqualTo( + ValidationResult.invalid( + TransactionValidator.TransactionInvalidReason.INCORRECT_NONCE)); } @Test @@ -162,7 +168,9 @@ public class MainnetTransactionValidatorTest { validator.setTransactionFilter(transactionFilter(false)); assertThat(validator.validateForSender(basicTransaction, accountWithNonce(0), true)) - .isEqualTo(ValidationResult.invalid(TX_SENDER_NOT_AUTHORIZED)); + .isEqualTo( + ValidationResult.invalid( + TransactionValidator.TransactionInvalidReason.TX_SENDER_NOT_AUTHORIZED)); } @Test diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolScheduleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleTest.java similarity index 98% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolScheduleTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleTest.java index 0ef7734730..e2e28154ca 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolScheduleTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/RefundSstoreGasTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/RefundSstoreGasTest.java similarity index 89% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/RefundSstoreGasTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/RefundSstoreGasTest.java index 7a5b36e8ed..9bc88a512d 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/RefundSstoreGasTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/RefundSstoreGasTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.util.uint.UInt256.ONE; +import static org.hyperledger.besu.util.uint.UInt256.ZERO; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.util.uint.UInt256.ONE; -import static tech.pegasys.pantheon.util.uint.UInt256.ZERO; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.util.uint.UInt256; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -136,13 +136,14 @@ public class RefundSstoreGasTest { @Test public void shouldChargeCorrectGas() { - assertThat(gasCalculator.calculateStorageCost(account, UInt256.ZERO, newValue)) + Assertions.assertThat(gasCalculator.calculateStorageCost(account, UInt256.ZERO, newValue)) .isEqualTo(expectedGasCost); } @Test public void shouldRefundCorrectGas() { - assertThat(gasCalculator.calculateStorageRefundAmount(account, UInt256.ZERO, newValue)) + Assertions.assertThat( + gasCalculator.calculateStorageRefundAmount(account, UInt256.ZERO, newValue)) .isEqualTo(expectedGasRefund); } } diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionValidationParamsTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParamsTest.java similarity index 98% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionValidationParamsTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParamsTest.java index 49a49f6419..30d3fb9a99 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionValidationParamsTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParamsTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationResultTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ValidationResultTest.java similarity index 97% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationResultTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ValidationResultTest.java index e38e36fd3d..3cc4b3049a 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationResultTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ValidationResultTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationTestUtils.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ValidationTestUtils.java similarity index 85% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationTestUtils.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ValidationTestUtils.java index 52dd93ce16..70a3a23ee7 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationTestUtils.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ValidationTestUtils.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet; +package org.hyperledger.besu.ethereum.mainnet; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.util.List; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/AncestryValidationRuleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AncestryValidationRuleTest.java similarity index 90% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/AncestryValidationRuleTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AncestryValidationRuleTest.java index aacef0ee57..bacf756a37 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/AncestryValidationRuleTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AncestryValidationRuleTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; +package org.hyperledger.besu.ethereum.mainnet.headervalidationrules; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRuleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRuleTest.java similarity index 87% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRuleTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRuleTest.java index 4662a54f3a..b3b64435a6 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRuleTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRuleTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; +package org.hyperledger.besu.ethereum.mainnet.headervalidationrules; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.uint.UInt256; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRuleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRuleTest.java similarity index 87% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRuleTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRuleTest.java index 09e520e663..e95272b1a2 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRuleTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRuleTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; +package org.hyperledger.besu.ethereum.mainnet.headervalidationrules; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRuleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRuleTest.java similarity index 92% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRuleTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRuleTest.java index 658c9097de..88394c578b 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRuleTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRuleTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; +package org.hyperledger.besu.ethereum.mainnet.headervalidationrules; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; import java.util.Arrays; import java.util.Collection; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasUsageValidationRuleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasUsageValidationRuleTest.java similarity index 90% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasUsageValidationRuleTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasUsageValidationRuleTest.java index 48d88b571d..48b07d8283 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasUsageValidationRuleTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasUsageValidationRuleTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; +package org.hyperledger.besu.ethereum.mainnet.headervalidationrules; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; import java.util.Arrays; import java.util.Collection; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRuleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRuleTest.java similarity index 86% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRuleTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRuleTest.java index eae619f0fd..55c3f2f91c 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRuleTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRuleTest.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; +package org.hyperledger.besu.ethereum.mainnet.headervalidationrules; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderBuilder; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationTestUtils; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.mainnet.ValidationTestUtils; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.io.IOException; import java.math.BigInteger; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/TimestampValidationRuleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampValidationRuleTest.java similarity index 96% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/TimestampValidationRuleTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampValidationRuleTest.java index b6aac2e3ab..3f7f030191 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/TimestampValidationRuleTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampValidationRuleTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; +package org.hyperledger.besu.ethereum.mainnet.headervalidationrules; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; import java.util.concurrent.TimeUnit; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContractTest.java similarity index 94% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContractTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContractTest.java index 8d061d1225..02ac2bf7e3 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContractTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContractTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.precompiles; +package org.hyperledger.besu.ethereum.mainnet.precompiles; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContractTest.java similarity index 94% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContractTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContractTest.java index f844f3c757..dbf76c1955 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContractTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContractTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.precompiles; +package org.hyperledger.besu.ethereum.mainnet.precompiles; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.mainnet.ConstantinopleFixGasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.mainnet.ConstantinopleFixGasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/ECRECPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/ECRECPrecompiledContractTest.java similarity index 99% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/ECRECPrecompiledContractTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/ECRECPrecompiledContractTest.java index 1a0e8096f8..234ead3cf4 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/ECRECPrecompiledContractTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/ECRECPrecompiledContractTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.precompiles; +package org.hyperledger.besu.ethereum.mainnet.precompiles; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import tech.pegasys.pantheon.ethereum.mainnet.SpuriousDragonGasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.mainnet.SpuriousDragonGasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractTest.java similarity index 82% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractTest.java index d6ba4ecf3f..346d187228 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.mainnet.precompiles.privacy; +package org.hyperledger.besu.ethereum.mainnet.precompiles.privacy; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; @@ -19,27 +19,27 @@ import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.EnclaveException; -import tech.pegasys.pantheon.enclave.types.ReceiveRequest; -import tech.pegasys.pantheon.enclave.types.ReceiveResponse; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.LogSeries; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.ProcessableBlockHeader; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.mainnet.SpuriousDragonGasCalculator; -import tech.pegasys.pantheon.ethereum.privacy.PrivateStateStorage; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionProcessor; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionStorage; -import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.OperationTracer; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.EnclaveException; +import org.hyperledger.besu.enclave.types.ReceiveRequest; +import org.hyperledger.besu.enclave.types.ReceiveResponse; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.LogSeries; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.mainnet.SpuriousDragonGasCalculator; +import org.hyperledger.besu.ethereum.privacy.PrivateStateStorage; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionProcessor; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionStorage; +import org.hyperledger.besu.ethereum.vm.BlockHashLookup; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.OperationTracer; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Base64; import java.util.Optional; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionHandlerTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionHandlerTest.java similarity index 84% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionHandlerTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionHandlerTest.java index 55b435cc47..172fe72a3d 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionHandlerTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionHandlerTest.java @@ -10,37 +10,37 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy; +package org.hyperledger.besu.ethereum.privacy; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INCORRECT_PRIVATE_NONCE; +import static org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.PRIVATE_NONCE_TOO_LOW; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INCORRECT_PRIVATE_NONCE; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.PRIVATE_NONCE_TOO_LOW; - -import tech.pegasys.orion.testutil.OrionKeyUtils; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.enclave.Enclave; -import tech.pegasys.pantheon.enclave.EnclaveException; -import tech.pegasys.pantheon.enclave.types.ReceiveRequest; -import tech.pegasys.pantheon.enclave.types.ReceiveResponse; -import tech.pegasys.pantheon.enclave.types.SendRequest; -import tech.pegasys.pantheon.enclave.types.SendResponse; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; -import tech.pegasys.pantheon.ethereum.privacy.markertransaction.FixedKeySigningPrivateMarkerTransactionFactory; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; + +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.enclave.Enclave; +import org.hyperledger.besu.enclave.EnclaveException; +import org.hyperledger.besu.enclave.types.ReceiveRequest; +import org.hyperledger.besu.enclave.types.ReceiveResponse; +import org.hyperledger.besu.enclave.types.SendRequest; +import org.hyperledger.besu.enclave.types.SendResponse; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.ethereum.privacy.markertransaction.FixedKeySigningPrivateMarkerTransactionFactory; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.orion.testutil.OrionKeyUtils; import java.math.BigInteger; import java.util.Optional; @@ -158,9 +158,9 @@ public class PrivateTransactionHandlerTest { } @Test - public void validPantheonTransactionThroughHandler() throws Exception { + public void validBesuTransactionThroughHandler() throws Exception { - final PrivateTransaction transaction = buildPantheonPrivateTransaction(1); + final PrivateTransaction transaction = buildBesuPrivateTransaction(1); final String enclaveKey = privateTransactionHandler.sendToOrion(transaction); @@ -229,7 +229,7 @@ public class PrivateTransactionHandlerTest { .signAndBuild(KEY_PAIR); } - private static PrivateTransaction buildPantheonPrivateTransaction(final long nonce) { + private static PrivateTransaction buildBesuPrivateTransaction(final long nonce) { return buildPrivateTransaction(nonce) .privateFrom(BytesValues.fromBase64("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=")) diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionTest.java similarity index 96% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionTest.java index 0cba7862b0..931dc60870 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy; +package org.hyperledger.besu.ethereum.privacy; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.math.BigInteger; import java.util.Optional; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionValidatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionValidatorTest.java similarity index 78% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionValidatorTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionValidatorTest.java index 6ea20f354a..c6a97d3657 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/PrivateTransactionValidatorTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionValidatorTest.java @@ -10,27 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy; +package org.hyperledger.besu.ethereum.privacy; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.spy; +import static org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INCORRECT_PRIVATE_NONCE; +import static org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INVALID_SIGNATURE; +import static org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.PRIVATE_NONCE_TOO_LOW; +import static org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED; +import static org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.WRONG_CHAIN_ID; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INCORRECT_PRIVATE_NONCE; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INVALID_SIGNATURE; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.PRIVATE_NONCE_TOO_LOW; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.WRONG_CHAIN_ID; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.PrivateTransactionTestFixture; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.PrivateTransactionTestFixture; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; import java.math.BigInteger; import java.util.Optional; import org.junit.Before; import org.junit.Test; +import org.mockito.Mockito; public class PrivateTransactionValidatorTest { @@ -91,7 +91,8 @@ public class PrivateTransactionValidatorTest { @Test public void transactionWithInvalidSignatureShouldReturnInvalidSignature() { - PrivateTransaction transactionWithInvalidSignature = spy(privateTransactionWithNonce(1L)); + PrivateTransaction transactionWithInvalidSignature = + Mockito.spy(privateTransactionWithNonce(1L)); when(transactionWithInvalidSignature.getSender()).thenThrow(new IllegalArgumentException()); ValidationResult validationResult = diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactoryTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactoryTest.java similarity index 85% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactoryTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactoryTest.java index ba4c86eaf0..590b22dfc5 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactoryTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactoryTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy.markertransaction; +package org.hyperledger.besu.ethereum.privacy.markertransaction; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Base64; import java.util.Optional; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactoryTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactoryTest.java similarity index 87% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactoryTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactoryTest.java index 07a097016d..feca0b712d 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactoryTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactoryTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.privacy.markertransaction; +package org.hyperledger.besu.ethereum.privacy.markertransaction; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.privacy.PrivateTransaction; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Base64; import java.util.Optional; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/proof/WorldStateProofProviderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/proof/WorldStateProofProviderTest.java similarity index 83% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/proof/WorldStateProofProviderTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/proof/WorldStateProofProviderTest.java index ab06df5877..29adc165f3 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/proof/WorldStateProofProviderTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/proof/WorldStateProofProviderTest.java @@ -10,30 +10,30 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.proof; +package org.hyperledger.besu.ethereum.proof; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStateKeyValueStorage; -import tech.pegasys.pantheon.ethereum.trie.MerklePatriciaTrie; -import tech.pegasys.pantheon.ethereum.trie.StoredMerklePatriciaTrie; -import tech.pegasys.pantheon.ethereum.worldstate.StateTrieAccountValue; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage.Updater; -import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage; +import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie; +import org.hyperledger.besu.ethereum.trie.StoredMerklePatriciaTrie; +import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Optional; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -68,7 +68,7 @@ public class WorldStateProofProviderTest { final MerklePatriciaTrie worldStateTrie = emptyWorldStateTrie(); final MerklePatriciaTrie storageTrie = emptyStorageTrie(); - final Updater updater = worldStateStorage.updater(); + final WorldStateStorage.Updater updater = worldStateStorage.updater(); // Add some storage values writeStorageValue(storageTrie, UInt256.of(1L), UInt256.of(2L)); @@ -96,7 +96,7 @@ public class WorldStateProofProviderTest { Hash.wrap(worldStateTrie.getRootHash()), address, storageKeys); assertThat(accountProof).isPresent(); - assertThat(accountProof.get().getStateTrieAccountValue()) + Assertions.assertThat(accountProof.get().getStateTrieAccountValue()) .isEqualToComparingFieldByField(accountValue); assertThat(accountProof.get().getAccountProof().size()).isGreaterThanOrEqualTo(1); // Check storage fields diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/KeyValueStorageWorldStateStorageTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageWorldStateStorageTest.java similarity index 94% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/KeyValueStorageWorldStateStorageTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageWorldStateStorageTest.java index 578f468ce6..954d0ecb15 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/storage/keyvalue/KeyValueStorageWorldStateStorageTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageWorldStateStorageTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.storage.keyvalue; +package org.hyperledger.besu.ethereum.storage.keyvalue; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStateKeyValueStorage.Updater; -import tech.pegasys.pantheon.ethereum.trie.MerklePatriciaTrie; -import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage.Updater; +import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie; +import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/transaction/TransactionSimulatorResultTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorResultTest.java similarity index 93% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/transaction/TransactionSimulatorResultTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorResultTest.java index f875518427..7381b628ac 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/transaction/TransactionSimulatorResultTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorResultTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.transaction; +package org.hyperledger.besu.ethereum.transaction; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor.Result; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor.Result; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/transaction/TransactionSimulatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java similarity index 92% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/transaction/TransactionSimulatorTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java index da74019aa4..e9732a4d73 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/transaction/TransactionSimulatorTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.transaction; +package org.hyperledger.besu.ethereum.transaction; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -20,22 +20,22 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor.Result; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor.Result.Status; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor.Result; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor.Result.Status; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/util/BlockchainUtilParameterizedTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/util/BlockchainUtilParameterizedTest.java similarity index 88% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/util/BlockchainUtilParameterizedTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/util/BlockchainUtilParameterizedTest.java index ae2ff2147b..a4419d5272 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/util/BlockchainUtilParameterizedTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/util/BlockchainUtilParameterizedTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.util; +package org.hyperledger.besu.ethereum.util; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.Collection; @@ -58,7 +58,7 @@ public class BlockchainUtilParameterizedTest { @BeforeClass public static void setupClass() { genesisBlock = blockDataGenerator.genesisBlock(); - localBlockchain = createInMemoryBlockchain(genesisBlock); + localBlockchain = InMemoryStorageProvider.createInMemoryBlockchain(genesisBlock); // Setup local chain. for (int i = 1; i <= chainHeight; i++) { final BlockDataGenerator.BlockOptions options = @@ -73,7 +73,7 @@ public class BlockchainUtilParameterizedTest { @Before public void setup() { - remoteBlockchain = createInMemoryBlockchain(genesisBlock); + remoteBlockchain = InMemoryStorageProvider.createInMemoryBlockchain(genesisBlock); commonHeader = genesisBlock.getHeader(); for (long i = 1; i <= commonAncestorHeight; i++) { diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/util/RawBlockIteratorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/util/RawBlockIteratorTest.java similarity index 89% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/util/RawBlockIteratorTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/util/RawBlockIteratorTest.java index 56ef7e5cda..eff0f8d966 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/util/RawBlockIteratorTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/util/RawBlockIteratorTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.util; +package org.hyperledger.besu.ethereum.util; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; import java.io.DataOutputStream; import java.io.File; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/.gitignore b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/.gitignore similarity index 100% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/.gitignore rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/.gitignore diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AbstractRetryingTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AbstractRetryingTest.java similarity index 98% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AbstractRetryingTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AbstractRetryingTest.java index ec993d7ea2..4da9f5ee7d 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AbstractRetryingTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AbstractRetryingTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.LoggerContext; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AddressMock.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AddressMock.java similarity index 90% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AddressMock.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AddressMock.java index 8ba44c3a86..9c684465bc 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AddressMock.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AddressMock.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Address; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AddressTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AddressTest.java similarity index 93% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AddressTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AddressTest.java index 51a1545520..0b49b670f1 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AddressTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AddressTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockHashLookupTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockHashLookupTest.java similarity index 85% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockHashLookupTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockHashLookupTest.java index b4062906e3..c4e8f5fc10 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockHashLookupTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockHashLookupTest.java @@ -10,9 +10,8 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; -import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -21,13 +20,14 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.Optional; +import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -78,7 +78,7 @@ public class BlockHashLookupTest { @Test public void shouldReturnEmptyHashWhenRequestedBlockNotOnChain() { - assertThat(lookup.getBlockHash(CURRENT_BLOCK_NUMBER + 20)).isEqualTo(Hash.ZERO); + Assertions.assertThat(lookup.getBlockHash(CURRENT_BLOCK_NUMBER + 20)).isEqualTo(Hash.ZERO); } @Test @@ -87,7 +87,8 @@ public class BlockHashLookupTest { new BlockHashLookup( new BlockHeaderTestFixture().number(CURRENT_BLOCK_NUMBER + 20).buildHeader(), blockchain); - assertThat(lookupWithUnavailableParent.getBlockHash(CURRENT_BLOCK_NUMBER)).isEqualTo(Hash.ZERO); + Assertions.assertThat(lookupWithUnavailableParent.getBlockHash(CURRENT_BLOCK_NUMBER)) + .isEqualTo(Hash.ZERO); } @Test @@ -107,7 +108,8 @@ public class BlockHashLookupTest { } private void assertHashForBlockNumber(final int blockNumber) { - assertThat(lookup.getBlockHash(blockNumber)).isEqualTo(headers[blockNumber].getHash()); + Assertions.assertThat(lookup.getBlockHash(blockNumber)) + .isEqualTo(headers[blockNumber].getHash()); } private BlockHeader createHeader(final int blockNumber, final BlockHeader parentHeader) { diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestCaseSpec.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestCaseSpec.java similarity index 83% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestCaseSpec.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestCaseSpec.java index 211b385cdc..30db461e9e 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestCaseSpec.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestCaseSpec.java @@ -10,31 +10,30 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; - -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; -import static tech.pegasys.pantheon.ethereum.vm.WorldStateMock.insertAccount; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogsBloomFilter; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.ParsedExtraData; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.vm; + +import static org.hyperledger.besu.ethereum.vm.WorldStateMock.insertAccount; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider; +import org.hyperledger.besu.ethereum.core.LogsBloomFilter; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.ParsedExtraData; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Map; @@ -62,7 +61,8 @@ public class BlockchainReferenceTestCaseSpec { private static WorldStateArchive buildWorldStateArchive( final Map accounts) { - final WorldStateArchive worldStateArchive = createInMemoryWorldStateArchive(); + final WorldStateArchive worldStateArchive = + InMemoryStorageProvider.createInMemoryWorldStateArchive(); final MutableWorldState worldState = worldStateArchive.getMutable(); final WorldUpdater updater = worldState.updater(); @@ -79,7 +79,7 @@ public class BlockchainReferenceTestCaseSpec { private static MutableBlockchain buildBlockchain(final BlockHeader genesisBlockHeader) { final Block genesisBlock = new Block(genesisBlockHeader, BlockBody.empty()); - return createInMemoryBlockchain(genesisBlock); + return InMemoryStorageProvider.createInMemoryBlockchain(genesisBlock); } @JsonCreator diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestTools.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java similarity index 82% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestTools.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java index b26203c717..2fd1576bdd 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestTools.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java @@ -10,26 +10,28 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.testutil.JsonTestParameters; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.testutil.JsonTestParameters; import java.util.Arrays; import java.util.Collection; import java.util.List; +import org.assertj.core.api.Assertions; + public class BlockchainReferenceTestTools { private static final ReferenceTestProtocolSchedules REFERENCE_TEST_PROTOCOL_SCHEDULES = ReferenceTestProtocolSchedules.create(); @@ -108,6 +110,6 @@ public class BlockchainReferenceTestTools { } } - assertThat(blockchain.getChainHeadHash()).isEqualTo(spec.getLastBlockHash()); + Assertions.assertThat(blockchain.getChainHeadHash()).isEqualTo(spec.getLastBlockHash()); } } diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/CodeMock.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/CodeMock.java similarity index 90% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/CodeMock.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/CodeMock.java index b803869462..37cb58e20e 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/CodeMock.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/CodeMock.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/DebugOperationTracerTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/DebugOperationTracerTest.java similarity index 88% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/DebugOperationTracerTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/DebugOperationTracerTest.java index 14efa39515..0ead28b15b 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/DebugOperationTracerTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/DebugOperationTracerTest.java @@ -10,34 +10,33 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason.INSUFFICIENT_GAS; - -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.MessageFrameTestFixture; -import tech.pegasys.pantheon.ethereum.core.MutableAccount; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.debug.TraceFrame; -import tech.pegasys.pantheon.ethereum.debug.TraceOptions; -import tech.pegasys.pantheon.ethereum.vm.OperationTracer.ExecuteOperation; -import tech.pegasys.pantheon.ethereum.vm.ehalt.ExceptionalHaltException; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; + +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture; +import org.hyperledger.besu.ethereum.core.MutableAccount; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.debug.TraceFrame; +import org.hyperledger.besu.ethereum.debug.TraceOptions; +import org.hyperledger.besu.ethereum.vm.ehalt.ExceptionalHaltException; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; import java.util.EnumSet; import java.util.Map; import java.util.Optional; import java.util.TreeMap; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -51,7 +50,7 @@ public class DebugOperationTracerTest { @Mock private WorldUpdater worldUpdater; - @Mock private ExecuteOperation executeOperationAction; + @Mock private OperationTracer.ExecuteOperation executeOperationAction; private final Operation anOperation = new AbstractOperation(0x02, "MUL", 2, 1, false, 1, null) { @@ -155,7 +154,8 @@ public class DebugOperationTracerTest { @Test public void shouldCaptureFrameWhenExceptionalHaltOccurs() throws Exception { - final EnumSet expectedHaltReasons = EnumSet.of(INSUFFICIENT_GAS); + final EnumSet expectedHaltReasons = + EnumSet.of(ExceptionalHaltReason.INSUFFICIENT_GAS); final ExceptionalHaltException expectedException = new ExceptionalHaltException(expectedHaltReasons); doThrow(expectedException).when(executeOperationAction).execute(); @@ -193,7 +193,7 @@ public class DebugOperationTracerTest { } private TraceFrame getOnlyTraceFrame(final DebugOperationTracer tracer) { - assertThat(tracer.getTraceFrames()).hasSize(1); + Assertions.assertThat(tracer.getTraceFrames()).hasSize(1); return tracer.getTraceFrames().get(0); } diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/EnvironmentInformation.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/EnvironmentInformation.java similarity index 94% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/EnvironmentInformation.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/EnvironmentInformation.java index b53b004be9..545e91386c 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/EnvironmentInformation.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/EnvironmentInformation.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; - -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.vm; + +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.util.bytes.BytesValue; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTestTools.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java similarity index 87% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTestTools.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java index 31951f3c61..521567311a 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTestTools.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogSeries; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidationParams; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.worldstate.DefaultMutableWorldState; -import tech.pegasys.pantheon.testutil.JsonTestParameters; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.LogSeries; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.mainnet.TransactionProcessor; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.worldstate.DefaultMutableWorldState; +import org.hyperledger.besu.testutil.JsonTestParameters; import java.util.Arrays; import java.util.Collection; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateTestCaseEipSpec.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/GeneralStateTestCaseEipSpec.java similarity index 90% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateTestCaseEipSpec.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/GeneralStateTestCaseEipSpec.java index 17cee49e2d..2cc0d43d5d 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateTestCaseEipSpec.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/GeneralStateTestCaseEipSpec.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.WorldState; import java.util.function.Supplier; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateTestCaseSpec.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/GeneralStateTestCaseSpec.java similarity index 94% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateTestCaseSpec.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/GeneralStateTestCaseSpec.java index 32f45fbe76..7b32f12d0b 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateTestCaseSpec.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/GeneralStateTestCaseSpec.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderMock; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderMock; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; import java.util.ArrayList; import java.util.HashMap; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/LogMock.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/LogMock.java similarity index 85% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/LogMock.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/LogMock.java index f3e6b00e53..9beb152c67 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/LogMock.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/LogMock.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Log; -import tech.pegasys.pantheon.ethereum.core.LogTopic; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Log; +import org.hyperledger.besu.ethereum.core.LogTopic; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/MemoryTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/MemoryTest.java similarity index 96% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/MemoryTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/MemoryTest.java index 0ccc6b9e8f..fc03542d72 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/MemoryTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/MemoryTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.besu.util.uint.UInt256; import com.google.common.base.Strings; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/PreAllocatedOperandStackTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/PreAllocatedOperandStackTest.java similarity index 97% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/PreAllocatedOperandStackTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/PreAllocatedOperandStackTest.java index 6fe2f41347..0ad2d58165 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/PreAllocatedOperandStackTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/PreAllocatedOperandStackTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.Bytes32; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/ReferenceTestProtocolSchedules.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/ReferenceTestProtocolSchedules.java similarity index 89% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/ReferenceTestProtocolSchedules.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/ReferenceTestProtocolSchedules.java index 4d2ff6c6b9..3c26082cf7 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/ReferenceTestProtocolSchedules.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/ReferenceTestProtocolSchedules.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; -import tech.pegasys.pantheon.config.GenesisConfigOptions; -import tech.pegasys.pantheon.config.StubGenesisConfigOptions; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolScheduleBuilder; +import org.hyperledger.besu.config.GenesisConfigOptions; +import org.hyperledger.besu.config.StubGenesisConfigOptions; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder; import java.math.BigInteger; import java.util.Map; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/StateTestVersionedTransaction.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/StateTestVersionedTransaction.java similarity index 88% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/StateTestVersionedTransaction.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/StateTestVersionedTransaction.java index 6c6dd1e5b4..a647bc3b1b 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/StateTestVersionedTransaction.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/StateTestVersionedTransaction.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.PrivateKey; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.PrivateKey; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/TestBlockchain.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/TestBlockchain.java similarity index 87% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/TestBlockchain.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/TestBlockchain.java index 1c543d5c12..5a489cb609 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/TestBlockchain.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/TestBlockchain.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; import static java.nio.charset.StandardCharsets.UTF_8; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedObserver; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.ChainHead; -import tech.pegasys.pantheon.ethereum.chain.TransactionLocation; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.chain.BlockAddedObserver; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.ChainHead; +import org.hyperledger.besu.ethereum.chain.TransactionLocation; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.HashMap; import java.util.List; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/VMReferenceTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/VMReferenceTest.java similarity index 87% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/VMReferenceTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/VMReferenceTest.java index 3008bb8218..465f4a0062 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/VMReferenceTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/VMReferenceTest.java @@ -10,23 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assume.assumeTrue; -import static tech.pegasys.pantheon.ethereum.vm.MessageFrame.DEFAULT_MAX_STACK_SIZE; -import static tech.pegasys.pantheon.ethereum.vm.OperationTracer.NO_TRACING; - -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.PrivacyParameters; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSpecs; -import tech.pegasys.pantheon.ethereum.mainnet.MutableProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.privacy.PrivateTransactionValidator; -import tech.pegasys.pantheon.ethereum.vm.ehalt.ExceptionalHaltException; -import tech.pegasys.pantheon.ethereum.worldstate.DefaultMutableWorldState; -import tech.pegasys.pantheon.testutil.JsonTestParameters; + +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.PrivacyParameters; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSpecs; +import org.hyperledger.besu.ethereum.mainnet.MutableProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.privacy.PrivateTransactionValidator; +import org.hyperledger.besu.ethereum.vm.ehalt.ExceptionalHaltException; +import org.hyperledger.besu.ethereum.worldstate.DefaultMutableWorldState; +import org.hyperledger.besu.testutil.JsonTestParameters; import java.math.BigInteger; import java.util.ArrayDeque; @@ -147,14 +145,14 @@ public class VMReferenceTest extends AbstractRetryingTest { .completer(c -> {}) .miningBeneficiary(execEnv.getBlockHeader().getCoinbase()) .blockHashLookup(new BlockHashLookup(execEnv.getBlockHeader(), blockchain)) - .maxStackSize(DEFAULT_MAX_STACK_SIZE) + .maxStackSize(MessageFrame.DEFAULT_MAX_STACK_SIZE) .build(); // This is normally set inside the containing message executing the code. frame.setState(MessageFrame.State.CODE_EXECUTING); try { - protocolSpec.getEvm().runToHalt(frame, NO_TRACING); + protocolSpec.getEvm().runToHalt(frame, OperationTracer.NO_TRACING); } catch (final ExceptionalHaltException ehe) { if (!spec.isExceptionHaltExpected()) System.err.println( diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/VMReferenceTestCaseSpec.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/VMReferenceTestCaseSpec.java similarity index 92% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/VMReferenceTestCaseSpec.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/VMReferenceTestCaseSpec.java index ad9697ef2e..751ca10627 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/VMReferenceTestCaseSpec.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/VMReferenceTestCaseSpec.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; +package org.hyperledger.besu.ethereum.vm; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderMock; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockHeaderMock; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.util.bytes.BytesValue; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/WorldStateMock.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/WorldStateMock.java similarity index 83% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/WorldStateMock.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/WorldStateMock.java index 6a0d5c2c69..69fe062195 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/WorldStateMock.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/WorldStateMock.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm; - -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.MutableAccount; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStateKeyValueStorage; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage; -import tech.pegasys.pantheon.ethereum.worldstate.DefaultMutableWorldState; -import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.vm; + +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.MutableAccount; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage; +import org.hyperledger.besu.ethereum.worldstate.DefaultMutableWorldState; +import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.HashMap; import java.util.Map; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/blockchain/.keep b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/blockchain/.keep similarity index 100% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/blockchain/.keep rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/blockchain/.keep diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/generalstate/.keep b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/generalstate/.keep similarity index 100% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/generalstate/.keep rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/generalstate/.keep diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/BlockHashOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperationTest.java similarity index 85% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/BlockHashOperationTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperationTest.java index 447240d40e..3a3627ebdb 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/BlockHashOperationTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperationTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -18,16 +18,16 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MessageFrameTestFixture; -import tech.pegasys.pantheon.ethereum.mainnet.FrontierGasCalculator; -import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture; +import org.hyperledger.besu.ethereum.mainnet.FrontierGasCalculator; +import org.hyperledger.besu.ethereum.vm.BlockHashLookup; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import com.google.common.base.Strings; import org.junit.After; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ChainIdOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ChainIdOperationTest.java similarity index 88% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ChainIdOperationTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ChainIdOperationTest.java index 4024f72021..97fe64998a 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ChainIdOperationTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ChainIdOperationTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.mainnet.ConstantinopleGasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.mainnet.ConstantinopleGasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ConstantinopleSStoreOperationGasCostTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ConstantinopleSStoreOperationGasCostTest.java similarity index 84% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ConstantinopleSStoreOperationGasCostTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ConstantinopleSStoreOperationGasCostTest.java index 2aa6fe735f..dc2fc9dd08 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ConstantinopleSStoreOperationGasCostTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ConstantinopleSStoreOperationGasCostTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.config.StubGenesisConfigOptions; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.TestCodeExecutor; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame.State; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.config.StubGenesisConfigOptions; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.TestCodeExecutor; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.MessageFrame.State; +import org.hyperledger.besu.util.uint.UInt256; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/Create2OperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/Create2OperationTest.java similarity index 91% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/Create2OperationTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/Create2OperationTest.java index 9c0bb75e78..732f0bebfc 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/Create2OperationTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/Create2OperationTest.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.mainnet.ConstantinopleGasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.mainnet.ConstantinopleGasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeHashOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeHashOperationTest.java similarity index 78% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeHashOperationTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeHashOperationTest.java index 592cfa54c0..716f86ace2 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeHashOperationTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeHashOperationTest.java @@ -10,32 +10,32 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; import static org.mockito.Mockito.mock; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; - -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.AddressHelpers; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MessageFrameTestFixture; -import tech.pegasys.pantheon.ethereum.core.MutableAccount; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.mainnet.ConstantinopleGasCalculator; -import tech.pegasys.pantheon.ethereum.mainnet.IstanbulGasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.Words; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; + +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.AddressHelpers; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture; +import org.hyperledger.besu.ethereum.core.MutableAccount; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.mainnet.ConstantinopleGasCalculator; +import org.hyperledger.besu.ethereum.mainnet.IstanbulGasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.vm.Words; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/RevertOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/RevertOperationTest.java similarity index 84% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/RevertOperationTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/RevertOperationTest.java index b50750366f..12a07b26f3 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/RevertOperationTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/RevertOperationTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.mainnet.ConstantinopleGasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.mainnet.ConstantinopleGasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/SStoreOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/SStoreOperationTest.java similarity index 77% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/SStoreOperationTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/SStoreOperationTest.java index d70f567fe9..c80dc58b81 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/SStoreOperationTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/SStoreOperationTest.java @@ -10,26 +10,26 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; +import static org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason.INSUFFICIENT_GAS; import static org.mockito.Mockito.mock; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; -import static tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason.INSUFFICIENT_GAS; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Gas; -import tech.pegasys.pantheon.ethereum.core.MessageFrameTestFixture; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.mainnet.ConstantinopleGasCalculator; -import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Gas; +import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.mainnet.ConstantinopleGasCalculator; +import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; import java.util.Arrays; import java.util.Optional; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/SarOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/SarOperationTest.java similarity index 94% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/SarOperationTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/SarOperationTest.java index cf06e3a99a..69d8d26ceb 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/SarOperationTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/SarOperationTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.mainnet.SpuriousDragonGasCalculator; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.ethereum.mainnet.SpuriousDragonGasCalculator; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; import java.util.Arrays; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ShlOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ShlOperationTest.java similarity index 92% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ShlOperationTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ShlOperationTest.java index c19cd39dd2..f3cc4d6e1b 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ShlOperationTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ShlOperationTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.mainnet.SpuriousDragonGasCalculator; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.ethereum.mainnet.SpuriousDragonGasCalculator; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; import java.util.Arrays; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ShrOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ShrOperationTest.java similarity index 93% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ShrOperationTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ShrOperationTest.java index 6245a9a3fa..0baadf7c6d 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ShrOperationTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ShrOperationTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.vm.operations; +package org.hyperledger.besu.ethereum.vm.operations; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.mainnet.SpuriousDragonGasCalculator; -import tech.pegasys.pantheon.ethereum.vm.GasCalculator; -import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.ethereum.mainnet.SpuriousDragonGasCalculator; +import org.hyperledger.besu.ethereum.vm.GasCalculator; +import org.hyperledger.besu.ethereum.vm.MessageFrame; +import org.hyperledger.besu.util.bytes.Bytes32; import java.util.Arrays; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutableWorldStateTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutableWorldStateTest.java similarity index 95% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutableWorldStateTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutableWorldStateTest.java index d6ffd575d1..a5047945c0 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutableWorldStateTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutableWorldStateTest.java @@ -10,29 +10,29 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.worldstate; +package org.hyperledger.besu.ethereum.worldstate; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldState; - -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.AccountStorageEntry; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableAccount; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.core.WorldState.StreamableAccount; -import tech.pegasys.pantheon.ethereum.core.WorldUpdater; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStateKeyValueStorage; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage; -import tech.pegasys.pantheon.ethereum.trie.MerklePatriciaTrie; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldState; + +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.AccountStorageEntry; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableAccount; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.core.WorldState.StreamableAccount; +import org.hyperledger.besu.ethereum.core.WorldUpdater; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage; +import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/worldstate/MarkSweepPrunerTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/MarkSweepPrunerTest.java similarity index 91% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/worldstate/MarkSweepPrunerTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/MarkSweepPrunerTest.java index e3cb9e5f9c..2acc8166fd 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/worldstate/MarkSweepPrunerTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/MarkSweepPrunerTest.java @@ -10,32 +10,32 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.worldstate; +package org.hyperledger.besu.ethereum.worldstate; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.spy; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; - -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator.BlockOptions; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStateKeyValueStorage; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage; -import tech.pegasys.pantheon.ethereum.trie.MerklePatriciaTrie; -import tech.pegasys.pantheon.ethereum.trie.StoredMerklePatriciaTrie; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; + +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage; +import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie; +import org.hyperledger.besu.ethereum.trie.StoredMerklePatriciaTrie; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.HashMap; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/worldstate/PrunerTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/PrunerTest.java similarity index 87% rename from ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/worldstate/PrunerTest.java rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/PrunerTest.java index f631a76b6a..e2af3b8357 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/worldstate/PrunerTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/PrunerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.worldstate; +package org.hyperledger.besu.ethereum.worldstate; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.anyLong; @@ -18,20 +18,20 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.BlockchainStorage; -import tech.pegasys.pantheon.ethereum.chain.DefaultBlockchain; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator.BlockOptions; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import tech.pegasys.pantheon.testutil.MockExecutorService; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.BlockchainStorage; +import org.hyperledger.besu.ethereum.chain.DefaultBlockchain; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; +import org.hyperledger.besu.testutil.MockExecutorService; import java.util.List; import java.util.concurrent.ExecutorService; diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/blockvalidation/block_1200000.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/blockvalidation/block_1200000.blocks similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/blockvalidation/block_1200000.blocks rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/blockvalidation/block_1200000.blocks diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/blockvalidation/block_1200001.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/blockvalidation/block_1200001.blocks similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/blockvalidation/block_1200001.blocks rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/blockvalidation/block_1200001.blocks diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/blockvalidation/block_300005.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/blockvalidation/block_300005.blocks similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/blockvalidation/block_300005.blocks rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/blockvalidation/block_300005.blocks diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/blockvalidation/block_300006.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/blockvalidation/block_300006.blocks similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/blockvalidation/block_300006.blocks rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/blockvalidation/block_300006.blocks diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/blockvalidation/block_4400000.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/blockvalidation/block_4400000.blocks similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/blockvalidation/block_4400000.blocks rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/blockvalidation/block_4400000.blocks diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/blockvalidation/block_4400001.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/blockvalidation/block_4400001.blocks similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/blockvalidation/block_4400001.blocks rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/blockvalidation/block_4400001.blocks diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/blockvalidation/block_4400002.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/blockvalidation/block_4400002.blocks similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/blockvalidation/block_4400002.blocks rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/blockvalidation/block_4400002.blocks diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/chain/genesis-olympic.json b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis-olympic.json similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/chain/genesis-olympic.json rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis-olympic.json diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/chain/genesis1.json b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis1.json similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/chain/genesis1.json rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis1.json diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/chain/genesis2.json b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis2.json similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/chain/genesis2.json rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis2.json diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/chain/genesis3.json b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis3.json similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/chain/genesis3.json rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis3.json diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/chain/genesis4.json b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis4.json similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/chain/genesis4.json rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis4.json diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/chain/genesisNonce.json b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesisNonce.json similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/chain/genesisNonce.json rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesisNonce.json diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/mainnet/block_1.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_1.blocks similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/mainnet/block_1.blocks rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_1.blocks diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/mainnet/block_1200000.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_1200000.blocks similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/mainnet/block_1200000.blocks rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_1200000.blocks diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/mainnet/block_1200001.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_1200001.blocks similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/mainnet/block_1200001.blocks rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_1200001.blocks diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/mainnet/block_300005.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_300005.blocks similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/mainnet/block_300005.blocks rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_300005.blocks diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/mainnet/block_300006.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_300006.blocks similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/mainnet/block_300006.blocks rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_300006.blocks diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/mainnet/block_4400000.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_4400000.blocks similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/mainnet/block_4400000.blocks rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_4400000.blocks diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/mainnet/block_4400001.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_4400001.blocks similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/mainnet/block_4400001.blocks rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_4400001.blocks diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/mainnet/block_4400002.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_4400002.blocks similarity index 100% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/mainnet/block_4400002.blocks rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_4400002.blocks diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTest.java.template b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTest.java.template similarity index 75% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTest.java.template rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTest.java.template index 4a817d0d73..dd1056beee 100644 --- a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTest.java.template +++ b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTest.java.template @@ -1,9 +1,9 @@ -package tech.pegasys.pantheon.ethereum.vm.blockchain; +package org.hyperledger.besu.ethereum.vm.blockchain; -import static tech.pegasys.pantheon.ethereum.vm.BlockchainReferenceTestTools.executeTest; -import static tech.pegasys.pantheon.ethereum.vm.BlockchainReferenceTestTools.generateTestParametersForConfig; +import static org.hyperledger.besu.ethereum.vm.BlockchainReferenceTestTools.executeTest; +import static org.hyperledger.besu.ethereum.vm.BlockchainReferenceTestTools.generateTestParametersForConfig; -import tech.pegasys.pantheon.ethereum.vm.BlockchainReferenceTestCaseSpec; +import org.hyperledger.besu.ethereum.vm.BlockchainReferenceTestCaseSpec; import java.util.Collection; diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTest.java.template b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTest.java.template similarity index 75% rename from ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTest.java.template rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTest.java.template index 8a1c12ba11..ca19c01d66 100644 --- a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTest.java.template +++ b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTest.java.template @@ -1,9 +1,9 @@ -package tech.pegasys.pantheon.ethereum.vm.generalstate; +package org.hyperledger.besu.ethereum.vm.generalstate; -import static tech.pegasys.pantheon.ethereum.vm.GeneralStateReferenceTestTools.executeTest; -import static tech.pegasys.pantheon.ethereum.vm.GeneralStateReferenceTestTools.generateTestParametersForConfig; +import static org.hyperledger.besu.ethereum.vm.GeneralStateReferenceTestTools.executeTest; +import static org.hyperledger.besu.ethereum.vm.GeneralStateReferenceTestTools.generateTestParametersForConfig; -import tech.pegasys.pantheon.ethereum.vm.GeneralStateTestCaseEipSpec; +import org.hyperledger.besu.ethereum.vm.GeneralStateTestCaseEipSpec; import java.util.Collection; diff --git a/ethereum/eth/build.gradle b/ethereum/eth/build.gradle index 5c75fa3f06..186c2b8590 100644 --- a/ethereum/eth/build.gradle +++ b/ethereum/eth/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-eth' + baseName 'besu-eth' manifest { attributes( 'Specification-Title': baseName, @@ -55,7 +55,7 @@ dependencies { testImplementation 'org.awaitility:awaitility' testImplementation 'org.mockito:mockito-core' - jmhImplementation project(':pantheon') + jmhImplementation project(':besu') jmhImplementation project(':plugins:rocksdb') jmhImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') diff --git a/ethereum/eth/src/jmh/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldStateDownloaderBenchmark.java b/ethereum/eth/src/jmh/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloaderBenchmark.java similarity index 68% rename from ethereum/eth/src/jmh/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldStateDownloaderBenchmark.java rename to ethereum/eth/src/jmh/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloaderBenchmark.java index 2325c92a36..a6ac12adc3 100644 --- a/ethereum/eth/src/jmh/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldStateDownloaderBenchmark.java +++ b/ethereum/eth/src/jmh/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloaderBenchmark.java @@ -10,39 +10,39 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; - -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; -import static tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_BACKGROUND_THREAD_COUNT; -import static tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_CACHE_CAPACITY; -import static tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_BACKGROUND_COMPACTIONS; -import static tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_OPEN_FILES; - -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.storage.StorageProvider; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueSegmentIdentifier; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.RocksDBKeyValueStorageFactory; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; -import tech.pegasys.pantheon.services.PantheonConfigurationImpl; -import tech.pegasys.pantheon.services.tasks.CachingTaskCollection; -import tech.pegasys.pantheon.services.tasks.FlatFileTaskCollection; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; + +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; +import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_BACKGROUND_THREAD_COUNT; +import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_CACHE_CAPACITY; +import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_BACKGROUND_COMPACTIONS; +import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_OPEN_FILES; + +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer.Responder; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.storage.StorageProvider; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.metrics.ObservableMetricsSystem; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBKeyValueStorageFactory; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; +import org.hyperledger.besu.services.BesuConfigurationImpl; +import org.hyperledger.besu.services.tasks.CachingTaskCollection; +import org.hyperledger.besu.services.tasks.FlatFileTaskCollection; +import org.hyperledger.besu.util.bytes.BytesValue; import java.nio.file.Path; import java.time.Clock; @@ -167,7 +167,7 @@ public class WorldStateDownloaderBenchmark { DEFAULT_BACKGROUND_THREAD_COUNT, DEFAULT_CACHE_CAPACITY), Arrays.asList(KeyValueSegmentIdentifier.values()))) - .withCommonConfiguration(new PantheonConfigurationImpl(dbAhead)) + .withCommonConfiguration(new BesuConfigurationImpl(dbAhead)) .withMetricsSystem(new NoOpMetricsSystem()) .build(); } diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/EthProtocol.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocol.java similarity index 92% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/EthProtocol.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocol.java index 3a92ca81dd..7cea2b191e 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/EthProtocol.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocol.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth; +package org.hyperledger.besu.ethereum.eth; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV63; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.SubProtocol; +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; +import org.hyperledger.besu.ethereum.eth.messages.EthPV63; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol; import java.util.ArrayList; import java.util.Arrays; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/EthProtocolConfiguration.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocolConfiguration.java similarity index 97% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/EthProtocolConfiguration.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocolConfiguration.java index a75b12d204..7297e62e49 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/EthProtocolConfiguration.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocolConfiguration.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth; +package org.hyperledger.besu.ethereum.eth; -import tech.pegasys.pantheon.util.number.PositiveNumber; +import org.hyperledger.besu.util.number.PositiveNumber; import java.util.Objects; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/ChainState.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/ChainState.java similarity index 94% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/ChainState.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/ChainState.java index 73ae6154a0..69162ffb80 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/ChainState.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/ChainState.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; -import tech.pegasys.pantheon.ethereum.chain.ChainHead; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.util.Subscribers; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.chain.ChainHead; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.Subscribers; +import org.hyperledger.besu.util.uint.UInt256; import com.google.common.base.MoreObjects; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthContext.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthContext.java similarity index 95% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthContext.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthContext.java index 644ea94001..473419721d 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthContext.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthContext.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; public class EthContext { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthMessage.java similarity index 88% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthMessage.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthMessage.java index 13841c2042..4f0aa8c10b 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthMessage.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthMessage.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; public class EthMessage { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthMessages.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthMessages.java similarity index 93% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthMessages.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthMessages.java index df315e6f91..47c46cc357 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthMessages.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthMessages.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.util.Subscribers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeer.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeer.java similarity index 86% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeer.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeer.java index 68c9fbe5a5..66386bbcfb 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeer.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeer.java @@ -10,25 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.ChainState.EstimatedHeightListener; -import tech.pegasys.pantheon.ethereum.eth.manager.RequestManager.ResponseStream; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV63; -import tech.pegasys.pantheon.ethereum.eth.messages.GetBlockBodiesMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.GetBlockHeadersMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.GetNodeDataMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.GetReceiptsMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; +import org.hyperledger.besu.ethereum.eth.messages.EthPV63; +import org.hyperledger.besu.ethereum.eth.messages.GetBlockBodiesMessage; +import org.hyperledger.besu.ethereum.eth.messages.GetBlockHeadersMessage; +import org.hyperledger.besu.ethereum.eth.messages.GetNodeDataMessage; +import org.hyperledger.besu.ethereum.eth.messages.GetReceiptsMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.time.Clock; import java.util.Collections; @@ -94,7 +92,7 @@ public class EthPeer { return connection.isDisconnected(); } - public long addChainEstimatedHeightListener(final EstimatedHeightListener listener) { + public long addChainEstimatedHeightListener(final ChainState.EstimatedHeightListener listener) { return chainHeadState.addEstimatedHeightListener(listener); } @@ -116,7 +114,7 @@ public class EthPeer { connection.disconnect(reason); } - public ResponseStream send(final MessageData messageData) throws PeerNotConnected { + public RequestManager.ResponseStream send(final MessageData messageData) throws PeerNotConnected { switch (messageData.getCode()) { case EthPV62.GET_BLOCK_HEADERS: return sendRequest(headersRequestManager, messageData); @@ -132,7 +130,7 @@ public class EthPeer { } } - public ResponseStream getHeadersByHash( + public RequestManager.ResponseStream getHeadersByHash( final Hash hash, final int maxHeaders, final int skip, final boolean reverse) throws PeerNotConnected { final GetBlockHeadersMessage message = @@ -140,7 +138,7 @@ public class EthPeer { return sendRequest(headersRequestManager, message); } - public ResponseStream getHeadersByNumber( + public RequestManager.ResponseStream getHeadersByNumber( final long blockNumber, final int maxHeaders, final int skip, final boolean reverse) throws PeerNotConnected { final GetBlockHeadersMessage message = @@ -148,24 +146,27 @@ public class EthPeer { return sendRequest(headersRequestManager, message); } - private ResponseStream sendRequest( + private RequestManager.ResponseStream sendRequest( final RequestManager requestManager, final MessageData messageData) throws PeerNotConnected { lastRequestTimestamp = clock.millis(); return requestManager.dispatchRequest( () -> connection.sendForProtocol(protocolName, messageData)); } - public ResponseStream getBodies(final List blockHashes) throws PeerNotConnected { + public RequestManager.ResponseStream getBodies(final List blockHashes) + throws PeerNotConnected { final GetBlockBodiesMessage message = GetBlockBodiesMessage.create(blockHashes); return sendRequest(bodiesRequestManager, message); } - public ResponseStream getReceipts(final List blockHashes) throws PeerNotConnected { + public RequestManager.ResponseStream getReceipts(final List blockHashes) + throws PeerNotConnected { final GetReceiptsMessage message = GetReceiptsMessage.create(blockHashes); return sendRequest(receiptsRequestManager, message); } - public ResponseStream getNodeData(final Iterable nodeHashes) throws PeerNotConnected { + public RequestManager.ResponseStream getNodeData(final Iterable nodeHashes) + throws PeerNotConnected { final GetNodeDataMessage message = GetNodeDataMessage.create(nodeHashes); return sendRequest(nodeDataRequestManager, message); } diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeers.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeers.java similarity index 92% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeers.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeers.java index 223556a3de..48c65b04d3 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeers.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeers.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer.DisconnectCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer.DisconnectCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.Subscribers; import java.time.Clock; import java.util.ArrayList; @@ -52,7 +52,7 @@ public class EthPeers { this.protocolName = protocolName; this.clock = clock; metricsSystem.createIntegerGauge( - PantheonMetricCategory.PEERS, + BesuMetricCategory.PEERS, "pending_peer_requests_current", "Number of peer requests currently pending because peers are busy", pendingRequests::size); diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java similarity index 87% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManager.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java index 1984b49340..c58ee7db43 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManager.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java @@ -10,30 +10,30 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.MinedBlockObserver; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; -import tech.pegasys.pantheon.ethereum.eth.messages.StatusMessage; -import tech.pegasys.pantheon.ethereum.eth.sync.BlockBroadcaster; -import tech.pegasys.pantheon.ethereum.p2p.network.ProtocolManager; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.MinedBlockObserver; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; +import org.hyperledger.besu.ethereum.eth.messages.StatusMessage; +import org.hyperledger.besu.ethereum.eth.sync.BlockBroadcaster; +import org.hyperledger.besu.ethereum.p2p.network.ProtocolManager; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.time.Clock; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthScheduler.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthScheduler.java similarity index 90% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthScheduler.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthScheduler.java index ed36ed6122..89ac92e6a8 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthScheduler.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthScheduler.java @@ -10,18 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; -import static tech.pegasys.pantheon.ethereum.eth.manager.MonitoredExecutors.newBoundedThreadPool; -import static tech.pegasys.pantheon.ethereum.eth.manager.MonitoredExecutors.newCachedThreadPool; -import static tech.pegasys.pantheon.ethereum.eth.manager.MonitoredExecutors.newFixedThreadPool; -import static tech.pegasys.pantheon.ethereum.eth.manager.MonitoredExecutors.newScheduledThreadPool; -import static tech.pegasys.pantheon.util.FutureUtils.propagateResult; +import static org.hyperledger.besu.util.FutureUtils.propagateResult; -import tech.pegasys.pantheon.ethereum.eth.manager.task.EthTask; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.services.pipeline.Pipeline; -import tech.pegasys.pantheon.util.ExceptionUtils; +import org.hyperledger.besu.ethereum.eth.manager.task.EthTask; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.services.pipeline.Pipeline; +import org.hyperledger.besu.util.ExceptionUtils; import java.time.Duration; import java.util.Collection; @@ -73,16 +69,18 @@ public class EthScheduler { final int computationWorkerCount, final MetricsSystem metricsSystem) { this( - newFixedThreadPool( + MonitoredExecutors.newFixedThreadPool( EthScheduler.class.getSimpleName() + "-Workers", syncWorkerCount, metricsSystem), - newScheduledThreadPool(EthScheduler.class.getSimpleName() + "-Timer", 1, metricsSystem), - newBoundedThreadPool( + MonitoredExecutors.newScheduledThreadPool( + EthScheduler.class.getSimpleName() + "-Timer", 1, metricsSystem), + MonitoredExecutors.newBoundedThreadPool( EthScheduler.class.getSimpleName() + "-Transactions", txWorkerCount, txWorkerQueueSize, metricsSystem), - newCachedThreadPool(EthScheduler.class.getSimpleName() + "-Services", metricsSystem), - newFixedThreadPool( + MonitoredExecutors.newCachedThreadPool( + EthScheduler.class.getSimpleName() + "-Services", metricsSystem), + MonitoredExecutors.newFixedThreadPool( EthScheduler.class.getSimpleName() + "-Computation", computationWorkerCount, metricsSystem)); diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthServer.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthServer.java similarity index 84% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthServer.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthServer.java index 4ab4382108..0b784ef0e0 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthServer.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthServer.java @@ -10,30 +10,30 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; - -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.messages.BlockBodiesMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.BlockHeadersMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV63; -import tech.pegasys.pantheon.ethereum.eth.messages.GetBlockBodiesMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.GetBlockHeadersMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.GetNodeDataMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.GetReceiptsMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.NodeDataMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.ReceiptsMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.eth.manager; + +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; +import org.hyperledger.besu.ethereum.eth.messages.BlockBodiesMessage; +import org.hyperledger.besu.ethereum.eth.messages.BlockHeadersMessage; +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; +import org.hyperledger.besu.ethereum.eth.messages.EthPV63; +import org.hyperledger.besu.ethereum.eth.messages.GetBlockBodiesMessage; +import org.hyperledger.besu.ethereum.eth.messages.GetBlockHeadersMessage; +import org.hyperledger.besu.ethereum.eth.messages.GetNodeDataMessage; +import org.hyperledger.besu.ethereum.eth.messages.GetReceiptsMessage; +import org.hyperledger.besu.ethereum.eth.messages.NodeDataMessage; +import org.hyperledger.besu.ethereum.eth.messages.ReceiptsMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/MonitoredExecutors.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/MonitoredExecutors.java similarity index 90% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/MonitoredExecutors.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/MonitoredExecutors.java index db1e3c68ad..28fa64b3b3 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/MonitoredExecutors.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/MonitoredExecutors.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; -import tech.pegasys.pantheon.ethereum.eth.manager.bounded.BoundedQueue; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; +import org.hyperledger.besu.ethereum.eth.manager.bounded.BoundedQueue; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; import java.util.Locale; import java.util.concurrent.BlockingQueue; @@ -109,31 +109,31 @@ public class MonitoredExecutors { new ThreadFactoryBuilder().setNameFormat(name + "-%d").build()); metricsSystem.createIntegerGauge( - PantheonMetricCategory.EXECUTORS, + BesuMetricCategory.EXECUTORS, metricName + "_queue_length_current", "Current number of tasks awaiting execution", executor.getQueue()::size); metricsSystem.createIntegerGauge( - PantheonMetricCategory.EXECUTORS, + BesuMetricCategory.EXECUTORS, metricName + "_active_threads_current", "Current number of threads executing tasks", executor::getActiveCount); metricsSystem.createIntegerGauge( - PantheonMetricCategory.EXECUTORS, + BesuMetricCategory.EXECUTORS, metricName + "_pool_size_current", "Current number of threads in the thread pool", executor::getPoolSize); metricsSystem.createLongGauge( - PantheonMetricCategory.EXECUTORS, + BesuMetricCategory.EXECUTORS, metricName + "_completed_tasks_total", "Total number of tasks executed", executor::getCompletedTaskCount); metricsSystem.createLongGauge( - PantheonMetricCategory.EXECUTORS, + BesuMetricCategory.EXECUTORS, metricName + "_submitted_tasks_total", "Total number of tasks executed", executor::getTaskCount); @@ -152,7 +152,7 @@ public class MonitoredExecutors { public CountingAbortPolicy(final String metricName, final MetricsSystem metricsSystem) { this.rejectedTaskCounter = metricsSystem.createCounter( - PantheonMetricCategory.EXECUTORS, + BesuMetricCategory.EXECUTORS, metricName + "_rejected_tasks_total", "Total number of tasks rejected by this executor"); } diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/PeerReputation.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PeerReputation.java similarity index 95% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/PeerReputation.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PeerReputation.java index 3a8c72b2dd..12d599ff1f 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/PeerReputation.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PeerReputation.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; import java.util.Map; import java.util.Optional; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/PeerRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PeerRequest.java similarity index 75% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/PeerRequest.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PeerRequest.java index c5633be905..f3ec8bd0a3 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/PeerRequest.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PeerRequest.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; -import tech.pegasys.pantheon.ethereum.eth.manager.RequestManager.ResponseStream; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; +import org.hyperledger.besu.ethereum.eth.manager.RequestManager.ResponseStream; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; public interface PeerRequest { ResponseStream sendRequest(EthPeer peer) throws PeerNotConnected; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/PendingPeerRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PendingPeerRequest.java similarity index 90% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/PendingPeerRequest.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PendingPeerRequest.java index db1bab9c38..186a0fb8da 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/PendingPeerRequest.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PendingPeerRequest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; -import tech.pegasys.pantheon.ethereum.eth.manager.RequestManager.ResponseStream; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.NoAvailablePeersException; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.PeerDisconnectedException; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; +import org.hyperledger.besu.ethereum.eth.manager.RequestManager.ResponseStream; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.NoAvailablePeersException; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.PeerDisconnectedException; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; import java.util.Optional; import java.util.concurrent.CancellationException; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/RequestManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/RequestManager.java similarity index 96% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/RequestManager.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/RequestManager.java index fac3745932..650abb4429 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/RequestManager.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/RequestManager.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/bounded/BoundedQueue.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/bounded/BoundedQueue.java similarity index 82% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/bounded/BoundedQueue.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/bounded/BoundedQueue.java index 30dfc8eec1..08099dd55d 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/bounded/BoundedQueue.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/bounded/BoundedQueue.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.bounded; +package org.hyperledger.besu.ethereum.eth.manager.bounded; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; import java.util.concurrent.LinkedBlockingDeque; @@ -28,7 +28,7 @@ public class BoundedQueue extends LinkedBlockingDeque { this.metricsSystem = metricsSystem; this.totalEvictedTaskCounter = this.metricsSystem.createCounter( - PantheonMetricCategory.EXECUTORS, + BesuMetricCategory.EXECUTORS, metricName + "_dropped_tasks_total", "Total number of tasks rejected by this working queue."); } diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/EthTaskException.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/EthTaskException.java similarity index 94% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/EthTaskException.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/EthTaskException.java index cdaec77f76..c35ce08995 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/EthTaskException.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/EthTaskException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.exceptions; +package org.hyperledger.besu.ethereum.eth.manager.exceptions; public class EthTaskException extends RuntimeException { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/IncompleteResultsException.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/IncompleteResultsException.java similarity index 92% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/IncompleteResultsException.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/IncompleteResultsException.java index 09b543a24b..95e851b498 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/IncompleteResultsException.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/IncompleteResultsException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.exceptions; +package org.hyperledger.besu.ethereum.eth.manager.exceptions; public class IncompleteResultsException extends EthTaskException { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/MaxRetriesReachedException.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/MaxRetriesReachedException.java similarity index 92% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/MaxRetriesReachedException.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/MaxRetriesReachedException.java index 368ca50734..5406715f6e 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/MaxRetriesReachedException.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/MaxRetriesReachedException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.exceptions; +package org.hyperledger.besu.ethereum.eth.manager.exceptions; public class MaxRetriesReachedException extends EthTaskException { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/NoAvailablePeersException.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/NoAvailablePeersException.java similarity index 92% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/NoAvailablePeersException.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/NoAvailablePeersException.java index f549a7ed10..cd49e520a2 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/NoAvailablePeersException.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/NoAvailablePeersException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.exceptions; +package org.hyperledger.besu.ethereum.eth.manager.exceptions; public class NoAvailablePeersException extends EthTaskException { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/PeerBreachedProtocolException.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/PeerBreachedProtocolException.java similarity index 92% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/PeerBreachedProtocolException.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/PeerBreachedProtocolException.java index 8af4221f74..dd2a5a4a61 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/PeerBreachedProtocolException.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/PeerBreachedProtocolException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.exceptions; +package org.hyperledger.besu.ethereum.eth.manager.exceptions; public class PeerBreachedProtocolException extends EthTaskException { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/PeerDisconnectedException.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/PeerDisconnectedException.java similarity index 88% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/PeerDisconnectedException.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/PeerDisconnectedException.java index 6b8d5cacc5..ca1664af1f 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/PeerDisconnectedException.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/PeerDisconnectedException.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.exceptions; +package org.hyperledger.besu.ethereum.eth.manager.exceptions; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; public class PeerDisconnectedException extends EthTaskException { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractEthTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractEthTask.java similarity index 89% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractEthTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractEthTask.java index f2cd7fdfad..f29f245882 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractEthTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractEthTask.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; -import static tech.pegasys.pantheon.util.FutureUtils.completedExceptionally; +import static org.hyperledger.besu.util.FutureUtils.completedExceptionally; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.plugin.services.metrics.OperationTimer; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.plugin.services.metrics.OperationTimer; import java.util.Collection; import java.util.concurrent.CancellationException; @@ -50,7 +50,7 @@ public abstract class AbstractEthTask implements EthTask { private static OperationTimer buildOperationTimer(final MetricsSystem metricsSystem) { final LabelledMetric ethTasksTimer = metricsSystem.createLabelledTimer( - PantheonMetricCategory.SYNCHRONIZER, "task", "Internal processing tasks", "taskName"); + BesuMetricCategory.SYNCHRONIZER, "task", "Internal processing tasks", "taskName"); if (ethTasksTimer == NoOpMetricsSystem.NO_OP_LABELLED_1_OPERATION_TIMER) { return () -> new OperationTimer.TimingContext() { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractGetHeadersFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractGetHeadersFromPeerTask.java similarity index 86% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractGetHeadersFromPeerTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractGetHeadersFromPeerTask.java index 1bef230387..eb098e18f5 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractGetHeadersFromPeerTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractGetHeadersFromPeerTask.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.messages.BlockHeadersMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.messages.BlockHeadersMessage; +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractPeerRequestTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractPeerRequestTask.java similarity index 78% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractPeerRequestTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractPeerRequestTask.java index 2d458dfa91..3344946a11 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractPeerRequestTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractPeerRequestTask.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.PeerRequest; -import tech.pegasys.pantheon.ethereum.eth.manager.PendingPeerRequest; -import tech.pegasys.pantheon.ethereum.eth.manager.RequestManager.ResponseStream; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.PeerBreachedProtocolException; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.ExceptionUtils; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.PeerRequest; +import org.hyperledger.besu.ethereum.eth.manager.PendingPeerRequest; +import org.hyperledger.besu.ethereum.eth.manager.RequestManager; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.PeerBreachedProtocolException; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.ExceptionUtils; import java.time.Duration; import java.util.Optional; @@ -64,7 +64,8 @@ public abstract class AbstractPeerRequestTask extends AbstractPeerTask { promise.whenComplete( (r, t) -> { - final Optional responseStream = this.responseStream.abort(); + final Optional responseStream = + this.responseStream.abort(); if (t != null) { t = ExceptionUtils.rootCause(t); if (t instanceof TimeoutException && responseStream.isPresent()) { @@ -105,7 +106,7 @@ public abstract class AbstractPeerRequestTask extends AbstractPeerTask { @Override protected void cleanup() { super.cleanup(); - responseStream.abort().ifPresent(ResponseStream::close); + responseStream.abort().ifPresent(RequestManager.ResponseStream::close); } protected abstract PendingPeerRequest sendRequest(); diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractPeerTask.java similarity index 81% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractPeerTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractPeerTask.java index 28c83ac28c..83228c1fb5 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractPeerTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractPeerTask.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.Optional; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractRetryingPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractRetryingPeerTask.java similarity index 87% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractRetryingPeerTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractRetryingPeerTask.java index 7f85f6b7cf..045ef8a5f7 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractRetryingPeerTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractRetryingPeerTask.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.MaxRetriesReachedException; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.NoAvailablePeersException; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.PeerBreachedProtocolException; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.PeerDisconnectedException; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.ExceptionUtils; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.MaxRetriesReachedException; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.NoAvailablePeersException; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.PeerBreachedProtocolException; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.PeerDisconnectedException; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.ExceptionUtils; import java.time.Duration; import java.util.Optional; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/EthTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/EthTask.java similarity index 93% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/EthTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/EthTask.java index 9388aa123a..a881ad2135 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/EthTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/EthTask.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetBlockFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBlockFromPeerTask.java similarity index 86% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetBlockFromPeerTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBlockFromPeerTask.java index 53445c1137..d1316d1284 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetBlockFromPeerTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBlockFromPeerTask.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; -import static tech.pegasys.pantheon.util.FutureUtils.completedExceptionally; +import static org.hyperledger.besu.util.FutureUtils.completedExceptionally; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.IncompleteResultsException; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.IncompleteResultsException; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetBodiesFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTask.java similarity index 85% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetBodiesFromPeerTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTask.java index f89dddf658..e98e695044 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetBodiesFromPeerTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTask.java @@ -10,25 +10,25 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.PendingPeerRequest; -import tech.pegasys.pantheon.ethereum.eth.messages.BlockBodiesMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; -import tech.pegasys.pantheon.ethereum.mainnet.BodyValidation; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.PendingPeerRequest; +import org.hyperledger.besu.ethereum.eth.messages.BlockBodiesMessage; +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; +import org.hyperledger.besu.ethereum.mainnet.BodyValidation; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.bytes.Bytes32; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetHeadersFromPeerByHashTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTask.java similarity index 90% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetHeadersFromPeerByHashTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTask.java index 49b1aabf70..0827a8e164 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetHeadersFromPeerByHashTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTask.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; import static com.google.common.base.Preconditions.checkNotNull; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.PendingPeerRequest; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.PendingPeerRequest; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.plugin.services.MetricsSystem; import com.google.common.annotations.VisibleForTesting; import org.apache.logging.log4j.LogManager; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTask.java similarity index 89% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTask.java index 4ac73e76ad..36f9af1ef0 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTask.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.PendingPeerRequest; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.PendingPeerRequest; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.plugin.services.MetricsSystem; import com.google.common.annotations.VisibleForTesting; import org.apache.logging.log4j.LogManager; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetNodeDataFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTask.java similarity index 83% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetNodeDataFromPeerTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTask.java index b6e6cc419f..d69543a369 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetNodeDataFromPeerTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTask.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; import static java.util.Collections.emptyMap; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.PendingPeerRequest; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV63; -import tech.pegasys.pantheon.ethereum.eth.messages.NodeDataMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.PendingPeerRequest; +import org.hyperledger.besu.ethereum.eth.messages.EthPV63; +import org.hyperledger.besu.ethereum.eth.messages.NodeDataMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collection; import java.util.HashMap; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetReceiptsFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetReceiptsFromPeerTask.java similarity index 84% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetReceiptsFromPeerTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetReceiptsFromPeerTask.java index 57268c06a4..a81120ad2c 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetReceiptsFromPeerTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetReceiptsFromPeerTask.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; import static java.util.Collections.emptyMap; import static java.util.stream.Collectors.toList; -import static tech.pegasys.pantheon.ethereum.mainnet.BodyValidation.receiptsRoot; +import static org.hyperledger.besu.ethereum.mainnet.BodyValidation.receiptsRoot; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.PendingPeerRequest; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV63; -import tech.pegasys.pantheon.ethereum.eth.messages.ReceiptsMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.PendingPeerRequest; +import org.hyperledger.besu.ethereum.eth.messages.EthPV63; +import org.hyperledger.besu.ethereum.eth.messages.ReceiptsMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTask.java similarity index 87% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTask.java index 907898c21e..6bc4843abb 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTask.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collection; import java.util.HashSet; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/WaitForPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeerTask.java similarity index 89% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/WaitForPeerTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeerTask.java index 066237e27e..8a0ca3ea96 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/WaitForPeerTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeerTask.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers; +import org.hyperledger.besu.plugin.services.MetricsSystem; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/WaitForPeersTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeersTask.java similarity index 91% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/WaitForPeersTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeersTask.java index 94066529b0..b99981d5c0 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/task/WaitForPeersTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeersTask.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers; +import org.hyperledger.besu.plugin.services.MetricsSystem; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockBodiesMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/BlockBodiesMessage.java similarity index 74% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockBodiesMessage.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/BlockBodiesMessage.java index ec6952b685..3b2728df1c 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockBodiesMessage.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/BlockBodiesMessage.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.AbstractMessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockHeadersMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/BlockHeadersMessage.java similarity index 76% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockHeadersMessage.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/BlockHeadersMessage.java index 01402c765e..e159a79fd0 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockHeadersMessage.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/BlockHeadersMessage.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.AbstractMessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/EthPV62.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/EthPV62.java similarity index 95% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/EthPV62.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/EthPV62.java index bc5ab84338..e79eb33561 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/EthPV62.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/EthPV62.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; public final class EthPV62 { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/EthPV63.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/EthPV63.java similarity index 94% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/EthPV63.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/EthPV63.java index 76e151c704..5d5c6ab2a6 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/EthPV63.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/EthPV63.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; public final class EthPV63 { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockBodiesMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockBodiesMessage.java similarity index 80% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockBodiesMessage.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockBodiesMessage.java index 35cde7557f..518dd20d64 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockBodiesMessage.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockBodiesMessage.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.AbstractMessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockHeadersMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockHeadersMessage.java similarity index 92% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockHeadersMessage.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockHeadersMessage.java index d3f7769e73..84244ac71e 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockHeadersMessage.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockHeadersMessage.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.AbstractMessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; import java.util.OptionalLong; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetNodeDataMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetNodeDataMessage.java similarity index 80% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetNodeDataMessage.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetNodeDataMessage.java index 957311aa13..2d46d1e115 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetNodeDataMessage.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetNodeDataMessage.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.AbstractMessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetReceiptsMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetReceiptsMessage.java similarity index 80% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetReceiptsMessage.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetReceiptsMessage.java index 2766310b3a..6759dcde99 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetReceiptsMessage.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetReceiptsMessage.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.AbstractMessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/LimitedTransactionsMessages.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/LimitedTransactionsMessages.java similarity index 91% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/LimitedTransactionsMessages.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/LimitedTransactionsMessages.java index 2821a34ee3..075efff605 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/LimitedTransactionsMessages.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/LimitedTransactionsMessages.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.HashSet; import java.util.Set; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockHashesMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NewBlockHashesMessage.java similarity index 89% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockHashesMessage.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NewBlockHashesMessage.java index 80455ddf8e..c9b4de9975 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockHashesMessage.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NewBlockHashesMessage.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; - -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.AbstractMessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.eth.messages; + +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Iterator; import java.util.Objects; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NewBlockMessage.java similarity index 81% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockMessage.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NewBlockMessage.java index 2bab92dcc9..a6fdb80f34 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockMessage.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NewBlockMessage.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; - -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.AbstractMessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.eth.messages; + +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; public class NewBlockMessage extends AbstractMessageData { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NodeDataMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NodeDataMessage.java similarity index 81% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NodeDataMessage.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NodeDataMessage.java index c5e995d51c..b48734dc2c 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NodeDataMessage.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NodeDataMessage.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.AbstractMessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/ReceiptsMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/ReceiptsMessage.java similarity index 82% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/ReceiptsMessage.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/ReceiptsMessage.java index 6c5015a9ae..5e037944fa 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/ReceiptsMessage.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/ReceiptsMessage.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.AbstractMessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/StatusMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/StatusMessage.java similarity index 87% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/StatusMessage.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/StatusMessage.java index ad2b90cc21..f678ef01c7 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/StatusMessage.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/StatusMessage.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; - -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.AbstractMessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.eth.messages; + +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/TransactionsMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/TransactionsMessage.java similarity index 79% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/TransactionsMessage.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/TransactionsMessage.java index a19438c16d..e20333d999 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/TransactionsMessage.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/TransactionsMessage.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; - -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.AbstractMessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.eth.messages; + +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Iterator; import java.util.function.Function; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/peervalidation/DaoForkPeerValidator.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/DaoForkPeerValidator.java similarity index 88% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/peervalidation/DaoForkPeerValidator.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/DaoForkPeerValidator.java index 15dc45100a..d696d98498 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/peervalidation/DaoForkPeerValidator.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/DaoForkPeerValidator.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.peervalidation; +package org.hyperledger.besu.ethereum.eth.peervalidation; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractPeerTask; -import tech.pegasys.pantheon.ethereum.eth.manager.task.GetHeadersFromPeerByNumberTask; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderValidator; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask; +import org.hyperledger.besu.ethereum.eth.manager.task.GetHeadersFromPeerByNumberTask; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderValidator; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.time.Duration; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/peervalidation/PeerValidator.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/PeerValidator.java similarity index 88% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/peervalidation/PeerValidator.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/PeerValidator.java index 930070d48e..24877cd3de 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/peervalidation/PeerValidator.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/PeerValidator.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.peervalidation; +package org.hyperledger.besu.ethereum.eth.peervalidation; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; import java.time.Duration; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/peervalidation/PeerValidatorRunner.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/PeerValidatorRunner.java similarity index 92% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/peervalidation/PeerValidatorRunner.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/PeerValidatorRunner.java index c81fcf320f..6822bd3c49 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/peervalidation/PeerValidatorRunner.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/PeerValidatorRunner.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.peervalidation; +package org.hyperledger.besu.ethereum.eth.peervalidation; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; import java.time.Duration; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockBroadcaster.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockBroadcaster.java similarity index 83% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockBroadcaster.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockBroadcaster.java index ea395eec8e..1f4ac9e097 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockBroadcaster.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockBroadcaster.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; - -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.messages.NewBlockMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.util.Subscribers; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.eth.sync; + +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.messages.NewBlockMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.util.Subscribers; +import org.hyperledger.besu.util.uint.UInt256; import java.util.function.Consumer; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManager.java similarity index 88% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManager.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManager.java index dc6e890097..abf0a35632 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManager.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManager.java @@ -10,35 +10,35 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent.EventType; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthMessage; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractPeerTask; -import tech.pegasys.pantheon.ethereum.eth.manager.task.GetBlockFromPeerTask; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; -import tech.pegasys.pantheon.ethereum.eth.messages.NewBlockHashesMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.NewBlockHashesMessage.NewBlockHash; -import tech.pegasys.pantheon.ethereum.eth.messages.NewBlockMessage; -import tech.pegasys.pantheon.ethereum.eth.sync.state.PendingBlocks; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.PersistBlockTask; -import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.uint.UInt256; +package org.hyperledger.besu.ethereum.eth.sync; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent.EventType; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthMessage; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask; +import org.hyperledger.besu.ethereum.eth.manager.task.GetBlockFromPeerTask; +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; +import org.hyperledger.besu.ethereum.eth.messages.NewBlockHashesMessage; +import org.hyperledger.besu.ethereum.eth.messages.NewBlockHashesMessage.NewBlockHash; +import org.hyperledger.besu.ethereum.eth.messages.NewBlockMessage; +import org.hyperledger.besu.ethereum.eth.sync.state.PendingBlocks; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.eth.sync.tasks.PersistBlockTask; +import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/ChainDownloader.java similarity index 93% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainDownloader.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/ChainDownloader.java index 25a9bd1267..59b7cbbb84 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainDownloader.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/ChainDownloader.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainHeadTracker.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/ChainHeadTracker.java similarity index 80% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainHeadTracker.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/ChainHeadTracker.java index 58aa444499..38df1f34f5 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainHeadTracker.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/ChainHeadTracker.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers.ConnectCallback; -import tech.pegasys.pantheon.ethereum.eth.manager.task.GetHeadersFromPeerByHashTask; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers.ConnectCallback; +import org.hyperledger.besu.ethereum.eth.manager.task.GetHeadersFromPeerByHashTask; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.function.Supplier; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointHeaderFetcher.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderFetcher.java similarity index 89% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointHeaderFetcher.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderFetcher.java index 65847e955f..a3c42367d5 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointHeaderFetcher.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderFetcher.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static java.util.concurrent.CompletableFuture.completedFuture; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; -import tech.pegasys.pantheon.ethereum.eth.manager.task.GetHeadersFromPeerByHashTask; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; +import org.hyperledger.besu.ethereum.eth.manager.task.GetHeadersFromPeerByHashTask; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.List; import java.util.Optional; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointHeaderValidationStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderValidationStep.java similarity index 88% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointHeaderValidationStep.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderValidationStep.java index aebd574a13..c5a0a5b82f 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointHeaderValidationStep.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderValidationStep.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; +import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; import java.util.function.Function; import java.util.stream.Stream; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointRange.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRange.java similarity index 93% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointRange.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRange.java index 87d0877473..8d9c3fdc5b 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointRange.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRange.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static java.lang.Math.toIntExact; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; import java.util.Objects; import java.util.Optional; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointRangeHeaders.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeHeaders.java similarity index 95% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointRangeHeaders.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeHeaders.java index 0631985b44..a848af8d33 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointRangeHeaders.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeHeaders.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.List; import java.util.Objects; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointRangeSource.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeSource.java similarity index 96% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointRangeSource.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeSource.java index f9b951e510..d810347752 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointRangeSource.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeSource.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static java.util.Collections.emptyList; import static java.util.concurrent.CompletableFuture.completedFuture; import static java.util.concurrent.TimeUnit.MILLISECONDS; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; import java.time.Duration; import java.util.ArrayDeque; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DefaultSynchronizer.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DefaultSynchronizer.java similarity index 81% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DefaultSynchronizer.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DefaultSynchronizer.java index 20993cd01c..6eaf719890 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DefaultSynchronizer.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DefaultSynchronizer.java @@ -10,29 +10,29 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static com.google.common.base.Preconditions.checkNotNull; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.sync.fastsync.FastDownloaderFactory; -import tech.pegasys.pantheon.ethereum.eth.sync.fastsync.FastSyncDownloader; -import tech.pegasys.pantheon.ethereum.eth.sync.fastsync.FastSyncException; -import tech.pegasys.pantheon.ethereum.eth.sync.fastsync.FastSyncState; -import tech.pegasys.pantheon.ethereum.eth.sync.fullsync.FullSyncDownloader; -import tech.pegasys.pantheon.ethereum.eth.sync.state.PendingBlocks; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.worldstate.Pruner; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.data.SyncStatus; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.PantheonEvents.SyncStatusListener; -import tech.pegasys.pantheon.util.ExceptionUtils; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastDownloaderFactory; +import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncDownloader; +import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncException; +import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState; +import org.hyperledger.besu.ethereum.eth.sync.fullsync.FullSyncDownloader; +import org.hyperledger.besu.ethereum.eth.sync.state.PendingBlocks; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.worldstate.Pruner; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.data.SyncStatus; +import org.hyperledger.besu.plugin.services.BesuEvents.SyncStatusListener; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.ExceptionUtils; +import org.hyperledger.besu.util.Subscribers; import java.nio.file.Path; import java.time.Clock; @@ -103,12 +103,12 @@ public class DefaultSynchronizer implements Synchronizer { clock); metricsSystem.createLongGauge( - PantheonMetricCategory.ETHEREUM, + BesuMetricCategory.ETHEREUM, "best_known_block_number", "The estimated highest block available", () -> syncState.syncStatus().getHighestBlock()); metricsSystem.createIntegerGauge( - PantheonMetricCategory.SYNCHRONIZER, + BesuMetricCategory.SYNCHRONIZER, "in_sync", "Whether or not the local node has caught up to the best known peer", () -> getSyncStatus().isPresent() ? 0 : 1); diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DownloadBodiesStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadBodiesStep.java similarity index 77% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DownloadBodiesStep.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadBodiesStep.java index 4f3a13697f..be12f0ca37 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DownloadBodiesStep.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadBodiesStep.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.CompleteBlocksTask; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.sync.tasks.CompleteBlocksTask; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DownloadHeadersStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadHeadersStep.java similarity index 87% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DownloadHeadersStep.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadHeadersStep.java index e1f59440e6..da302df0f9 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DownloadHeadersStep.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadHeadersStep.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static java.util.Collections.emptyList; import static java.util.concurrent.CompletableFuture.completedFuture; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; -import tech.pegasys.pantheon.ethereum.eth.manager.task.GetHeadersFromPeerByHashTask; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.DownloadHeaderSequenceTask; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.FutureUtils; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; +import org.hyperledger.besu.ethereum.eth.manager.task.GetHeadersFromPeerByHashTask; +import org.hyperledger.besu.ethereum.eth.sync.tasks.DownloadHeaderSequenceTask; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.FutureUtils; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DownloadPipelineFactory.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadPipelineFactory.java similarity index 84% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DownloadPipelineFactory.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadPipelineFactory.java index c0454d724c..2cff3ac20e 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DownloadPipelineFactory.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadPipelineFactory.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncTarget; -import tech.pegasys.pantheon.services.pipeline.Pipeline; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncTarget; +import org.hyperledger.besu.services.pipeline.Pipeline; public interface DownloadPipelineFactory { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/PipelineChainDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/PipelineChainDownloader.java similarity index 84% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/PipelineChainDownloader.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/PipelineChainDownloader.java index f8eb5aac01..bf36221b52 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/PipelineChainDownloader.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/PipelineChainDownloader.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static java.util.concurrent.CompletableFuture.completedFuture; -import static tech.pegasys.pantheon.util.FutureUtils.completedExceptionally; -import static tech.pegasys.pantheon.util.FutureUtils.exceptionallyCompose; - -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.EthTaskException; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncTarget; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.services.pipeline.Pipeline; -import tech.pegasys.pantheon.util.ExceptionUtils; +import static org.hyperledger.besu.util.FutureUtils.completedExceptionally; +import static org.hyperledger.besu.util.FutureUtils.exceptionallyCompose; + +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.EthTaskException; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncTarget; +import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.services.pipeline.Pipeline; +import org.hyperledger.besu.util.ExceptionUtils; import java.time.Duration; import java.util.Optional; @@ -66,7 +66,7 @@ public class PipelineChainDownloader implements ChainDownloader { final LabelledMetric labelledCounter = metricsSystem.createLabelledCounter( - PantheonMetricCategory.SYNCHRONIZER, + BesuMetricCategory.SYNCHRONIZER, "chain_download_pipeline_restarts", "Number of times the chain download pipeline has been restarted", "reason"); diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SyncMode.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SyncMode.java similarity index 95% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SyncMode.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SyncMode.java index 67366816cd..2a6f57a260 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SyncMode.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SyncMode.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; public enum SyncMode { // Fully validate all blocks as they sync diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SyncTargetManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SyncTargetManager.java similarity index 88% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SyncTargetManager.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SyncTargetManager.java index 84f60644c4..370c0b7ecc 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SyncTargetManager.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SyncTargetManager.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static java.util.concurrent.CompletableFuture.completedFuture; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.task.WaitForPeerTask; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncTarget; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.DetermineCommonAncestorTask; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.task.WaitForPeerTask; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncTarget; +import org.hyperledger.besu.ethereum.eth.sync.tasks.DetermineCommonAncestorTask; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.time.Duration; import java.util.Optional; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SynchronizerConfiguration.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SynchronizerConfiguration.java similarity index 98% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SynchronizerConfiguration.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SynchronizerConfiguration.java index 6981302f64..9b6deb40e3 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SynchronizerConfiguration.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SynchronizerConfiguration.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import tech.pegasys.pantheon.services.tasks.CachingTaskCollection; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.services.tasks.CachingTaskCollection; +import org.hyperledger.besu.util.uint.UInt256; import java.util.concurrent.TimeUnit; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/TrailingPeerLimiter.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerLimiter.java similarity index 87% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/TrailingPeerLimiter.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerLimiter.java index 0c7d1b184d..a7f9024ca0 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/TrailingPeerLimiter.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerLimiter.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedObserver; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.BlockAddedObserver; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; import java.util.Comparator; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/TrailingPeerRequirements.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerRequirements.java similarity index 96% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/TrailingPeerRequirements.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerRequirements.java index 5db34e748c..3c33145fef 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/TrailingPeerRequirements.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerRequirements.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.Objects; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/ValidationPolicy.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/ValidationPolicy.java similarity index 85% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/ValidationPolicy.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/ValidationPolicy.java index 13df9ebb73..7a2a6c0724 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/ValidationPolicy.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/ValidationPolicy.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; @FunctionalInterface public interface ValidationPolicy { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/BlockWithReceipts.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/BlockWithReceipts.java similarity index 87% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/BlockWithReceipts.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/BlockWithReceipts.java index 1613a0ab37..c79c16c815 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/BlockWithReceipts.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/BlockWithReceipts.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; import java.util.List; import java.util.Objects; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/DownloadReceiptsStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/DownloadReceiptsStep.java similarity index 83% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/DownloadReceiptsStep.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/DownloadReceiptsStep.java index 0c5d4d2f18..92673fc243 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/DownloadReceiptsStep.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/DownloadReceiptsStep.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; import static java.util.Collections.emptyList; import static java.util.stream.Collectors.toList; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.GetReceiptsForHeadersTask; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.FutureUtils; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.sync.tasks.GetReceiptsForHeadersTask; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.FutureUtils; import java.util.List; import java.util.Map; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastDownloaderFactory.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastDownloaderFactory.java similarity index 81% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastDownloaderFactory.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastDownloaderFactory.java index ea04ad0c6d..d95af48554 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastDownloaderFactory.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastDownloaderFactory.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.sync.SyncMode; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.eth.sync.worldstate.NodeDataRequest; -import tech.pegasys.pantheon.ethereum.eth.sync.worldstate.WorldStateDownloader; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.services.tasks.CachingTaskCollection; -import tech.pegasys.pantheon.services.tasks.FlatFileTaskCollection; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.sync.SyncMode; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.eth.sync.worldstate.NodeDataRequest; +import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloader; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.services.tasks.CachingTaskCollection; +import org.hyperledger.besu.services.tasks.FlatFileTaskCollection; import java.io.File; import java.nio.file.Path; @@ -128,13 +128,13 @@ public class FastDownloaderFactory { worldStateTaskCacheSize); metricsSystem.createLongGauge( - PantheonMetricCategory.SYNCHRONIZER, + BesuMetricCategory.SYNCHRONIZER, "world_state_pending_requests_current", "Number of pending requests for fast sync world state download", taskCollection::size); metricsSystem.createIntegerGauge( - PantheonMetricCategory.SYNCHRONIZER, + BesuMetricCategory.SYNCHRONIZER, "world_state_pending_requests_cache_size", "Pending request cache size for fast sync world state download", taskCollection::cacheSize); diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastImportBlocksStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksStep.java similarity index 87% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastImportBlocksStep.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksStep.java index 12f700ec89..7b97c4782f 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastImportBlocksStep.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksStep.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.eth.sync.ValidationPolicy; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.eth.sync.ValidationPolicy; +import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; import java.util.List; import java.util.function.Consumer; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncActions.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActions.java similarity index 86% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncActions.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActions.java index ed006ce74f..7f37a319de 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncActions.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActions.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; import static java.util.concurrent.CompletableFuture.completedFuture; -import static tech.pegasys.pantheon.util.FutureUtils.completedExceptionally; -import static tech.pegasys.pantheon.util.FutureUtils.exceptionallyCompose; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.task.WaitForPeersTask; -import tech.pegasys.pantheon.ethereum.eth.sync.ChainDownloader; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.util.ExceptionUtils; +import static org.hyperledger.besu.util.FutureUtils.completedExceptionally; +import static org.hyperledger.besu.util.FutureUtils.exceptionallyCompose; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.task.WaitForPeersTask; +import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.util.ExceptionUtils; import java.time.Duration; import java.util.concurrent.CompletableFuture; @@ -65,11 +65,11 @@ public class FastSyncActions { pivotBlockSelectionCounter = metricsSystem.createCounter( - PantheonMetricCategory.SYNCHRONIZER, + BesuMetricCategory.SYNCHRONIZER, "fast_sync_pivot_block_selected_count", "Number of times a fast sync pivot block has been selected"); metricsSystem.createLongGauge( - PantheonMetricCategory.SYNCHRONIZER, + BesuMetricCategory.SYNCHRONIZER, "fast_sync_pivot_block_current", "The current fast sync pivot block", pivotBlockGauge::get); diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncChainDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncChainDownloader.java similarity index 70% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncChainDownloader.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncChainDownloader.java index 2f3dad9ddf..413b1f12e8 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncChainDownloader.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncChainDownloader.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.sync.ChainDownloader; -import tech.pegasys.pantheon.ethereum.eth.sync.PipelineChainDownloader; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader; +import org.hyperledger.besu.ethereum.eth.sync.PipelineChainDownloader; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.plugin.services.MetricsSystem; public class FastSyncChainDownloader { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncDownloadPipelineFactory.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloadPipelineFactory.java similarity index 74% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncDownloadPipelineFactory.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloadPipelineFactory.java index 4fa55eabea..ab87a92ab5 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncDownloadPipelineFactory.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloadPipelineFactory.java @@ -10,34 +10,34 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; -import static tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode.DETACHED_ONLY; -import static tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode.FULL; -import static tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode.LIGHT; -import static tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode.LIGHT_DETACHED_ONLY; -import static tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode.LIGHT_SKIP_DETACHED; -import static tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode.SKIP_DETACHED; +import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.DETACHED_ONLY; +import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.FULL; +import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.LIGHT; +import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.LIGHT_DETACHED_ONLY; +import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.LIGHT_SKIP_DETACHED; +import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.SKIP_DETACHED; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.sync.CheckpointHeaderFetcher; -import tech.pegasys.pantheon.ethereum.eth.sync.CheckpointHeaderValidationStep; -import tech.pegasys.pantheon.ethereum.eth.sync.CheckpointRangeSource; -import tech.pegasys.pantheon.ethereum.eth.sync.DownloadBodiesStep; -import tech.pegasys.pantheon.ethereum.eth.sync.DownloadHeadersStep; -import tech.pegasys.pantheon.ethereum.eth.sync.DownloadPipelineFactory; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncTarget; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.services.pipeline.Pipeline; -import tech.pegasys.pantheon.services.pipeline.PipelineBuilder; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.sync.CheckpointHeaderFetcher; +import org.hyperledger.besu.ethereum.eth.sync.CheckpointHeaderValidationStep; +import org.hyperledger.besu.ethereum.eth.sync.CheckpointRangeSource; +import org.hyperledger.besu.ethereum.eth.sync.DownloadBodiesStep; +import org.hyperledger.besu.ethereum.eth.sync.DownloadHeadersStep; +import org.hyperledger.besu.ethereum.eth.sync.DownloadPipelineFactory; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncTarget; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.services.pipeline.Pipeline; +import org.hyperledger.besu.services.pipeline.PipelineBuilder; import java.util.Optional; @@ -67,7 +67,7 @@ public class FastSyncDownloadPipelineFactory implements DownloadPipelineFacto this.metricsSystem = metricsSystem; final LabelledMetric fastSyncValidationCounter = metricsSystem.createLabelledCounter( - PantheonMetricCategory.SYNCHRONIZER, + BesuMetricCategory.SYNCHRONIZER, "fast_sync_validation_mode", "Number of blocks validated using light vs full validation during fast sync", "validationMode"); @@ -133,7 +133,7 @@ public class FastSyncDownloadPipelineFactory implements DownloadPipelineFacto checkpointRangeSource, downloaderParallelism, metricsSystem.createLabelledCounter( - PantheonMetricCategory.SYNCHRONIZER, + BesuMetricCategory.SYNCHRONIZER, "chain_download_pipeline_processed_total", "Number of entries process by each chain download pipeline stage", "step", diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloader.java similarity index 89% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncDownloader.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloader.java index 86bf748de2..0bc366976a 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncDownloader.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloader.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; - -import static tech.pegasys.pantheon.util.FutureUtils.completedExceptionally; -import static tech.pegasys.pantheon.util.FutureUtils.exceptionallyCompose; - -import tech.pegasys.pantheon.ethereum.eth.sync.ChainDownloader; -import tech.pegasys.pantheon.ethereum.eth.sync.TrailingPeerRequirements; -import tech.pegasys.pantheon.ethereum.eth.sync.worldstate.NodeDataRequest; -import tech.pegasys.pantheon.ethereum.eth.sync.worldstate.StalledDownloadException; -import tech.pegasys.pantheon.ethereum.eth.sync.worldstate.WorldStateDownloader; -import tech.pegasys.pantheon.services.tasks.TaskCollection; -import tech.pegasys.pantheon.util.ExceptionUtils; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; + +import static org.hyperledger.besu.util.FutureUtils.completedExceptionally; +import static org.hyperledger.besu.util.FutureUtils.exceptionallyCompose; + +import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader; +import org.hyperledger.besu.ethereum.eth.sync.TrailingPeerRequirements; +import org.hyperledger.besu.ethereum.eth.sync.worldstate.NodeDataRequest; +import org.hyperledger.besu.ethereum.eth.sync.worldstate.StalledDownloadException; +import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloader; +import org.hyperledger.besu.services.tasks.TaskCollection; +import org.hyperledger.besu.util.ExceptionUtils; import java.io.IOException; import java.nio.file.Path; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncError.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncError.java similarity index 92% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncError.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncError.java index dbcebf16b7..7e097f356f 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncError.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncError.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; public enum FastSyncError { NO_PEERS_AVAILABLE, diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncException.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncException.java similarity index 93% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncException.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncException.java index 6ef16c36cc..287b4aa52d 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncException.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; public class FastSyncException extends RuntimeException { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncState.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncState.java similarity index 95% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncState.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncState.java index 7586b800d3..1fb5e7e925 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncState.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncState.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeader; import java.util.Objects; import java.util.Optional; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncStateStorage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncStateStorage.java similarity index 89% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncStateStorage.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncStateStorage.java index 5e48fb45fd..93a2c07991 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncStateStorage.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncStateStorage.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.File; import java.io.IOException; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncTargetManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncTargetManager.java similarity index 81% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncTargetManager.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncTargetManager.java index 9f85ed2c49..10139ad7a0 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncTargetManager.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncTargetManager.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; import static java.util.concurrent.CompletableFuture.completedFuture; -import static tech.pegasys.pantheon.ethereum.eth.sync.fastsync.PivotBlockRetriever.MAX_PIVOT_BLOCK_RETRIES; +import static org.hyperledger.besu.ethereum.eth.sync.fastsync.PivotBlockRetriever.MAX_PIVOT_BLOCK_RETRIES; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.sync.SyncTargetManager; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.RetryingGetHeaderFromPeerByNumberTask; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.sync.SyncTargetManager; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.tasks.RetryingGetHeaderFromPeerByNumberTask; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.List; import java.util.Optional; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncValidationPolicy.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncValidationPolicy.java similarity index 83% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncValidationPolicy.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncValidationPolicy.java index 546a1d1300..81eb8c2e2f 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncValidationPolicy.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncValidationPolicy.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; -import tech.pegasys.pantheon.ethereum.eth.sync.ValidationPolicy; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.ethereum.eth.sync.ValidationPolicy; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; public class FastSyncValidationPolicy implements ValidationPolicy { private final float targetFullValidationRate; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/PivotBlockRetriever.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockRetriever.java similarity index 90% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/PivotBlockRetriever.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockRetriever.java index 3b8cd60f81..9a96b274ce 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/PivotBlockRetriever.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockRetriever.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.RetryingGetHeaderFromPeerByNumberTask; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.sync.tasks.RetryingGetHeaderFromPeerByNumberTask; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.Collection; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluator.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluator.java similarity index 86% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluator.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluator.java index 1ffe4b33ab..e392033eab 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluator.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluator.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fullsync; +package org.hyperledger.besu.ethereum.eth.sync.fullsync; -import tech.pegasys.pantheon.ethereum.eth.manager.ChainState; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.eth.manager.ChainState; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Optional; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/ExtractTxSignaturesStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/ExtractTxSignaturesStep.java similarity index 86% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/ExtractTxSignaturesStep.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/ExtractTxSignaturesStep.java index 61bfe8e640..b4a7559864 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/ExtractTxSignaturesStep.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/ExtractTxSignaturesStep.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fullsync; +package org.hyperledger.besu.ethereum.eth.sync.fullsync; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Transaction; import java.util.List; import java.util.function.Function; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullImportBlockStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullImportBlockStep.java similarity index 79% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullImportBlockStep.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullImportBlockStep.java index 8513d0ce47..4903e71af9 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullImportBlockStep.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullImportBlockStep.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fullsync; +package org.hyperledger.besu.ethereum.eth.sync.fullsync; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; import java.util.function.Consumer; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncChainDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloader.java similarity index 71% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncChainDownloader.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloader.java index 2fce036e0f..c5e8c2ce66 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncChainDownloader.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloader.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fullsync; +package org.hyperledger.besu.ethereum.eth.sync.fullsync; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.sync.ChainDownloader; -import tech.pegasys.pantheon.ethereum.eth.sync.PipelineChainDownloader; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader; +import org.hyperledger.besu.ethereum.eth.sync.PipelineChainDownloader; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.plugin.services.MetricsSystem; public class FullSyncChainDownloader { private FullSyncChainDownloader() {} diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncDownloadPipelineFactory.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloadPipelineFactory.java similarity index 77% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncDownloadPipelineFactory.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloadPipelineFactory.java index bab21b576c..15414deb89 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncDownloadPipelineFactory.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloadPipelineFactory.java @@ -10,27 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fullsync; +package org.hyperledger.besu.ethereum.eth.sync.fullsync; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.sync.CheckpointHeaderFetcher; -import tech.pegasys.pantheon.ethereum.eth.sync.CheckpointHeaderValidationStep; -import tech.pegasys.pantheon.ethereum.eth.sync.CheckpointRangeSource; -import tech.pegasys.pantheon.ethereum.eth.sync.DownloadBodiesStep; -import tech.pegasys.pantheon.ethereum.eth.sync.DownloadHeadersStep; -import tech.pegasys.pantheon.ethereum.eth.sync.DownloadPipelineFactory; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.ValidationPolicy; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncTarget; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.services.pipeline.Pipeline; -import tech.pegasys.pantheon.services.pipeline.PipelineBuilder; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.sync.CheckpointHeaderFetcher; +import org.hyperledger.besu.ethereum.eth.sync.CheckpointHeaderValidationStep; +import org.hyperledger.besu.ethereum.eth.sync.CheckpointRangeSource; +import org.hyperledger.besu.ethereum.eth.sync.DownloadBodiesStep; +import org.hyperledger.besu.ethereum.eth.sync.DownloadHeadersStep; +import org.hyperledger.besu.ethereum.eth.sync.DownloadPipelineFactory; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.ValidationPolicy; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncTarget; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.services.pipeline.Pipeline; +import org.hyperledger.besu.services.pipeline.PipelineBuilder; import java.util.Optional; @@ -95,7 +95,7 @@ public class FullSyncDownloadPipelineFactory implements DownloadPipelineFacto checkpointRangeSource, downloaderParallelism, metricsSystem.createLabelledCounter( - PantheonMetricCategory.SYNCHRONIZER, + BesuMetricCategory.SYNCHRONIZER, "chain_download_pipeline_processed_total", "Number of entries process by each chain download pipeline stage", "step", diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloader.java similarity index 76% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncDownloader.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloader.java index b0f1eb8cd8..ca539f30f5 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncDownloader.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloader.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fullsync; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.sync.ChainDownloader; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.TrailingPeerRequirements; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +package org.hyperledger.besu.ethereum.eth.sync.fullsync; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.TrailingPeerRequirements; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.plugin.services.MetricsSystem; public class FullSyncDownloader { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncTargetManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncTargetManager.java similarity index 80% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncTargetManager.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncTargetManager.java index 29ba929115..6566b13697 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncTargetManager.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncTargetManager.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fullsync; +package org.hyperledger.besu.ethereum.eth.sync.fullsync; import static java.util.concurrent.CompletableFuture.completedFuture; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.sync.SyncTargetManager; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncTarget; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.sync.SyncTargetManager; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncTarget; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.Optional; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/PendingBlocks.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/PendingBlocks.java similarity index 95% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/PendingBlocks.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/PendingBlocks.java index dc0cce5dd2..56bb96413e 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/PendingBlocks.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/PendingBlocks.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.state; +package org.hyperledger.besu.ethereum.eth.sync.state; import static java.util.Collections.newSetFromMap; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.Hash; import java.util.Collections; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/SyncState.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncState.java similarity index 89% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/SyncState.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncState.java index c3cbc57546..4aec7eb13f 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/SyncState.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncState.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.state; - -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.ChainHead; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.SyncStatus; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.plugin.services.PantheonEvents.SyncStatusListener; -import tech.pegasys.pantheon.util.Subscribers; +package org.hyperledger.besu.ethereum.eth.sync.state; + +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.ChainHead; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.SyncStatus; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.plugin.services.BesuEvents.SyncStatusListener; +import org.hyperledger.besu.util.Subscribers; import java.util.Optional; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/SyncTarget.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncTarget.java similarity index 83% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/SyncTarget.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncTarget.java index ea78f0121a..66688b3684 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/SyncTarget.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncTarget.java @@ -10,12 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.state; +package org.hyperledger.besu.ethereum.eth.sync.state; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.ChainState; -import tech.pegasys.pantheon.ethereum.eth.manager.ChainState.EstimatedHeightListener; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.ChainState; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; import java.util.Objects; @@ -39,7 +38,8 @@ public class SyncTarget { return commonAncestor; } - public long addPeerChainEstimatedHeightListener(final EstimatedHeightListener listener) { + public long addPeerChainEstimatedHeightListener( + final ChainState.EstimatedHeightListener listener) { return peer.addChainEstimatedHeightListener(listener); } diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/CompleteBlocksTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/CompleteBlocksTask.java similarity index 86% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/CompleteBlocksTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/CompleteBlocksTask.java index eb7a72afe8..da90e99952 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/CompleteBlocksTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/CompleteBlocksTask.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.tasks; +package org.hyperledger.besu.ethereum.eth.sync.tasks; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Collections.emptyList; import static java.util.concurrent.CompletableFuture.completedFuture; import static java.util.stream.Collectors.toMap; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractRetryingPeerTask; -import tech.pegasys.pantheon.ethereum.eth.manager.task.GetBodiesFromPeerTask; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractRetryingPeerTask; +import org.hyperledger.besu.ethereum.eth.manager.task.GetBodiesFromPeerTask; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.Collection; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTask.java similarity index 90% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTask.java index c80b3f9e6e..2ce7488cd7 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTask.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.tasks; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractEthTask; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractPeerTask; -import tech.pegasys.pantheon.ethereum.eth.manager.task.GetHeadersFromPeerByNumberTask; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.util.BlockchainUtil; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +package org.hyperledger.besu.ethereum.eth.sync.tasks; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractEthTask; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask; +import org.hyperledger.besu.ethereum.eth.manager.task.GetHeadersFromPeerByNumberTask; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.util.BlockchainUtil; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.List; import java.util.OptionalInt; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DownloadHeaderSequenceTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DownloadHeaderSequenceTask.java similarity index 87% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DownloadHeaderSequenceTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DownloadHeaderSequenceTask.java index b3f2d8f3af..a667ddf380 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DownloadHeaderSequenceTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DownloadHeaderSequenceTask.java @@ -10,27 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.tasks; +package org.hyperledger.besu.ethereum.eth.sync.tasks; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Arrays.asList; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractGetHeadersFromPeerTask; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractRetryingPeerTask; -import tech.pegasys.pantheon.ethereum.eth.manager.task.GetHeadersFromPeerByHashTask; -import tech.pegasys.pantheon.ethereum.eth.sync.ValidationPolicy; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractGetHeadersFromPeerTask; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractRetryingPeerTask; +import org.hyperledger.besu.ethereum.eth.manager.task.GetHeadersFromPeerByHashTask; +import org.hyperledger.besu.ethereum.eth.sync.ValidationPolicy; +import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; +import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.Arrays; import java.util.Collection; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetReceiptsForHeadersTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/GetReceiptsForHeadersTask.java similarity index 87% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetReceiptsForHeadersTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/GetReceiptsForHeadersTask.java index ad52273c28..f59a68d670 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetReceiptsForHeadersTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/GetReceiptsForHeadersTask.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.tasks; +package org.hyperledger.besu.ethereum.eth.sync.tasks; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractRetryingPeerTask; -import tech.pegasys.pantheon.ethereum.eth.manager.task.GetReceiptsFromPeerTask; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractRetryingPeerTask; +import org.hyperledger.besu.ethereum.eth.manager.task.GetReceiptsFromPeerTask; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.HashMap; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PersistBlockTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/PersistBlockTask.java similarity index 90% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PersistBlockTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/PersistBlockTask.java index e4e01609e2..b8eda6e611 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PersistBlockTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/PersistBlockTask.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.tasks; +package org.hyperledger.besu.ethereum.eth.sync.tasks; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractEthTask; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractEthTask; +import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByNumberTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByNumberTask.java similarity index 81% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByNumberTask.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByNumberTask.java index a1012ff379..a3f9b86044 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByNumberTask.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByNumberTask.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.tasks; +package org.hyperledger.besu.ethereum.eth.sync.tasks; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractGetHeadersFromPeerTask; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractRetryingPeerTask; -import tech.pegasys.pantheon.ethereum.eth.manager.task.GetHeadersFromPeerByNumberTask; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractGetHeadersFromPeerTask; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractRetryingPeerTask; +import org.hyperledger.besu.ethereum.eth.manager.task.GetHeadersFromPeerByNumberTask; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.Collection; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/exceptions/InvalidBlockException.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/exceptions/InvalidBlockException.java similarity index 87% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/exceptions/InvalidBlockException.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/exceptions/InvalidBlockException.java index 85d670e079..a69653a334 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/exceptions/InvalidBlockException.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/exceptions/InvalidBlockException.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.tasks.exceptions; +package org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions; -import tech.pegasys.pantheon.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Hash; public class InvalidBlockException extends RuntimeException { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/AccountTrieNodeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/AccountTrieNodeDataRequest.java similarity index 70% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/AccountTrieNodeDataRequest.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/AccountTrieNodeDataRequest.java index 0db93a314f..8bf578aa44 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/AccountTrieNodeDataRequest.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/AccountTrieNodeDataRequest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.trie.MerklePatriciaTrie; -import tech.pegasys.pantheon.ethereum.worldstate.StateTrieAccountValue; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage.Updater; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie; +import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; import java.util.stream.Stream; @@ -41,7 +41,7 @@ class AccountTrieNodeDataRequest extends TrieNodeDataRequest { @Override protected NodeDataRequest createChildNodeDataRequest(final Hash childHash) { - return NodeDataRequest.createAccountDataRequest(childHash); + return createAccountDataRequest(childHash); } @Override @@ -50,13 +50,12 @@ class AccountTrieNodeDataRequest extends TrieNodeDataRequest { final StateTrieAccountValue accountValue = StateTrieAccountValue.readFrom(RLP.input(value)); // Add code, if appropriate if (!accountValue.getCodeHash().equals(Hash.EMPTY)) { - builder.add(NodeDataRequest.createCodeRequest(accountValue.getCodeHash())); + builder.add(createCodeRequest(accountValue.getCodeHash())); } // Add storage, if appropriate if (!accountValue.getStorageRoot().equals(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH)) { // If storage is non-empty queue download - final NodeDataRequest storageNode = - NodeDataRequest.createStorageDataRequest(accountValue.getStorageRoot()); + final NodeDataRequest storageNode = createStorageDataRequest(accountValue.getStorageRoot()); builder.add(storageNode); } return builder.build(); diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/CodeNodeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CodeNodeDataRequest.java similarity index 79% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/CodeNodeDataRequest.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CodeNodeDataRequest.java index c27b1c5e94..965a30dade 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/CodeNodeDataRequest.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CodeNodeDataRequest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage.Updater; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; import java.util.stream.Stream; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/CompleteTaskStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CompleteTaskStep.java similarity index 87% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/CompleteTaskStep.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CompleteTaskStep.java index 7c1e7e7576..881ba0bab7 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/CompleteTaskStep.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CompleteTaskStep.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.metrics.RunnableCounter; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.services.tasks.Task; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.metrics.RunnableCounter; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.services.tasks.Task; import java.text.DecimalFormat; import java.util.function.LongSupplier; @@ -45,14 +45,14 @@ public class CompleteTaskStep { completedRequestsCounter = new RunnableCounter( metricsSystem.createCounter( - PantheonMetricCategory.SYNCHRONIZER, + BesuMetricCategory.SYNCHRONIZER, "world_state_completed_requests_total", "Total number of node data requests completed as part of fast sync world state download"), this::displayWorldStateSyncProgress, DISPLAY_PROGRESS_STEP); retriedRequestsCounter = metricsSystem.createCounter( - PantheonMetricCategory.SYNCHRONIZER, + BesuMetricCategory.SYNCHRONIZER, "world_state_retried_requests_total", "Total number of node data requests repeated as part of fast sync world state download"); } diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/LoadLocalDataStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/LoadLocalDataStep.java similarity index 76% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/LoadLocalDataStep.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/LoadLocalDataStep.java index 4789be7759..a5b40fec8d 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/LoadLocalDataStep.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/LoadLocalDataStep.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.services.pipeline.Pipe; -import tech.pegasys.pantheon.services.tasks.Task; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.services.pipeline.Pipe; +import org.hyperledger.besu.services.tasks.Task; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; import java.util.stream.Stream; @@ -33,7 +33,7 @@ public class LoadLocalDataStep { this.worldStateStorage = worldStateStorage; existingNodeCounter = metricsSystem.createCounter( - PantheonMetricCategory.SYNCHRONIZER, + BesuMetricCategory.SYNCHRONIZER, "world_state_existing_nodes_total", "Total number of node data requests completed using existing data"); } diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/NodeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/NodeDataRequest.java similarity index 90% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/NodeDataRequest.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/NodeDataRequest.java index 9db0785a41..ed368e827b 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/NodeDataRequest.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/NodeDataRequest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; import static com.google.common.base.Preconditions.checkNotNull; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; import java.util.stream.Stream; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/PersistDataStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/PersistDataStep.java similarity index 83% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/PersistDataStep.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/PersistDataStep.java index 42075be33c..4d478e9054 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/PersistDataStep.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/PersistDataStep.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage.Updater; -import tech.pegasys.pantheon.services.tasks.Task; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater; +import org.hyperledger.besu.services.tasks.Task; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/RequestDataStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestDataStep.java similarity index 84% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/RequestDataStep.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestDataStep.java index 2f881f5c9b..66afd7b8ec 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/RequestDataStep.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestDataStep.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.EthTaskException; -import tech.pegasys.pantheon.ethereum.eth.manager.task.EthTask; -import tech.pegasys.pantheon.ethereum.eth.manager.task.RetryingGetNodeDataFromPeerTask; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.services.tasks.Task; -import tech.pegasys.pantheon.util.ExceptionUtils; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.EthTaskException; +import org.hyperledger.besu.ethereum.eth.manager.task.EthTask; +import org.hyperledger.besu.ethereum.eth.manager.task.RetryingGetNodeDataFromPeerTask; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.services.tasks.Task; +import org.hyperledger.besu.util.ExceptionUtils; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collections; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/RequestType.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestType.java similarity index 95% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/RequestType.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestType.java index 46f121f669..2a22c792c8 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/RequestType.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestType.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; public enum RequestType { ACCOUNT_TRIE_NODE((byte) 1), diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/StalledDownloadException.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/StalledDownloadException.java similarity index 92% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/StalledDownloadException.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/StalledDownloadException.java index 20a15564cc..fc7e99bfad 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/StalledDownloadException.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/StalledDownloadException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; public class StalledDownloadException extends WorldStateDownloaderException { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/StorageTrieNodeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/StorageTrieNodeDataRequest.java similarity index 82% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/StorageTrieNodeDataRequest.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/StorageTrieNodeDataRequest.java index 8ac9994287..d26048c658 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/StorageTrieNodeDataRequest.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/StorageTrieNodeDataRequest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage.Updater; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; import java.util.stream.Stream; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/TaskQueueIterator.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/TaskQueueIterator.java similarity index 90% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/TaskQueueIterator.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/TaskQueueIterator.java index d067bf670e..be592f6121 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/TaskQueueIterator.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/TaskQueueIterator.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; -import tech.pegasys.pantheon.services.tasks.Task; +import org.hyperledger.besu.services.tasks.Task; import java.util.Iterator; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/TrieNodeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/TrieNodeDataRequest.java similarity index 87% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/TrieNodeDataRequest.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/TrieNodeDataRequest.java index 1e5aacfafa..1c44a55021 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/TrieNodeDataRequest.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/TrieNodeDataRequest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.trie.Node; -import tech.pegasys.pantheon.ethereum.trie.TrieNodeDecoder; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.trie.Node; +import org.hyperledger.besu.ethereum.trie.TrieNodeDecoder; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Objects; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldDownloadState.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldDownloadState.java similarity index 92% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldDownloadState.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldDownloadState.java index 5f139a1ba2..edd3e4437a 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldDownloadState.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldDownloadState.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; - -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.ethereum.eth.manager.task.EthTask; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage.Updater; -import tech.pegasys.pantheon.services.tasks.CachingTaskCollection; -import tech.pegasys.pantheon.services.tasks.Task; -import tech.pegasys.pantheon.util.ExceptionUtils; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; + +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.ethereum.eth.manager.task.EthTask; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater; +import org.hyperledger.besu.services.tasks.CachingTaskCollection; +import org.hyperledger.besu.services.tasks.Task; +import org.hyperledger.besu.util.ExceptionUtils; +import org.hyperledger.besu.util.bytes.BytesValue; import java.time.Clock; import java.util.Collections; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldStateDownloadProcess.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloadProcess.java similarity index 91% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldStateDownloadProcess.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloadProcess.java index 0eac69fe81..28c85563b1 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldStateDownloadProcess.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloadProcess.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; import static com.google.common.base.Preconditions.checkNotNull; -import static tech.pegasys.pantheon.services.pipeline.PipelineBuilder.createPipelineFrom; - -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.services.pipeline.Pipe; -import tech.pegasys.pantheon.services.pipeline.Pipeline; -import tech.pegasys.pantheon.services.pipeline.PipelineBuilder; -import tech.pegasys.pantheon.services.pipeline.WritePipe; -import tech.pegasys.pantheon.services.tasks.Task; -import tech.pegasys.pantheon.util.ExceptionUtils; +import static org.hyperledger.besu.services.pipeline.PipelineBuilder.createPipelineFrom; + +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.services.pipeline.Pipe; +import org.hyperledger.besu.services.pipeline.Pipeline; +import org.hyperledger.besu.services.pipeline.PipelineBuilder; +import org.hyperledger.besu.services.pipeline.WritePipe; +import org.hyperledger.besu.services.tasks.Task; +import org.hyperledger.besu.util.ExceptionUtils; import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; @@ -196,7 +196,7 @@ public class WorldStateDownloadProcess { final int bufferCapacity = hashCountPerRequest * 2; final LabelledMetric outputCounter = metricsSystem.createLabelledCounter( - PantheonMetricCategory.SYNCHRONIZER, + BesuMetricCategory.SYNCHRONIZER, "world_state_pipeline_processed_total", "Number of entries processed by each world state download pipeline stage", "step", diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldStateDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloader.java similarity index 90% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldStateDownloader.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloader.java index 2727eda4c4..5c49442914 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldStateDownloader.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloader.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.services.tasks.CachingTaskCollection; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.services.tasks.CachingTaskCollection; import java.time.Clock; import java.util.concurrent.CompletableFuture; @@ -66,13 +66,13 @@ public class WorldStateDownloader { this.metricsSystem = metricsSystem; metricsSystem.createIntegerGauge( - PantheonMetricCategory.SYNCHRONIZER, + BesuMetricCategory.SYNCHRONIZER, "world_state_node_requests_since_last_progress_current", "Number of world state requests made since the last time new data was returned", downloadStateValue(WorldDownloadState::getRequestsSinceLastProgress)); metricsSystem.createIntegerGauge( - PantheonMetricCategory.SYNCHRONIZER, + BesuMetricCategory.SYNCHRONIZER, "world_state_inflight_requests_current", "Number of in progress requests for world state data", downloadStateValue(WorldDownloadState::getOutstandingTaskCount)); diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldStateDownloaderException.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloaderException.java similarity index 92% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldStateDownloaderException.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloaderException.java index 97fa35ae10..a82863284c 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldStateDownloaderException.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloaderException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; public class WorldStateDownloaderException extends RuntimeException { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PeerTransactionTracker.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PeerTransactionTracker.java similarity index 89% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PeerTransactionTracker.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PeerTransactionTracker.java index 887c4b30e4..20e682e7f2 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PeerTransactionTracker.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PeerTransactionTracker.java @@ -10,14 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; import static java.util.Collections.emptySet; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer.DisconnectCallback; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; import java.util.Collection; import java.util.Collections; @@ -26,7 +25,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -public class PeerTransactionTracker implements DisconnectCallback { +public class PeerTransactionTracker implements EthPeer.DisconnectCallback { private static final int MAX_TRACKED_SEEN_TRANSACTIONS = 10_000; private final Map> seenTransactions = new ConcurrentHashMap<>(); private final Map> transactionsToSend = new ConcurrentHashMap<>(); diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactionDroppedListener.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionDroppedListener.java similarity index 86% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactionDroppedListener.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionDroppedListener.java index 522f5e1ba4..2510d83100 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactionDroppedListener.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionDroppedListener.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; -import tech.pegasys.pantheon.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Transaction; @FunctionalInterface public interface PendingTransactionDroppedListener { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactionListener.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionListener.java similarity index 86% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactionListener.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionListener.java index cbb2bdddc2..11a2a57012 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactionListener.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionListener.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; -import tech.pegasys.pantheon.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Transaction; @FunctionalInterface public interface PendingTransactionListener { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactions.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactions.java similarity index 95% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactions.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactions.java index 363e7c877a..d1f96ac26b 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactions.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactions.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; import static java.util.Comparator.comparing; -import tech.pegasys.pantheon.ethereum.core.AccountTransactionOrder; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.ethereum.core.AccountTransactionOrder; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.util.Subscribers; import java.time.Clock; import java.time.Instant; @@ -85,7 +85,7 @@ public class PendingTransactions { this.clock = clock; final LabelledMetric transactionAddedCounter = metricsSystem.createLabelledCounter( - PantheonMetricCategory.TRANSACTION_POOL, + BesuMetricCategory.TRANSACTION_POOL, "transactions_added_total", "Count of transactions added to the transaction pool", "source"); @@ -94,7 +94,7 @@ public class PendingTransactions { transactionRemovedCounter = metricsSystem.createLabelledCounter( - PantheonMetricCategory.TRANSACTION_POOL, + BesuMetricCategory.TRANSACTION_POOL, "transactions_removed_total", "Count of transactions removed from the transaction pool", "source", diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPool.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPool.java similarity index 84% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPool.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPool.java index c679a8a3ba..b54bbe4e96 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPool.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPool.java @@ -10,33 +10,33 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; import static java.util.Collections.singletonList; import static org.apache.logging.log4j.LogManager.getLogger; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.CHAIN_HEAD_WORLD_STATE_NOT_AVAILABLE; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedObserver; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidationParams; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; +import static org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.CHAIN_HEAD_WORLD_STATE_NOT_AVAILABLE; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.BlockAddedObserver; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; import java.util.Collection; import java.util.HashSet; @@ -88,7 +88,7 @@ public class TransactionPool implements BlockAddedObserver { duplicateTransactionCounter = metricsSystem.createLabelledCounter( - PantheonMetricCategory.TRANSACTION_POOL, + BesuMetricCategory.TRANSACTION_POOL, "transactions_duplicates_total", "Total number of duplicate transactions received", "source"); diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolConfiguration.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolConfiguration.java similarity index 98% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolConfiguration.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolConfiguration.java index b243b206e8..a709f16ffb 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolConfiguration.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolConfiguration.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; import java.util.Objects; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolFactory.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactory.java similarity index 82% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolFactory.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactory.java index 6c6aaf5016..616ecb44c9 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolFactory.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactory.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.time.Clock; @@ -65,7 +65,7 @@ public class TransactionPoolFactory { transactionTracker, transactionPool, metricsSystem.createCounter( - PantheonMetricCategory.TRANSACTION_POOL, + BesuMetricCategory.TRANSACTION_POOL, "transactions_messages_skipped_total", "Total number of transactions messages skipped by the processor.")), transactionPoolConfiguration.getTxMessageKeepAliveSeconds()); diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionSender.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionSender.java similarity index 85% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionSender.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionSender.java index 6b4e90a9f1..f9009e0e2e 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionSender.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionSender.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool.TransactionBatchAddedListener; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool.TransactionBatchAddedListener; class TransactionSender implements TransactionBatchAddedListener { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageHandler.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageHandler.java similarity index 80% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageHandler.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageHandler.java index 255039eab2..a4ee908612 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageHandler.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageHandler.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; import static java.time.Instant.now; -import tech.pegasys.pantheon.ethereum.eth.manager.EthMessage; -import tech.pegasys.pantheon.ethereum.eth.manager.EthMessages.MessageCallback; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.ethereum.eth.messages.TransactionsMessage; +import org.hyperledger.besu.ethereum.eth.manager.EthMessage; +import org.hyperledger.besu.ethereum.eth.manager.EthMessages; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.ethereum.eth.messages.TransactionsMessage; import java.time.Duration; import java.time.Instant; -class TransactionsMessageHandler implements MessageCallback { +class TransactionsMessageHandler implements EthMessages.MessageCallback { private final TransactionsMessageProcessor transactionsMessageProcessor; private final EthScheduler scheduler; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageProcessor.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageProcessor.java similarity index 84% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageProcessor.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageProcessor.java index 15596a2fdc..9b8e642b99 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageProcessor.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageProcessor.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; import static java.time.Instant.now; import static org.apache.logging.log4j.LogManager.getLogger; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.messages.TransactionsMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.metrics.RunnableCounter; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.messages.TransactionsMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.metrics.RunnableCounter; +import org.hyperledger.besu.plugin.services.metrics.Counter; import java.time.Duration; import java.time.Instant; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageSender.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageSender.java similarity index 82% rename from ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageSender.java rename to ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageSender.java index 1278206ae8..4e1d4ebd92 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageSender.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageSender.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.messages.LimitedTransactionsMessages; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.messages.LimitedTransactionsMessages; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; import java.util.Set; import java.util.stream.StreamSupport; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ChainStateTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ChainStateTest.java similarity index 95% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ChainStateTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ChainStateTest.java index 5a747ff0c5..96cf0e80bf 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ChainStateTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ChainStateTest.java @@ -10,20 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import tech.pegasys.pantheon.ethereum.chain.ChainHead; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.ChainState.EstimatedHeightListener; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.chain.ChainHead; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.util.uint.UInt256; import org.junit.Test; @@ -240,7 +239,8 @@ public class ChainStateTest { final BlockHeader bestBlockHeader = new BlockHeaderTestFixture().number(blockNumber).buildHeader(); chainState.statusReceived(bestBlockHeader.getHash(), INITIAL_TOTAL_DIFFICULTY); - final EstimatedHeightListener listener = mock(EstimatedHeightListener.class); + final ChainState.EstimatedHeightListener listener = + mock(ChainState.EstimatedHeightListener.class); chainState.addEstimatedHeightListener(listener); chainState.update(bestBlockHeader.getHash(), blockNumber); verify(listener).onEstimatedHeightChanged(blockNumber); @@ -252,7 +252,8 @@ public class ChainStateTest { final BlockHeader bestBlockHeader = new BlockHeaderTestFixture().number(blockNumber).buildHeader(); chainState.statusReceived(bestBlockHeader.getHash(), INITIAL_TOTAL_DIFFICULTY); - final EstimatedHeightListener listener = mock(EstimatedHeightListener.class); + final ChainState.EstimatedHeightListener listener = + mock(ChainState.EstimatedHeightListener.class); chainState.addEstimatedHeightListener(listener); chainState.update(bestBlockHeader); verify(listener).onEstimatedHeightChanged(blockNumber); @@ -264,7 +265,8 @@ public class ChainStateTest { final BlockHeader bestBlockHeader = new BlockHeaderTestFixture().number(blockNumber).buildHeader(); chainState.statusReceived(bestBlockHeader.getHash(), INITIAL_TOTAL_DIFFICULTY); - final EstimatedHeightListener listener = mock(EstimatedHeightListener.class); + final ChainState.EstimatedHeightListener listener = + mock(ChainState.EstimatedHeightListener.class); chainState.addEstimatedHeightListener(listener); chainState.updateForAnnouncedBlock(bestBlockHeader, INITIAL_TOTAL_DIFFICULTY); verify(listener).onEstimatedHeightChanged(blockNumber - 1); @@ -276,7 +278,8 @@ public class ChainStateTest { final BlockHeader bestBlockHeader = new BlockHeaderTestFixture().number(blockNumber).buildHeader(); chainState.statusReceived(bestBlockHeader.getHash(), INITIAL_TOTAL_DIFFICULTY); - final EstimatedHeightListener listener = mock(EstimatedHeightListener.class); + final ChainState.EstimatedHeightListener listener = + mock(ChainState.EstimatedHeightListener.class); chainState.addEstimatedHeightListener(listener); chainState.update(bestBlockHeader); verify(listener).onEstimatedHeightChanged(blockNumber); diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/DeterministicEthScheduler.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/DeterministicEthScheduler.java similarity index 96% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/DeterministicEthScheduler.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/DeterministicEthScheduler.java index eac8b55102..03640ad886 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/DeterministicEthScheduler.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/DeterministicEthScheduler.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; -import tech.pegasys.pantheon.testutil.MockExecutorService; +import org.hyperledger.besu.testutil.MockExecutorService; import java.time.Duration; import java.util.Arrays; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthContextTestUtil.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthContextTestUtil.java similarity index 79% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthContextTestUtil.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthContextTestUtil.java index 6c9ff9fde0..d99706a463 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthContextTestUtil.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthContextTestUtil.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; -import tech.pegasys.pantheon.ethereum.eth.manager.DeterministicEthScheduler.TimeoutPolicy; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; +import org.hyperledger.besu.ethereum.eth.manager.DeterministicEthScheduler.TimeoutPolicy; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.testutil.TestClock; public class EthContextTestUtil { diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthPeerTest.java similarity index 91% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeerTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthPeerTest.java index c7e38302e3..8cb3fa4c78 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeerTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthPeerTest.java @@ -10,26 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.manager.RequestManager.ResponseCallback; -import tech.pegasys.pantheon.ethereum.eth.manager.RequestManager.ResponseStream; -import tech.pegasys.pantheon.ethereum.eth.messages.BlockBodiesMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.BlockHeadersMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.NodeDataMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.ReceiptsMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.testutil.TestClock; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.messages.BlockBodiesMessage; +import org.hyperledger.besu.ethereum.eth.messages.BlockHeadersMessage; +import org.hyperledger.besu.ethereum.eth.messages.NodeDataMessage; +import org.hyperledger.besu.ethereum.eth.messages.ReceiptsMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.testutil.TestClock; import java.util.HashSet; import java.util.Set; @@ -272,7 +270,7 @@ public class EthPeerTest { final AtomicInteger messageCount = new AtomicInteger(0); final AtomicInteger closedCount = new AtomicInteger(0); final int targetCode = targetMessage.getCode(); - final ResponseCallback responseHandler = + final RequestManager.ResponseCallback responseHandler = (closed, msg, p) -> { if (closed) { closedCount.incrementAndGet(); @@ -328,7 +326,7 @@ public class EthPeerTest { assertThat(closedCount.get()).isEqualTo(2); // Open stream, then close it and check no messages are processed - final ResponseStream stream = getStream.get(peer).then(responseHandler); + final RequestManager.ResponseStream stream = getStream.get(peer).then(responseHandler); // Reset counters messageCount.set(0); closedCount.set(0); @@ -348,6 +346,6 @@ public class EthPeerTest { @FunctionalInterface interface ResponseStreamSupplier { - ResponseStream get(EthPeer peer) throws PeerNotConnected; + RequestManager.ResponseStream get(EthPeer peer) throws PeerNotConnected; } } diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeersTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthPeersTest.java similarity index 92% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeersTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthPeersTest.java index be0bc29309..7e4ddb75d9 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeersTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthPeersTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; @@ -22,14 +22,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.RequestManager.ResponseStream; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.NoAvailablePeersException; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.PeerDisconnectedException; -import tech.pegasys.pantheon.ethereum.eth.messages.NodeDataMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.NoAvailablePeersException; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.PeerDisconnectedException; +import org.hyperledger.besu.ethereum.eth.messages.NodeDataMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Optional; import java.util.OptionalLong; @@ -44,7 +43,8 @@ public class EthPeersTest { private EthProtocolManager ethProtocolManager; private EthPeers ethPeers; private final PeerRequest peerRequest = mock(PeerRequest.class); - private final ResponseStream responseStream = mock(ResponseStream.class); + private final RequestManager.ResponseStream responseStream = + mock(RequestManager.ResponseStream.class); @Before public void setup() throws Exception { @@ -260,7 +260,7 @@ public class EthPeersTest { @SuppressWarnings("unchecked") private void assertRequestSuccessful(final PendingPeerRequest pendingRequest) { - final Consumer onSuccess = mock(Consumer.class); + final Consumer onSuccess = mock(Consumer.class); pendingRequest.then(onSuccess, error -> fail("Request should have executed", error)); verify(onSuccess).accept(any()); } @@ -276,7 +276,7 @@ public class EthPeersTest { @SuppressWarnings("unchecked") private void assertNotDone(final PendingPeerRequest pendingRequest) { - final Consumer onSuccess = mock(Consumer.class); + final Consumer onSuccess = mock(Consumer.class); final Consumer onError = mock(Consumer.class); pendingRequest.then(onSuccess, onError); diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTest.java similarity index 93% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTest.java index f48b86aa9e..b8eccdab82 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTest.java @@ -10,62 +10,61 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol.EthVersion; -import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.manager.MockPeerConnection.PeerSendHandler; -import tech.pegasys.pantheon.ethereum.eth.messages.BlockBodiesMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.BlockHeadersMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV63; -import tech.pegasys.pantheon.ethereum.eth.messages.GetBlockBodiesMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.GetBlockHeadersMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.GetNodeDataMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.GetReceiptsMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.NewBlockMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.NodeDataMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.ReceiptsMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.StatusMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.TransactionsMessage; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolFactory; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.DefaultMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; +import org.hyperledger.besu.ethereum.eth.manager.MockPeerConnection.PeerSendHandler; +import org.hyperledger.besu.ethereum.eth.messages.BlockBodiesMessage; +import org.hyperledger.besu.ethereum.eth.messages.BlockHeadersMessage; +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; +import org.hyperledger.besu.ethereum.eth.messages.EthPV63; +import org.hyperledger.besu.ethereum.eth.messages.GetBlockBodiesMessage; +import org.hyperledger.besu.ethereum.eth.messages.GetBlockHeadersMessage; +import org.hyperledger.besu.ethereum.eth.messages.GetNodeDataMessage; +import org.hyperledger.besu.ethereum.eth.messages.GetReceiptsMessage; +import org.hyperledger.besu.ethereum.eth.messages.NewBlockMessage; +import org.hyperledger.besu.ethereum.eth.messages.NodeDataMessage; +import org.hyperledger.besu.ethereum.eth.messages.ReceiptsMessage; +import org.hyperledger.besu.ethereum.eth.messages.StatusMessage; +import org.hyperledger.besu.ethereum.eth.messages.TransactionsMessage; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolFactory; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.util.ArrayList; @@ -176,7 +175,7 @@ public final class EthProtocolManagerTest { // Send status message with wrong chain final StatusMessage statusMessage = StatusMessage.create( - EthVersion.V63, + EthProtocol.EthVersion.V63, BigInteger.valueOf(2222), blockchain.getChainHead().getTotalDifficulty(), blockchain.getChainHeadHash(), @@ -210,7 +209,7 @@ public final class EthProtocolManagerTest { // Send status message with wrong chain final StatusMessage statusMessage = StatusMessage.create( - EthVersion.V63, + EthProtocol.EthVersion.V63, BigInteger.ONE, blockchain.getChainHead().getTotalDifficulty(), gen.hash(), @@ -460,7 +459,7 @@ public final class EthProtocolManagerTest { final MockPeerConnection peer = setupPeerWithoutStatusExchange(ethManager, onSend); final StatusMessage statusMessage = StatusMessage.create( - EthVersion.V63, + EthProtocol.EthVersion.V63, BigInteger.ONE, blockchain.getChainHead().getTotalDifficulty(), blockchain.getChainHeadHash(), diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTestUtil.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTestUtil.java similarity index 83% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTestUtil.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTestUtil.java index e982fa384c..0f3072b7d0 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTestUtil.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTestUtil.java @@ -10,27 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; import static com.google.common.base.Preconditions.checkArgument; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; - -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.ChainHead; -import tech.pegasys.pantheon.ethereum.chain.GenesisState; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.manager.DeterministicEthScheduler.TimeoutPolicy; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.DefaultMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.uint.UInt256; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; + +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.ChainHead; +import org.hyperledger.besu.ethereum.chain.GenesisState; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; +import org.hyperledger.besu.ethereum.eth.manager.DeterministicEthScheduler.TimeoutPolicy; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.util.OptionalLong; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthSchedulerShutdownTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthSchedulerShutdownTest.java similarity index 98% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthSchedulerShutdownTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthSchedulerShutdownTest.java index 39e6909181..d2bae2a4c0 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthSchedulerShutdownTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthSchedulerShutdownTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthSchedulerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthSchedulerTest.java similarity index 98% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthSchedulerTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthSchedulerTest.java index 6eb273a8aa..c6c8b5ecf1 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthSchedulerTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthSchedulerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -19,7 +19,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import tech.pegasys.pantheon.testutil.MockExecutorService; +import org.hyperledger.besu.testutil.MockExecutorService; import java.time.Duration; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthServerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthServerTest.java similarity index 87% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthServerTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthServerTest.java index 1899f70b07..8800e921d2 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthServerTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthServerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; @@ -18,13 +18,13 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.messages.GetNodeDataMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.NodeDataMessage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; +import org.hyperledger.besu.ethereum.eth.messages.GetNodeDataMessage; +import org.hyperledger.besu.ethereum.eth.messages.NodeDataMessage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockEthTask.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/MockEthTask.java similarity index 88% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockEthTask.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/MockEthTask.java index dd04744384..18cf845c17 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockEthTask.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/MockEthTask.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractEthTask; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractEthTask; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.util.concurrent.CountDownLatch; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockPeerConnection.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/MockPeerConnection.java similarity index 82% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockPeerConnection.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/MockPeerConnection.java index 3db9dd820a..6c35144e19 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockPeerConnection.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/MockPeerConnection.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; - -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.eth.manager; + +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.util.bytes.BytesValue; import java.net.InetSocketAddress; import java.util.ArrayList; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockScheduledExecutor.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/MockScheduledExecutor.java similarity index 96% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockScheduledExecutor.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/MockScheduledExecutor.java index 650476e050..dbbeb98c63 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockScheduledExecutor.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/MockScheduledExecutor.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; -import tech.pegasys.pantheon.testutil.MockExecutorService; +import org.hyperledger.besu.testutil.MockExecutorService; import java.util.concurrent.Callable; import java.util.concurrent.Delayed; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/PeerReputationTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/PeerReputationTest.java similarity index 50% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/PeerReputationTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/PeerReputationTest.java index d26f5bd7ae..68d99b9647 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/PeerReputationTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/PeerReputationTest.java @@ -10,14 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.eth.manager.PeerReputation.USELESS_RESPONSE_WINDOW_IN_MILLIS; -import static tech.pegasys.pantheon.ethereum.eth.messages.EthPV62.GET_BLOCK_BODIES; -import static tech.pegasys.pantheon.ethereum.eth.messages.EthPV62.GET_BLOCK_HEADERS; -import static tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason.TIMEOUT; -import static tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason.USELESS_PEER; +import static org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason.TIMEOUT; +import static org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason.USELESS_PEER; + +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; import org.junit.Test; @@ -27,33 +26,33 @@ public class PeerReputationTest { @Test public void shouldOnlyDisconnectWhenTimeoutLimitReached() { - assertThat(reputation.recordRequestTimeout(GET_BLOCK_HEADERS)).isEmpty(); - assertThat(reputation.recordRequestTimeout(GET_BLOCK_HEADERS)).isEmpty(); - assertThat(reputation.recordRequestTimeout(GET_BLOCK_HEADERS)).contains(TIMEOUT); + assertThat(reputation.recordRequestTimeout(EthPV62.GET_BLOCK_HEADERS)).isEmpty(); + assertThat(reputation.recordRequestTimeout(EthPV62.GET_BLOCK_HEADERS)).isEmpty(); + assertThat(reputation.recordRequestTimeout(EthPV62.GET_BLOCK_HEADERS)).contains(TIMEOUT); } @Test public void shouldTrackTimeoutsSeparatelyForDifferentRequestTypes() { - assertThat(reputation.recordRequestTimeout(GET_BLOCK_HEADERS)).isEmpty(); - assertThat(reputation.recordRequestTimeout(GET_BLOCK_HEADERS)).isEmpty(); - assertThat(reputation.recordRequestTimeout(GET_BLOCK_BODIES)).isEmpty(); - assertThat(reputation.recordRequestTimeout(GET_BLOCK_BODIES)).isEmpty(); + assertThat(reputation.recordRequestTimeout(EthPV62.GET_BLOCK_HEADERS)).isEmpty(); + assertThat(reputation.recordRequestTimeout(EthPV62.GET_BLOCK_HEADERS)).isEmpty(); + assertThat(reputation.recordRequestTimeout(EthPV62.GET_BLOCK_BODIES)).isEmpty(); + assertThat(reputation.recordRequestTimeout(EthPV62.GET_BLOCK_BODIES)).isEmpty(); - assertThat(reputation.recordRequestTimeout(GET_BLOCK_HEADERS)).contains(TIMEOUT); - assertThat(reputation.recordRequestTimeout(GET_BLOCK_BODIES)).contains(TIMEOUT); + assertThat(reputation.recordRequestTimeout(EthPV62.GET_BLOCK_HEADERS)).contains(TIMEOUT); + assertThat(reputation.recordRequestTimeout(EthPV62.GET_BLOCK_BODIES)).contains(TIMEOUT); } @Test public void shouldResetTimeoutCountForRequestType() { - assertThat(reputation.recordRequestTimeout(GET_BLOCK_HEADERS)).isEmpty(); - assertThat(reputation.recordRequestTimeout(GET_BLOCK_HEADERS)).isEmpty(); + assertThat(reputation.recordRequestTimeout(EthPV62.GET_BLOCK_HEADERS)).isEmpty(); + assertThat(reputation.recordRequestTimeout(EthPV62.GET_BLOCK_HEADERS)).isEmpty(); - assertThat(reputation.recordRequestTimeout(GET_BLOCK_BODIES)).isEmpty(); - assertThat(reputation.recordRequestTimeout(GET_BLOCK_BODIES)).isEmpty(); + assertThat(reputation.recordRequestTimeout(EthPV62.GET_BLOCK_BODIES)).isEmpty(); + assertThat(reputation.recordRequestTimeout(EthPV62.GET_BLOCK_BODIES)).isEmpty(); - reputation.resetTimeoutCount(GET_BLOCK_HEADERS); - assertThat(reputation.recordRequestTimeout(GET_BLOCK_HEADERS)).isEmpty(); - assertThat(reputation.recordRequestTimeout(GET_BLOCK_BODIES)).contains(TIMEOUT); + reputation.resetTimeoutCount(EthPV62.GET_BLOCK_HEADERS); + assertThat(reputation.recordRequestTimeout(EthPV62.GET_BLOCK_HEADERS)).isEmpty(); + assertThat(reputation.recordRequestTimeout(EthPV62.GET_BLOCK_BODIES)).contains(TIMEOUT); } @Test @@ -74,7 +73,9 @@ public class PeerReputationTest { assertThat(reputation.recordUselessResponse(1004)).isEmpty(); // But then the next empty response doesn't come in until after the window expires on the first - assertThat(reputation.recordUselessResponse(1001 + USELESS_RESPONSE_WINDOW_IN_MILLIS + 1)) + assertThat( + reputation.recordUselessResponse( + 1001 + PeerReputation.USELESS_RESPONSE_WINDOW_IN_MILLIS + 1)) .isEmpty(); } } diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/RequestManagerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RequestManagerTest.java similarity index 82% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/RequestManagerTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RequestManagerTest.java index fb846aedfc..3a4c160fcf 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/RequestManagerTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RequestManagerTest.java @@ -10,20 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.manager.RequestManager.RequestSender; -import tech.pegasys.pantheon.ethereum.eth.manager.RequestManager.ResponseCallback; -import tech.pegasys.pantheon.ethereum.eth.manager.RequestManager.ResponseStream; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Collections; @@ -43,10 +40,10 @@ public class RequestManagerTest { final RequestManager requestManager = new RequestManager(peer); final AtomicInteger sendCount = new AtomicInteger(0); - final RequestSender sender = sendCount::incrementAndGet; + final RequestManager.RequestSender sender = sendCount::incrementAndGet; final List receivedMessages = new ArrayList<>(); final AtomicInteger closedCount = new AtomicInteger(0); - final ResponseCallback responseHandler = + final RequestManager.ResponseCallback responseHandler = (closed, msg, p) -> { if (closed) { closedCount.incrementAndGet(); @@ -56,7 +53,7 @@ public class RequestManagerTest { }; // Send request - final ResponseStream stream = requestManager.dispatchRequest(sender); + final RequestManager.ResponseStream stream = requestManager.dispatchRequest(sender); assertThat(sendCount.get()).isEqualTo(1); stream.then(responseHandler); @@ -76,10 +73,10 @@ public class RequestManagerTest { final RequestManager requestManager = new RequestManager(peer); final AtomicInteger sendCount = new AtomicInteger(0); - final RequestSender sender = sendCount::incrementAndGet; + final RequestManager.RequestSender sender = sendCount::incrementAndGet; final List receivedMessages = new ArrayList<>(); final AtomicInteger closedCount = new AtomicInteger(0); - final ResponseCallback responseHandler = + final RequestManager.ResponseCallback responseHandler = (closed, msg, p) -> { if (closed) { closedCount.incrementAndGet(); @@ -89,7 +86,7 @@ public class RequestManagerTest { }; // Send request - final ResponseStream stream = requestManager.dispatchRequest(sender); + final RequestManager.ResponseStream stream = requestManager.dispatchRequest(sender); assertThat(sendCount.get()).isEqualTo(1); // Dispatch message @@ -109,10 +106,10 @@ public class RequestManagerTest { final RequestManager requestManager = new RequestManager(peer); final AtomicInteger sendCount = new AtomicInteger(0); - final RequestSender sender = sendCount::incrementAndGet; + final RequestManager.RequestSender sender = sendCount::incrementAndGet; final List receivedMessages = new ArrayList<>(); final AtomicInteger closedCount = new AtomicInteger(0); - final ResponseCallback responseHandler = + final RequestManager.ResponseCallback responseHandler = (closed, msg, p) -> { if (closed) { closedCount.incrementAndGet(); @@ -122,7 +119,7 @@ public class RequestManagerTest { }; // Send 2 requests so we can receive 2 messages before closing - final ResponseStream stream = requestManager.dispatchRequest(sender); + final RequestManager.ResponseStream stream = requestManager.dispatchRequest(sender); assertThat(sendCount.get()).isEqualTo(1); requestManager.dispatchRequest(sender); assertThat(sendCount.get()).isEqualTo(2); @@ -153,11 +150,11 @@ public class RequestManagerTest { final RequestManager requestManager = new RequestManager(peer); final AtomicInteger sendCount = new AtomicInteger(0); - final RequestSender sender = sendCount::incrementAndGet; + final RequestManager.RequestSender sender = sendCount::incrementAndGet; final List receivedMessagesA = new ArrayList<>(); final AtomicInteger closedCountA = new AtomicInteger(0); - final ResponseCallback responseHandlerA = + final RequestManager.ResponseCallback responseHandlerA = (closed, msg, p) -> { if (closed) { closedCountA.incrementAndGet(); @@ -167,7 +164,7 @@ public class RequestManagerTest { }; final List receivedMessagesB = new ArrayList<>(); final AtomicInteger closedCountB = new AtomicInteger(0); - final ResponseCallback responseHandlerB = + final RequestManager.ResponseCallback responseHandlerB = (closed, msg, p) -> { if (closed) { closedCountB.incrementAndGet(); @@ -177,8 +174,8 @@ public class RequestManagerTest { }; // Send request - final ResponseStream streamA = requestManager.dispatchRequest(sender); - final ResponseStream streamB = requestManager.dispatchRequest(sender); + final RequestManager.ResponseStream streamA = requestManager.dispatchRequest(sender); + final RequestManager.ResponseStream streamB = requestManager.dispatchRequest(sender); assertThat(sendCount.get()).isEqualTo(2); streamA.then(responseHandlerA); diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/RespondingEthPeer.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RespondingEthPeer.java similarity index 90% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/RespondingEthPeer.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RespondingEthPeer.java index cf2b5953b4..8f9f7ad99e 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/RespondingEthPeer.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RespondingEthPeer.java @@ -10,32 +10,32 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager; +package org.hyperledger.besu.ethereum.eth.manager; import static com.google.common.base.Preconditions.checkArgument; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; - -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.messages.BlockBodiesMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.BlockHeadersMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV63; -import tech.pegasys.pantheon.ethereum.eth.messages.NodeDataMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.ReceiptsMessage; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.DefaultMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; + +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.messages.BlockBodiesMessage; +import org.hyperledger.besu.ethereum.eth.messages.BlockHeadersMessage; +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; +import org.hyperledger.besu.ethereum.eth.messages.EthPV63; +import org.hyperledger.besu.ethereum.eth.messages.NodeDataMessage; +import org.hyperledger.besu.ethereum.eth.messages.ReceiptsMessage; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.Arrays; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/bounded/BoundedQueueTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/bounded/BoundedQueueTest.java similarity index 93% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/bounded/BoundedQueueTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/bounded/BoundedQueueTest.java index 0e5fbd784f..209b3d3428 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/bounded/BoundedQueueTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/bounded/BoundedQueueTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.bounded; +package org.hyperledger.besu.ethereum.eth.manager.bounded; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import org.junit.Test; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java similarity index 83% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java index 5262479e34..abaaf190dc 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java @@ -10,23 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils; +package org.hyperledger.besu.ethereum.eth.manager.ethtaskutils; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.eth.manager.task.EthTask; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.manager.task.EthTask; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; @@ -83,7 +82,7 @@ public abstract class AbstractMessageTaskTest { @Test public void completesWhenPeersAreResponsive() { // Setup a responsive peer - final Responder responder = + final RespondingEthPeer.Responder responder = RespondingEthPeer.blockchainResponder(blockchain, protocolContext.getWorldStateArchive()); final RespondingEthPeer respondingPeer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000); diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/PeerMessageTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/PeerMessageTaskTest.java similarity index 72% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/PeerMessageTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/PeerMessageTaskTest.java index 1e5e6be653..66230b1e69 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/PeerMessageTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/PeerMessageTaskTest.java @@ -10,19 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils; +package org.hyperledger.besu.ethereum.eth.manager.ethtaskutils; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.EthTaskException; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.EthTaskException.FailureReason; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; -import tech.pegasys.pantheon.ethereum.eth.manager.task.EthTask; -import tech.pegasys.pantheon.util.ExceptionUtils; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.EthTaskException; +import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask; +import org.hyperledger.besu.ethereum.eth.manager.task.EthTask; +import org.hyperledger.besu.util.ExceptionUtils; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; @@ -36,11 +34,12 @@ import org.junit.Test; * * @param The type of data being retrieved. */ -public abstract class PeerMessageTaskTest extends AbstractMessageTaskTest> { +public abstract class PeerMessageTaskTest + extends AbstractMessageTaskTest> { @Test public void completesWhenPeerReturnsPartialResult() { // Setup a partially responsive peer - final Responder responder = + final RespondingEthPeer.Responder responder = RespondingEthPeer.partialResponder( blockchain, protocolContext.getWorldStateArchive(), protocolSchedule, 0.5f); final RespondingEthPeer respondingEthPeer = @@ -51,8 +50,8 @@ public abstract class PeerMessageTaskTest extends AbstractMessageTaskTest actualPeer = new AtomicReference<>(); final AtomicBoolean done = new AtomicBoolean(false); final T requestedData = generateDataToBeRequested(); - final EthTask> task = createTask(requestedData); - final CompletableFuture> future = task.run(); + final EthTask> task = createTask(requestedData); + final CompletableFuture> future = task.run(); respondingEthPeer.respondWhile(responder, () -> !future.isDone()); future.whenComplete( (response, error) -> { @@ -72,8 +71,8 @@ public abstract class PeerMessageTaskTest extends AbstractMessageTaskTest> task = createTask(requestedData); - final CompletableFuture> future = task.run(); + final EthTask> task = createTask(requestedData); + final CompletableFuture> future = task.run(); final AtomicReference failure = new AtomicReference<>(); future.whenComplete((r, t) -> failure.set(t)); @@ -83,7 +82,7 @@ public abstract class PeerMessageTaskTest extends AbstractMessageTaskTest extends AbstractMessageTaskTest extends AbstractMessageTaskTest> task = createTask(requestedData); - final CompletableFuture> future = task.run(); + final EthTask> task = createTask(requestedData); + final CompletableFuture> future = task.run(); respondingEthPeer.respondWhile(responder, () -> !future.isDone()); future.whenComplete((response, error) -> done.compareAndSet(false, true)); assertThat(future.isDone()).isTrue(); @@ -121,8 +120,8 @@ public abstract class PeerMessageTaskTest extends AbstractMessageTaskTest> task = createTask(requestedData); - final CompletableFuture> future = task.run(); + final EthTask> task = createTask(requestedData); + final CompletableFuture> future = task.run(); assertThat(future.isCompletedExceptionally()).isTrue(); assertThat( @@ -134,7 +133,9 @@ public abstract class PeerMessageTaskTest extends AbstractMessageTaskTest response, final EthPeer respondingPeer) { + final T requestedData, + final AbstractPeerTask.PeerTaskResult response, + final EthPeer respondingPeer) { assertThat(response.getResult()).isEqualTo(requestedData); assertThat(response.getPeer()).isEqualTo(respondingPeer); } diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskTest.java similarity index 90% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskTest.java index 449aaa1727..8f30467d6c 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskTest.java @@ -10,17 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils; +package org.hyperledger.besu.ethereum.eth.manager.ethtaskutils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.MaxRetriesReachedException; -import tech.pegasys.pantheon.ethereum.eth.manager.task.EthTask; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.MaxRetriesReachedException; +import org.hyperledger.besu.ethereum.eth.manager.task.EthTask; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; @@ -51,10 +50,10 @@ public abstract class RetryingMessageTaskTest extends AbstractMessageTaskTest // Setup data to be requested and expected response // Setup a partially responsive peer and a non-responsive peer - final Responder partialResponder = + final RespondingEthPeer.Responder partialResponder = RespondingEthPeer.partialResponder( blockchain, protocolContext.getWorldStateArchive(), protocolSchedule, 0.5f); - final Responder emptyResponder = RespondingEthPeer.emptyResponder(); + final RespondingEthPeer.Responder emptyResponder = RespondingEthPeer.emptyResponder(); final RespondingEthPeer respondingPeer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager); @@ -138,7 +137,7 @@ public abstract class RetryingMessageTaskTest extends AbstractMessageTaskTest assertThat(future.isDone()).isFalse(); // Setup a peer - final Responder responder = + final RespondingEthPeer.Responder responder = RespondingEthPeer.blockchainResponder(blockchain, protocolContext.getWorldStateArchive()); final RespondingEthPeer respondingPeer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager); @@ -151,7 +150,7 @@ public abstract class RetryingMessageTaskTest extends AbstractMessageTaskTest public void completeWhenPeersTimeoutTemporarily() throws ExecutionException, InterruptedException { peerCountToTimeout.set(1); - final Responder responder = + final RespondingEthPeer.Responder responder = RespondingEthPeer.blockchainResponder(blockchain, protocolContext.getWorldStateArchive()); final RespondingEthPeer respondingPeer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager); @@ -169,7 +168,7 @@ public abstract class RetryingMessageTaskTest extends AbstractMessageTaskTest @Test public void failsWhenPeersSendEmptyResponses() { // Setup a unresponsive peer - final Responder responder = RespondingEthPeer.emptyResponder(); + final RespondingEthPeer.Responder responder = RespondingEthPeer.emptyResponder(); final RespondingEthPeer respondingPeer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager); diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractEthTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractEthTaskTest.java similarity index 95% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractEthTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractEthTaskTest.java index ab87c21931..954c2edf84 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/AbstractEthTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractEthTaskTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.OperationTimer; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.OperationTimer; import java.util.Arrays; import java.util.List; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetBlockFromPeerTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBlockFromPeerTaskTest.java similarity index 67% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetBlockFromPeerTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBlockFromPeerTaskTest.java index 697e5ddb7c..2aaf88b173 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetBlockFromPeerTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBlockFromPeerTaskTest.java @@ -10,22 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.AbstractMessageTaskTest; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.EthTaskException; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.EthTaskException.FailureReason; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; -import tech.pegasys.pantheon.util.ExceptionUtils; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.AbstractMessageTaskTest; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.EthTaskException; +import org.hyperledger.besu.util.ExceptionUtils; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; @@ -34,7 +31,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.junit.Test; public class GetBlockFromPeerTaskTest - extends AbstractMessageTaskTest> { + extends AbstractMessageTaskTest> { private static final int BLOCK_NUMBER = 5; @@ -46,7 +43,7 @@ public class GetBlockFromPeerTaskTest } @Override - protected EthTask> createTask(final Block requestedData) { + protected EthTask> createTask(final Block requestedData) { return GetBlockFromPeerTask.create( protocolSchedule, ethContext, requestedData.getHash(), BLOCK_NUMBER, metricsSystem); } @@ -54,7 +51,7 @@ public class GetBlockFromPeerTaskTest @Override protected void assertResultMatchesExpectation( final Block requestedData, - final PeerTaskResult response, + final AbstractPeerTask.PeerTaskResult response, final EthPeer respondingPeer) { assertThat(response.getResult()).isEqualTo(requestedData); assertThat(response.getPeer()).isEqualTo(respondingPeer); @@ -66,8 +63,8 @@ public class GetBlockFromPeerTaskTest final Block requestedData = generateDataToBeRequested(); // Execute task - final EthTask> task = createTask(requestedData); - final CompletableFuture> future = task.run(); + final EthTask> task = createTask(requestedData); + final CompletableFuture> future = task.run(); final AtomicReference failure = new AtomicReference<>(); future.whenComplete( (r, t) -> { @@ -80,7 +77,7 @@ public class GetBlockFromPeerTaskTest final Throwable error = ExceptionUtils.rootCause(failure.get()); assertThat(error).isInstanceOf(EthTaskException.class); final EthTaskException ethException = (EthTaskException) error; - assertThat(ethException.reason()).isEqualTo(FailureReason.NO_AVAILABLE_PEERS); + assertThat(ethException.reason()).isEqualTo(EthTaskException.FailureReason.NO_AVAILABLE_PEERS); assertThat(task.run().isCompletedExceptionally()).isTrue(); task.cancel(); @@ -90,7 +87,7 @@ public class GetBlockFromPeerTaskTest @Test public void failsWhenPeersSendEmptyResponses() throws ExecutionException, InterruptedException { // Setup a unresponsive peer - final Responder responder = RespondingEthPeer.emptyResponder(); + final RespondingEthPeer.Responder responder = RespondingEthPeer.emptyResponder(); final RespondingEthPeer respondingEthPeer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager); @@ -98,8 +95,8 @@ public class GetBlockFromPeerTaskTest final Block requestedData = generateDataToBeRequested(); // Execute task and wait for response - final EthTask> task = createTask(requestedData); - final CompletableFuture> future = task.run(); + final EthTask> task = createTask(requestedData); + final CompletableFuture> future = task.run(); respondingEthPeer.respondWhile(responder, () -> !future.isDone()); final AtomicReference failure = new AtomicReference<>(); future.whenComplete( @@ -112,7 +109,8 @@ public class GetBlockFromPeerTaskTest // Check wrapped failure final Throwable error = ExceptionUtils.rootCause(failure.get()); assertThat(error).isInstanceOf(EthTaskException.class); - assertThat(((EthTaskException) error).reason()).isEqualTo(FailureReason.INCOMPLETE_RESULTS); + assertThat(((EthTaskException) error).reason()) + .isEqualTo(EthTaskException.FailureReason.INCOMPLETE_RESULTS); assertThat(task.run().isCompletedExceptionally()).isTrue(); task.cancel(); diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java similarity index 79% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java index 457559c668..9f2cb0a997 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java @@ -10,15 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest; import java.util.ArrayList; import java.util.List; @@ -38,7 +37,8 @@ public class GetBodiesFromPeerTaskTest extends PeerMessageTaskTest> } @Override - protected EthTask>> createTask(final List requestedData) { + protected EthTask>> createTask( + final List requestedData) { final List headersToComplete = requestedData.stream().map(Block::getHeader).collect(Collectors.toList()); return GetBodiesFromPeerTask.forHeaders( diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetHeadersFromPeerByHashTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTaskTest.java similarity index 84% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetHeadersFromPeerByHashTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTaskTest.java index 1c261575fb..00c889991f 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetHeadersFromPeerByHashTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTaskTest.java @@ -10,25 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; +import static org.hyperledger.besu.ethereum.vm.TestBlockchain.generateTestBlockHash; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static tech.pegasys.pantheon.ethereum.vm.TestBlockchain.generateTestBlockHash; - -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; -import tech.pegasys.pantheon.ethereum.eth.messages.BlockHeadersMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; + +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest; +import org.hyperledger.besu.ethereum.eth.messages.BlockHeadersMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; import java.util.ArrayList; import java.util.Arrays; @@ -69,7 +67,7 @@ public class GetHeadersFromPeerByHashTaskTest extends PeerMessageTaskTest>> createTask( + protected EthTask>> createTask( final List requestedData) { final BlockHeader firstHeader = requestedData.get(0); return GetHeadersFromPeerByHashTask.startingAtHash( @@ -103,7 +101,7 @@ public class GetHeadersFromPeerByHashTaskTest extends PeerMessageTaskTest>> actualResult = new AtomicReference<>(); + final AtomicReference>> actualResult = + new AtomicReference<>(); final AtomicBoolean done = new AtomicBoolean(false); - final CompletableFuture>> future = task.run(); + final CompletableFuture>> future = task.run(); respondingPeer.respondWhile(responder, () -> !future.isDone()); future.whenComplete( (result, error) -> { diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTaskTest.java similarity index 90% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTaskTest.java index c885c7f38e..3baaa870dd 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTaskTest.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; +import static org.hyperledger.besu.ethereum.vm.TestBlockchain.generateTestBlockHash; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static tech.pegasys.pantheon.ethereum.vm.TestBlockchain.generateTestBlockHash; - -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest; -import tech.pegasys.pantheon.ethereum.eth.messages.BlockHeadersMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; + +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest; +import org.hyperledger.besu.ethereum.eth.messages.BlockHeadersMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; import java.util.ArrayList; import java.util.Arrays; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetNodeDataFromPeerTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTaskTest.java similarity index 79% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetNodeDataFromPeerTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTaskTest.java index b1ab3540a6..ddd5b22093 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetNodeDataFromPeerTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTaskTest.java @@ -10,17 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.core.BlockHeader.GENESIS_BLOCK_NUMBER; +import static org.hyperledger.besu.ethereum.core.BlockHeader.GENESIS_BLOCK_NUMBER; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.HashMap; import java.util.List; @@ -44,7 +43,7 @@ public class GetNodeDataFromPeerTaskTest extends PeerMessageTaskTest>> createTask( + protected EthTask>> createTask( final Map requestedData) { final List hashes = Lists.newArrayList(requestedData.keySet()); return GetNodeDataFromPeerTask.forHashes( @@ -64,7 +63,7 @@ public class GetNodeDataFromPeerTaskTest extends PeerMessageTaskTest requestedData, - final PeerTaskResult> response, + final AbstractPeerTask.PeerTaskResult> response, final EthPeer respondingPeer) { assertThat(response.getResult().size()).isEqualTo(requestedData.size()); for (Map.Entry data : response.getResult().entrySet()) { diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetReceiptsFromPeerTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetReceiptsFromPeerTaskTest.java similarity index 79% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetReceiptsFromPeerTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetReceiptsFromPeerTaskTest.java index 99342b4e3e..16e53fcc2e 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/GetReceiptsFromPeerTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetReceiptsFromPeerTaskTest.java @@ -10,14 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest; -import tech.pegasys.pantheon.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest; import java.util.HashMap; import java.util.List; @@ -39,8 +38,8 @@ public class GetReceiptsFromPeerTaskTest } @Override - protected EthTask>>> createTask( - final Map> requestedData) { + protected EthTask>>> + createTask(final Map> requestedData) { return GetReceiptsFromPeerTask.forHeaders(ethContext, requestedData.keySet(), metricsSystem); } diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTaskTest.java similarity index 85% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTaskTest.java index 095f9c757b..b84f256eba 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTaskTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.core.BlockHeader.GENESIS_BLOCK_NUMBER; +import static org.hyperledger.besu.ethereum.core.BlockHeader.GENESIS_BLOCK_NUMBER; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskTest; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskTest; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Map; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/WaitForPeerTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeerTaskTest.java similarity index 87% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/WaitForPeerTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeerTaskTest.java index 1d12e6e29e..e58ba8e58d 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/WaitForPeerTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeerTaskTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/WaitForPeersTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeersTaskTest.java similarity index 89% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/WaitForPeersTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeersTaskTest.java index 6acd0cbfb5..518ddf0b34 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/task/WaitForPeersTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeersTaskTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.manager.task; +package org.hyperledger.besu.ethereum.eth.manager.task; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockBodiesMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/BlockBodiesMessageTest.java similarity index 76% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockBodiesMessageTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/BlockBodiesMessageTest.java index 07318cdaf6..e3a5bc81f7 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockBodiesMessageTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/BlockBodiesMessageTest.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockHeadersMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/BlockHeadersMessageTest.java similarity index 77% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockHeadersMessageTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/BlockHeadersMessageTest.java index c018da2238..a8e885e007 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockHeadersMessageTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/BlockHeadersMessageTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockBodiesMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockBodiesMessageTest.java similarity index 78% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockBodiesMessageTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockBodiesMessageTest.java index 3a7010ba45..e9b224001b 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockBodiesMessageTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockBodiesMessageTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockHeadersMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockHeadersMessageTest.java similarity index 89% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockHeadersMessageTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockHeadersMessageTest.java index 2affd9ff16..049592c459 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockHeadersMessageTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockHeadersMessageTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetNodeDataMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetNodeDataMessageTest.java similarity index 85% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetNodeDataMessageTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetNodeDataMessageTest.java index 0782465435..aec13a0155 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetNodeDataMessageTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetNodeDataMessageTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; import java.util.ArrayList; import java.util.Iterator; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetReceiptsMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetReceiptsMessageTest.java similarity index 85% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetReceiptsMessageTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetReceiptsMessageTest.java index 3ec57c801c..71bd34ed04 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetReceiptsMessageTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetReceiptsMessageTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; import java.util.ArrayList; import java.util.Iterator; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/LimitedTransactionsMessagesTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/LimitedTransactionsMessagesTest.java similarity index 91% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/LimitedTransactionsMessagesTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/LimitedTransactionsMessagesTest.java index e05f8b5694..8e08ab39e5 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/LimitedTransactionsMessagesTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/LimitedTransactionsMessagesTest.java @@ -10,14 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.eth.messages.LimitedTransactionsMessages.LIMIT; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.HashSet; import java.util.LinkedHashSet; @@ -27,7 +26,7 @@ import org.junit.Test; public class LimitedTransactionsMessagesTest { - private static final int TX_PAYLOAD_LIMIT = LIMIT - 180; + private static final int TX_PAYLOAD_LIMIT = LimitedTransactionsMessages.LIMIT - 180; private final BlockDataGenerator generator = new BlockDataGenerator(); private final Set sampleTxs = generator.transactions(1); private final TransactionsMessage sampleTransactionMessages = @@ -51,7 +50,7 @@ public class LimitedTransactionsMessagesTest { assertThat( firstMessage.getTransactionsMessage().getSize() + secondMessage.getTransactionsMessage().getSize()) - .isLessThan(2 * LIMIT); + .isLessThan(2 * LimitedTransactionsMessages.LIMIT); } @Test diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockHashesMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/NewBlockHashesMessageTest.java similarity index 81% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockHashesMessageTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/NewBlockHashesMessageTest.java index 59b1b1c74c..c4f752e51d 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockHashesMessageTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/NewBlockHashesMessageTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/NewBlockMessageTest.java similarity index 83% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockMessageTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/NewBlockMessageTest.java index 8a89bac981..8bfd1921f0 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockMessageTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/NewBlockMessageTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import org.junit.Test; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NodeDataMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/NodeDataMessageTest.java similarity index 85% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NodeDataMessageTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/NodeDataMessageTest.java index 270f0b3f27..748b614f1f 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NodeDataMessageTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/NodeDataMessageTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Iterator; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/ReceiptsMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/ReceiptsMessageTest.java similarity index 86% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/ReceiptsMessageTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/ReceiptsMessageTest.java index 9a38a29c64..040b62bc5c 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/ReceiptsMessageTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/ReceiptsMessageTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; import java.util.ArrayList; import java.util.Iterator; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/StatusMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/StatusMessageTest.java similarity index 84% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/StatusMessageTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/StatusMessageTest.java index 0baa043c96..ad70038949 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/StatusMessageTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/StatusMessageTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol.EthVersion; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.uint.UInt256; import java.math.BigInteger; import java.util.Random; @@ -29,7 +29,7 @@ public class StatusMessageTest { @Test public void getters() { - final int version = EthVersion.V62; + final int version = EthProtocol.EthVersion.V62; final BigInteger networkId = BigInteger.ONE; final UInt256 td = UInt256.of(1000L); final Hash bestHash = randHash(1L); @@ -46,7 +46,7 @@ public class StatusMessageTest { @Test public void serializeDeserialize() { - final int version = EthVersion.V62; + final int version = EthProtocol.EthVersion.V62; final BigInteger networkId = BigInteger.ONE; final UInt256 td = UInt256.of(1000L); final Hash bestHash = randHash(1L); diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/TransactionsMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/TransactionsMessageTest.java similarity index 86% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/TransactionsMessageTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/TransactionsMessageTest.java index 9fb9e5a2d8..61de478a6d 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/TransactionsMessageTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/TransactionsMessageTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.messages; +package org.hyperledger.besu.ethereum.eth.messages; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; import java.util.ArrayList; import java.util.Iterator; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/peervalidation/DaoForkPeerValidatorTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/peervalidation/DaoForkPeerValidatorTest.java similarity index 84% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/peervalidation/DaoForkPeerValidatorTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/peervalidation/DaoForkPeerValidatorTest.java index 81b8f97309..e7a50e77e3 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/peervalidation/DaoForkPeerValidatorTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/peervalidation/DaoForkPeerValidatorTest.java @@ -10,26 +10,25 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.peervalidation; +package org.hyperledger.besu.ethereum.eth.peervalidation; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator.BlockOptions; -import tech.pegasys.pantheon.ethereum.eth.manager.DeterministicEthScheduler.TimeoutPolicy; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.eth.messages.BlockHeadersMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; -import tech.pegasys.pantheon.ethereum.eth.messages.GetBlockHeadersMessage; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderValidator; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions; +import org.hyperledger.besu.ethereum.eth.manager.DeterministicEthScheduler; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.messages.BlockHeadersMessage; +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; +import org.hyperledger.besu.ethereum.eth.messages.GetBlockHeadersMessage; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderValidator; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -109,7 +108,8 @@ public class DaoForkPeerValidatorTest { @Test public void validatePeer_unresponsivePeer() { - EthProtocolManager ethProtocolManager = EthProtocolManagerTestUtil.create(TimeoutPolicy.ALWAYS); + EthProtocolManager ethProtocolManager = + EthProtocolManagerTestUtil.create(DeterministicEthScheduler.TimeoutPolicy.ALWAYS); long daoBlockNumber = 500; PeerValidator validator = @@ -176,7 +176,8 @@ public class DaoForkPeerValidatorTest { @Test public void canBeValidated() { BlockDataGenerator gen = new BlockDataGenerator(1); - EthProtocolManager ethProtocolManager = EthProtocolManagerTestUtil.create(TimeoutPolicy.ALWAYS); + EthProtocolManager ethProtocolManager = + EthProtocolManagerTestUtil.create(DeterministicEthScheduler.TimeoutPolicy.ALWAYS); long daoBlockNumber = 500; long buffer = 10; @@ -210,7 +211,7 @@ public class DaoForkPeerValidatorTest { final RespondingEthPeer peer, final Block daoBlock) { AtomicBoolean daoBlockRequested = new AtomicBoolean(false); - Responder responder = + RespondingEthPeer.Responder responder = RespondingEthPeer.targetedResponder( (cap, msg) -> { if (msg.getCode() != EthPV62.GET_BLOCK_HEADERS) { diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/peervalidation/PeerValidatorRunnerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/peervalidation/PeerValidatorRunnerTest.java similarity index 93% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/peervalidation/PeerValidatorRunnerTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/peervalidation/PeerValidatorRunnerTest.java index 2350f31762..fcdb82ef3d 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/peervalidation/PeerValidatorRunnerTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/peervalidation/PeerValidatorRunnerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.peervalidation; +package org.hyperledger.besu.ethereum.eth.peervalidation; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -20,10 +20,10 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; import java.time.Duration; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockBroadcasterTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BlockBroadcasterTest.java similarity index 82% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockBroadcasterTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BlockBroadcasterTest.java index 2b03d3d40c..dbabf3fbd6 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockBroadcasterTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BlockBroadcasterTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; @@ -19,15 +19,15 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; -import tech.pegasys.pantheon.ethereum.eth.messages.NewBlockMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers; +import org.hyperledger.besu.ethereum.eth.messages.NewBlockMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Collections; import java.util.stream.Stream; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManagerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManagerTest.java similarity index 89% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManagerTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManagerTest.java index ab4b4b968e..7d7350dbf5 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManagerTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManagerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -23,33 +23,32 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator.BlockOptions; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthMessages; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.eth.messages.NewBlockHashesMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.NewBlockHashesMessage.NewBlockHash; -import tech.pegasys.pantheon.ethereum.eth.messages.NewBlockMessage; -import tech.pegasys.pantheon.ethereum.eth.sync.state.PendingBlocks; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthMessages; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer.Responder; +import org.hyperledger.besu.ethereum.eth.messages.NewBlockHashesMessage; +import org.hyperledger.besu.ethereum.eth.messages.NewBlockMessage; +import org.hyperledger.besu.ethereum.eth.sync.state.PendingBlocks; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Collections; import java.util.concurrent.CompletableFuture; @@ -125,11 +124,13 @@ public class BlockPropagationManagerTest { final NewBlockHashesMessage nextAnnouncement = NewBlockHashesMessage.create( Collections.singletonList( - new NewBlockHash(nextBlock.getHash(), nextBlock.getHeader().getNumber()))); + new NewBlockHashesMessage.NewBlockHash( + nextBlock.getHash(), nextBlock.getHeader().getNumber()))); final NewBlockHashesMessage nextNextAnnouncement = NewBlockHashesMessage.create( Collections.singletonList( - new NewBlockHash(nextNextBlock.getHash(), nextNextBlock.getHeader().getNumber()))); + new NewBlockHashesMessage.NewBlockHash( + nextNextBlock.getHash(), nextNextBlock.getHeader().getNumber()))); final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain); // Broadcast first message @@ -160,11 +161,13 @@ public class BlockPropagationManagerTest { final NewBlockHashesMessage nextAnnouncement = NewBlockHashesMessage.create( Collections.singletonList( - new NewBlockHash(nextBlock.getHash(), nextBlock.getHeader().getNumber()))); + new NewBlockHashesMessage.NewBlockHash( + nextBlock.getHash(), nextBlock.getHeader().getNumber()))); final NewBlockHashesMessage nextNextAnnouncement = NewBlockHashesMessage.create( Collections.singletonList( - new NewBlockHash(nextNextBlock.getHash(), nextNextBlock.getHeader().getNumber()))); + new NewBlockHashesMessage.NewBlockHash( + nextNextBlock.getHash(), nextNextBlock.getHeader().getNumber()))); final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain); // Broadcast second message first @@ -265,14 +268,16 @@ public class BlockPropagationManagerTest { final NewBlockHashesMessage block1Msg = NewBlockHashesMessage.create( Collections.singletonList( - new NewBlockHash(block1.getHash(), block1.getHeader().getNumber()))); + new NewBlockHashesMessage.NewBlockHash( + block1.getHash(), block1.getHeader().getNumber()))); final NewBlockMessage block2Msg = NewBlockMessage.create( block2, fullBlockchain.getTotalDifficultyByHash(block2.getHash()).get()); final NewBlockHashesMessage block3Msg = NewBlockHashesMessage.create( Collections.singletonList( - new NewBlockHash(block3.getHash(), block3.getHeader().getNumber()))); + new NewBlockHashesMessage.NewBlockHash( + block3.getHash(), block3.getHeader().getNumber()))); final NewBlockMessage block4Msg = NewBlockMessage.create( block4, fullBlockchain.getTotalDifficultyByHash(block4.getHash()).get()); @@ -325,7 +330,8 @@ public class BlockPropagationManagerTest { final NewBlockHashesMessage newBlockHash = NewBlockHashesMessage.create( Collections.singletonList( - new NewBlockHash(nextBlock.getHash(), nextBlock.getHeader().getNumber()))); + new NewBlockHashesMessage.NewBlockHash( + nextBlock.getHash(), nextBlock.getHeader().getNumber()))); final NewBlockMessage newBlock = NewBlockMessage.create( nextBlock, fullBlockchain.getTotalDifficultyByHash(nextBlock.getHash()).get()); @@ -375,7 +381,8 @@ public class BlockPropagationManagerTest { final NewBlockHashesMessage newBlockHash = NewBlockHashesMessage.create( Collections.singletonList( - new NewBlockHash(nextBlock.getHash(), nextBlock.getHeader().getNumber()))); + new NewBlockHashesMessage.NewBlockHash( + nextBlock.getHash(), nextBlock.getHeader().getNumber()))); final NewBlockMessage newBlock = NewBlockMessage.create( nextBlock, fullBlockchain.getTotalDifficultyByHash(nextBlock.getHash()).get()); @@ -407,7 +414,8 @@ public class BlockPropagationManagerTest { final NewBlockHashesMessage futureAnnouncement = NewBlockHashesMessage.create( Collections.singletonList( - new NewBlockHash(futureBlock.getHash(), futureBlock.getHeader().getNumber()))); + new NewBlockHashesMessage.NewBlockHash( + futureBlock.getHash(), futureBlock.getHeader().getNumber()))); // Broadcast EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, futureAnnouncement); @@ -459,7 +467,8 @@ public class BlockPropagationManagerTest { final NewBlockHashesMessage oldAnnouncement = NewBlockHashesMessage.create( Collections.singletonList( - new NewBlockHash(oldBlock.getHash(), oldBlock.getHeader().getNumber()))); + new NewBlockHashesMessage.NewBlockHash( + oldBlock.getHash(), oldBlock.getHeader().getNumber()))); // Broadcast EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, oldAnnouncement); diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainHeadTrackerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/ChainHeadTrackerTest.java similarity index 71% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainHeadTrackerTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/ChainHeadTrackerTest.java index da3dad9152..e199f5e65c 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainHeadTrackerTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/ChainHeadTrackerTest.java @@ -10,25 +10,25 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; -import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule; -import tech.pegasys.pantheon.ethereum.eth.manager.ChainState; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.util.uint.UInt256; - +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule; +import org.hyperledger.besu.ethereum.eth.manager.ChainState; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer.Responder; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.util.uint.UInt256; + +import org.assertj.core.api.Assertions; import org.junit.Test; public class ChainHeadTrackerTest { @@ -62,11 +62,11 @@ public class ChainHeadTrackerTest { blockchainSetupUtil.getBlockchain(), blockchainSetupUtil.getWorldArchive()); chainHeadTracker.onPeerConnected(respondingPeer.getEthPeer()); - assertThat(chainHeadState().getEstimatedHeight()).isZero(); + Assertions.assertThat(chainHeadState().getEstimatedHeight()).isZero(); respondingPeer.respond(responder); - assertThat(chainHeadState().getEstimatedHeight()) + Assertions.assertThat(chainHeadState().getEstimatedHeight()) .isEqualTo(blockchain.getChainHeadBlockNumber()); } @@ -82,7 +82,7 @@ public class ChainHeadTrackerTest { respondingPeer.respond(responder); - assertThat(chainHeadState().getEstimatedHeight()).isZero(); + Assertions.assertThat(chainHeadState().getEstimatedHeight()).isZero(); } @Test @@ -92,11 +92,11 @@ public class ChainHeadTrackerTest { blockchainSetupUtil.getBlockchain(), blockchainSetupUtil.getWorldArchive()); chainHeadTracker.onPeerConnected(respondingPeer.getEthPeer()); - assertThat(chainHeadState().getEstimatedHeight()).isZero(); + Assertions.assertThat(chainHeadState().getEstimatedHeight()).isZero(); respondingPeer.respond(responder); - assertThat(chainHeadState().getEstimatedHeight()) + Assertions.assertThat(chainHeadState().getEstimatedHeight()) .isEqualTo(blockchain.getChainHeadBlockNumber()); } diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointHeaderFetcherTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderFetcherTest.java similarity index 90% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointHeaderFetcherTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderFetcherTest.java index 0d9d2eba95..0eae1795f8 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointHeaderFetcherTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderFetcherTest.java @@ -10,25 +10,25 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer.Responder; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.List; import java.util.Optional; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointHeaderValidationStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderValidationStepTest.java similarity index 86% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointHeaderValidationStepTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderValidationStepTest.java index 034dd65fae..a083b03db1 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointHeaderValidationStepTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderValidationStepTest.java @@ -10,25 +10,25 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.DETACHED_ONLY; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode.DETACHED_ONLY; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import tech.pegasys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; +import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; import java.util.stream.Stream; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointRangeSourceTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeSourceTest.java similarity index 94% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointRangeSourceTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeSourceTest.java index b40ace68b2..bb51c0549b 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/CheckpointRangeSourceTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeSourceTest.java @@ -10,13 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static java.util.concurrent.CompletableFuture.completedFuture; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.util.FutureUtils.completedExceptionally; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -24,14 +25,12 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.util.FutureUtils.completedExceptionally; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.NoAvailablePeersException; -import tech.pegasys.pantheon.ethereum.eth.sync.CheckpointRangeSource.SyncTargetChecker; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.NoAvailablePeersException; import java.time.Duration; import java.util.List; @@ -47,7 +46,8 @@ public class CheckpointRangeSourceTest { private static final Duration RETRY_DELAY_DURATION = Duration.ofSeconds(2); private final EthPeer peer = mock(EthPeer.class); private final CheckpointHeaderFetcher checkpointFetcher = mock(CheckpointHeaderFetcher.class); - private final SyncTargetChecker syncTargetChecker = mock(SyncTargetChecker.class); + private final CheckpointRangeSource.SyncTargetChecker syncTargetChecker = + mock(CheckpointRangeSource.SyncTargetChecker.class); private final EthScheduler ethScheduler = mock(EthScheduler.class); private final BlockHeader commonAncestor = header(10); diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/DownloadHeadersStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/DownloadHeadersStepTest.java similarity index 84% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/DownloadHeadersStepTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/DownloadHeadersStepTest.java index 6cd77461ef..a98f896060 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/DownloadHeadersStepTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/DownloadHeadersStepTest.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer.blockchainResponder; import static org.mockito.Mockito.mock; -import static tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.blockchainResponder; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/PipelineChainDownloaderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/PipelineChainDownloaderTest.java similarity index 93% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/PipelineChainDownloaderTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/PipelineChainDownloaderTest.java index 8811552835..9c0078782a 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/PipelineChainDownloaderTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/PipelineChainDownloaderTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static java.util.concurrent.CompletableFuture.completedFuture; import static org.assertj.core.api.Assertions.assertThat; @@ -23,18 +23,17 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.eth.sync.PipelineChainDownloader.PAUSE_AFTER_ERROR_DURATION; - -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncTarget; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.services.pipeline.Pipeline; + +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncTarget; +import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.services.pipeline.Pipeline; import java.util.Optional; import java.util.concurrent.CancellationException; @@ -327,7 +326,8 @@ public class PipelineChainDownloaderTest { @SuppressWarnings("unchecked") private void immediatelyCompletePauseAfterError() { - when(scheduler.scheduleFutureTask(any(Supplier.class), same(PAUSE_AFTER_ERROR_DURATION))) + when(scheduler.scheduleFutureTask( + any(Supplier.class), same(PipelineChainDownloader.PAUSE_AFTER_ERROR_DURATION))) .then(invocation -> ((Supplier>) invocation.getArgument(0)).get()); } } diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/TrailingPeerLimiterTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerLimiterTest.java similarity index 87% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/TrailingPeerLimiterTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerLimiterTest.java index 3a3ea189aa..d38c7ea465 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/TrailingPeerLimiterTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerLimiterTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync; +package org.hyperledger.besu.ethereum.eth.sync; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; @@ -20,17 +20,17 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.ChainState; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.ChainState; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/DownloadReceiptsStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/DownloadReceiptsStepTest.java similarity index 79% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/DownloadReceiptsStepTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/DownloadReceiptsStepTest.java index e9b2681789..95a8dc2036 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/DownloadReceiptsStepTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/DownloadReceiptsStepTest.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastImportBlocksStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksStepTest.java similarity index 83% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastImportBlocksStepTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksStepTest.java index 399eee4e41..e5cbdec501 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastImportBlocksStepTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksStepTest.java @@ -10,26 +10,26 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; import static java.util.Collections.singletonList; import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.FULL; +import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.LIGHT; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode.FULL; -import static tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode.LIGHT; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.eth.sync.ValidationPolicy; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.eth.sync.ValidationPolicy; +import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; import java.util.List; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncActionsTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActionsTest.java similarity index 87% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncActionsTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActionsTest.java index eece491753..801c9aa20a 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncActionsTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActionsTest.java @@ -10,31 +10,29 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.eth.sync.fastsync.FastSyncState.EMPTY_SYNC_STATE; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.eth.sync.SyncMode; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.util.uint.UInt256; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.sync.SyncMode; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.List; @@ -76,8 +74,8 @@ public class FastSyncActionsTest { EthProtocolManagerTestUtil.createPeer(ethProtocolManager); } final CompletableFuture result = - fastSyncActions.waitForSuitablePeers(EMPTY_SYNC_STATE); - assertThat(result).isCompletedWithValue(EMPTY_SYNC_STATE); + fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE); + assertThat(result).isCompletedWithValue(FastSyncState.EMPTY_SYNC_STATE); } @Test @@ -115,7 +113,7 @@ public class FastSyncActionsTest { EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 5000); final CompletableFuture result = - fastSyncActions.selectPivotBlock(EMPTY_SYNC_STATE); + fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE); final FastSyncState expected = new FastSyncState(4000); assertThat(result).isCompletedWithValue(expected); } @@ -131,7 +129,7 @@ public class FastSyncActionsTest { EthProtocolManagerTestUtil.createPeer(ethProtocolManager, UInt256.of(2000), 4000); final CompletableFuture result = - fastSyncActions.selectPivotBlock(EMPTY_SYNC_STATE); + fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE); final FastSyncState expected = new FastSyncState(3000); assertThat(result).isCompletedWithValue(expected); } @@ -145,7 +143,7 @@ public class FastSyncActionsTest { fastSyncActions = createFastSyncActions(syncConfig); final CompletableFuture result = - fastSyncActions.selectPivotBlock(EMPTY_SYNC_STATE); + fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE); EthProtocolManagerTestUtil.runPendingFutures(ethProtocolManager); assertThat(result).isNotDone(); @@ -183,7 +181,7 @@ public class FastSyncActionsTest { // No pivot should be selected while peers do not have height estimates final CompletableFuture result = - fastSyncActions.selectPivotBlock(EMPTY_SYNC_STATE); + fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE); assertThat(result).isNotDone(); EthProtocolManagerTestUtil.runPendingFutures(ethProtocolManager); assertThat(result).isNotDone(); @@ -236,7 +234,7 @@ public class FastSyncActionsTest { } final CompletableFuture result = - fastSyncActions.selectPivotBlock(EMPTY_SYNC_STATE); + fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE); EthProtocolManagerTestUtil.runPendingFutures(ethProtocolManager); final long expectedBestChainHeight = @@ -259,7 +257,7 @@ public class FastSyncActionsTest { EthProtocolManagerTestUtil.createPeer(ethProtocolManager, pivotDistance - 1); final CompletableFuture result = - fastSyncActions.selectPivotBlock(EMPTY_SYNC_STATE); + fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE); assertThat(result).isNotDone(); EthProtocolManagerTestUtil.runPendingFutures(ethProtocolManager); assertThat(result).isNotDone(); @@ -281,7 +279,7 @@ public class FastSyncActionsTest { } final CompletableFuture result = - fastSyncActions.selectPivotBlock(EMPTY_SYNC_STATE); + fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE); assertThat(result).isNotDone(); EthProtocolManagerTestUtil.runPendingFutures(ethProtocolManager); assertThat(result).isNotDone(); @@ -307,7 +305,7 @@ public class FastSyncActionsTest { fastSyncActions.downloadPivotBlockHeader(new FastSyncState(1)); assertThat(result).isNotCompleted(); - final Responder responder = RespondingEthPeer.blockchainResponder(blockchain); + final RespondingEthPeer.Responder responder = RespondingEthPeer.blockchainResponder(blockchain); peer.respond(responder); assertThat(result).isCompletedWithValue(new FastSyncState(blockchain.getBlockHeader(1).get())); diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncChainDownloaderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncChainDownloaderTest.java similarity index 80% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncChainDownloaderTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncChainDownloaderTest.java index b05e5ed8a7..7f6f370c11 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncChainDownloaderTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncChainDownloaderTest.java @@ -10,31 +10,30 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.LIGHT_SKIP_DETACHED; +import static org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason.TOO_MANY_PEERS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode.LIGHT_SKIP_DETACHED; -import static tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason.TOO_MANY_PEERS; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; -import tech.pegasys.pantheon.ethereum.eth.messages.GetBlockHeadersMessage; -import tech.pegasys.pantheon.ethereum.eth.sync.ChainDownloader; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; +import org.hyperledger.besu.ethereum.eth.messages.GetBlockHeadersMessage; +import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.util.concurrent.CompletableFuture; import java.util.concurrent.locks.LockSupport; @@ -99,7 +98,8 @@ public class FastSyncChainDownloaderTest { final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, otherBlockchain); - final Responder responder = RespondingEthPeer.blockchainResponder(otherBlockchain); + final RespondingEthPeer.Responder responder = + RespondingEthPeer.blockchainResponder(otherBlockchain); final SynchronizerConfiguration syncConfig = SynchronizerConfiguration.builder() @@ -124,7 +124,8 @@ public class FastSyncChainDownloaderTest { final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, otherBlockchain); - final Responder responder = RespondingEthPeer.blockchainResponder(otherBlockchain); + final RespondingEthPeer.Responder responder = + RespondingEthPeer.blockchainResponder(otherBlockchain); final long pivotBlockNumber = 5; final SynchronizerConfiguration syncConfig = SynchronizerConfiguration.builder().build(); @@ -151,10 +152,11 @@ public class FastSyncChainDownloaderTest { EthProtocolManagerTestUtil.createPeer(ethProtocolManager, otherBlockchain); final RespondingEthPeer secondBestPeer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, shorterChain); - final Responder shorterResponder = RespondingEthPeer.blockchainResponder(shorterChain); + final RespondingEthPeer.Responder shorterResponder = + RespondingEthPeer.blockchainResponder(shorterChain); // Doesn't respond to requests for checkpoints unless it's starting from geneis // So the import can only make it as far as block 15 (3 checkpoints 5 blocks apart) - final Responder shorterLimitedRangeResponder = + final RespondingEthPeer.Responder shorterLimitedRangeResponder = RespondingEthPeer.targetedResponder( (cap, msg) -> { if (msg.getCode() == EthPV62.GET_BLOCK_HEADERS) { diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncDownloaderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloaderTest.java similarity index 78% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncDownloaderTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloaderTest.java index 342092d2c3..465ac88a1c 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncDownloaderTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloaderTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; import static java.util.concurrent.CompletableFuture.completedFuture; import static org.assertj.core.api.Assertions.assertThat; @@ -19,29 +19,27 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.eth.sync.fastsync.FastSyncError.NO_PEERS_AVAILABLE; -import static tech.pegasys.pantheon.ethereum.eth.sync.fastsync.FastSyncError.UNEXPECTED_ERROR; -import static tech.pegasys.pantheon.ethereum.eth.sync.fastsync.FastSyncState.EMPTY_SYNC_STATE; - -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.eth.sync.ChainDownloader; -import tech.pegasys.pantheon.ethereum.eth.sync.TrailingPeerRequirements; -import tech.pegasys.pantheon.ethereum.eth.sync.worldstate.NodeDataRequest; -import tech.pegasys.pantheon.ethereum.eth.sync.worldstate.StalledDownloadException; -import tech.pegasys.pantheon.ethereum.eth.sync.worldstate.WorldStateDownloader; -import tech.pegasys.pantheon.services.tasks.TaskCollection; + +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader; +import org.hyperledger.besu.ethereum.eth.sync.TrailingPeerRequirements; +import org.hyperledger.besu.ethereum.eth.sync.worldstate.NodeDataRequest; +import org.hyperledger.besu.ethereum.eth.sync.worldstate.StalledDownloadException; +import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloader; +import org.hyperledger.besu.services.tasks.TaskCollection; import java.nio.file.Path; import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; +import org.assertj.core.api.Assertions; import org.junit.Test; public class FastSyncDownloaderTest { private static final CompletableFuture COMPLETE = - completedFuture(EMPTY_SYNC_STATE); + completedFuture(FastSyncState.EMPTY_SYNC_STATE); @SuppressWarnings("unchecked") private final FastSyncActions fastSyncActions = mock(FastSyncActions.class); @@ -63,15 +61,15 @@ public class FastSyncDownloaderTest { storage, taskCollection, fastSyncDataDirectory, - EMPTY_SYNC_STATE); + FastSyncState.EMPTY_SYNC_STATE); @Test public void shouldCompleteFastSyncSuccessfully() { final FastSyncState selectPivotBlockState = new FastSyncState(50); final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(50).buildHeader(); final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader); - when(fastSyncActions.waitForSuitablePeers(EMPTY_SYNC_STATE)).thenReturn(COMPLETE); - when(fastSyncActions.selectPivotBlock(EMPTY_SYNC_STATE)) + when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE); + when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE)) .thenReturn(completedFuture(selectPivotBlockState)); when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState)) .thenReturn(completedFuture(downloadPivotBlockHeaderState)); @@ -82,8 +80,8 @@ public class FastSyncDownloaderTest { final CompletableFuture result = downloader.start(); - verify(fastSyncActions).waitForSuitablePeers(EMPTY_SYNC_STATE); - verify(fastSyncActions).selectPivotBlock(EMPTY_SYNC_STATE); + verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE); + verify(fastSyncActions).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE); verify(fastSyncActions).downloadPivotBlockHeader(selectPivotBlockState); verify(storage).storeState(downloadPivotBlockHeaderState); verify(fastSyncActions).createChainDownloader(downloadPivotBlockHeaderState); @@ -129,29 +127,29 @@ public class FastSyncDownloaderTest { @Test public void shouldAbortIfWaitForSuitablePeersFails() { - when(fastSyncActions.waitForSuitablePeers(EMPTY_SYNC_STATE)) - .thenReturn(completedExceptionally(new FastSyncException(UNEXPECTED_ERROR))); + when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)) + .thenReturn(completedExceptionally(new FastSyncException(FastSyncError.UNEXPECTED_ERROR))); final CompletableFuture result = downloader.start(); - assertCompletedExceptionally(result, UNEXPECTED_ERROR); + assertCompletedExceptionally(result, FastSyncError.UNEXPECTED_ERROR); - verify(fastSyncActions).waitForSuitablePeers(EMPTY_SYNC_STATE); + verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE); verifyNoMoreInteractions(fastSyncActions); } @Test public void shouldAbortIfSelectPivotBlockFails() { - when(fastSyncActions.waitForSuitablePeers(EMPTY_SYNC_STATE)).thenReturn(COMPLETE); - when(fastSyncActions.selectPivotBlock(EMPTY_SYNC_STATE)) - .thenThrow(new FastSyncException(UNEXPECTED_ERROR)); + when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE); + when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE)) + .thenThrow(new FastSyncException(FastSyncError.UNEXPECTED_ERROR)); final CompletableFuture result = downloader.start(); - assertCompletedExceptionally(result, UNEXPECTED_ERROR); + assertCompletedExceptionally(result, FastSyncError.UNEXPECTED_ERROR); - verify(fastSyncActions).waitForSuitablePeers(EMPTY_SYNC_STATE); - verify(fastSyncActions).selectPivotBlock(EMPTY_SYNC_STATE); + verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE); + verify(fastSyncActions).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE); verifyNoMoreInteractions(fastSyncActions); } @@ -162,8 +160,8 @@ public class FastSyncDownloaderTest { final FastSyncState selectPivotBlockState = new FastSyncState(50); final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(50).buildHeader(); final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader); - when(fastSyncActions.waitForSuitablePeers(EMPTY_SYNC_STATE)).thenReturn(COMPLETE); - when(fastSyncActions.selectPivotBlock(EMPTY_SYNC_STATE)) + when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE); + when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE)) .thenReturn(completedFuture(selectPivotBlockState)); when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState)) .thenReturn(completedFuture(downloadPivotBlockHeaderState)); @@ -174,8 +172,8 @@ public class FastSyncDownloaderTest { final CompletableFuture result = downloader.start(); - verify(fastSyncActions).waitForSuitablePeers(EMPTY_SYNC_STATE); - verify(fastSyncActions).selectPivotBlock(EMPTY_SYNC_STATE); + verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE); + verify(fastSyncActions).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE); verify(fastSyncActions).downloadPivotBlockHeader(selectPivotBlockState); verify(storage).storeState(downloadPivotBlockHeaderState); verify(fastSyncActions).createChainDownloader(downloadPivotBlockHeaderState); @@ -184,10 +182,10 @@ public class FastSyncDownloaderTest { assertThat(result).isNotDone(); - worldStateFuture.completeExceptionally(new FastSyncException(NO_PEERS_AVAILABLE)); + worldStateFuture.completeExceptionally(new FastSyncException(FastSyncError.NO_PEERS_AVAILABLE)); verify(chainDownloader).cancel(); chainFuture.completeExceptionally(new CancellationException()); - assertCompletedExceptionally(result, NO_PEERS_AVAILABLE); + assertCompletedExceptionally(result, FastSyncError.NO_PEERS_AVAILABLE); assertThat(chainFuture).isCancelled(); } @@ -198,8 +196,8 @@ public class FastSyncDownloaderTest { final FastSyncState selectPivotBlockState = new FastSyncState(50); final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(50).buildHeader(); final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader); - when(fastSyncActions.waitForSuitablePeers(EMPTY_SYNC_STATE)).thenReturn(COMPLETE); - when(fastSyncActions.selectPivotBlock(EMPTY_SYNC_STATE)) + when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE); + when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE)) .thenReturn(completedFuture(selectPivotBlockState)); when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState)) .thenReturn(completedFuture(downloadPivotBlockHeaderState)); @@ -210,8 +208,8 @@ public class FastSyncDownloaderTest { final CompletableFuture result = downloader.start(); - verify(fastSyncActions).waitForSuitablePeers(EMPTY_SYNC_STATE); - verify(fastSyncActions).selectPivotBlock(EMPTY_SYNC_STATE); + verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE); + verify(fastSyncActions).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE); verify(fastSyncActions).downloadPivotBlockHeader(selectPivotBlockState); verify(fastSyncActions).createChainDownloader(downloadPivotBlockHeaderState); verify(worldStateDownloader).run(pivotBlockHeader); @@ -220,8 +218,8 @@ public class FastSyncDownloaderTest { assertThat(result).isNotDone(); - chainFuture.completeExceptionally(new FastSyncException(NO_PEERS_AVAILABLE)); - assertCompletedExceptionally(result, NO_PEERS_AVAILABLE); + chainFuture.completeExceptionally(new FastSyncException(FastSyncError.NO_PEERS_AVAILABLE)); + assertCompletedExceptionally(result, FastSyncError.NO_PEERS_AVAILABLE); assertThat(worldStateFuture).isCancelled(); } @@ -232,8 +230,8 @@ public class FastSyncDownloaderTest { final FastSyncState selectPivotBlockState = new FastSyncState(50); final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(50).buildHeader(); final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader); - when(fastSyncActions.waitForSuitablePeers(EMPTY_SYNC_STATE)).thenReturn(COMPLETE); - when(fastSyncActions.selectPivotBlock(EMPTY_SYNC_STATE)) + when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE); + when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE)) .thenReturn(completedFuture(selectPivotBlockState)); when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState)) .thenReturn(completedFuture(downloadPivotBlockHeaderState)); @@ -244,8 +242,8 @@ public class FastSyncDownloaderTest { final CompletableFuture result = downloader.start(); - verify(fastSyncActions).waitForSuitablePeers(EMPTY_SYNC_STATE); - verify(fastSyncActions).selectPivotBlock(EMPTY_SYNC_STATE); + verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE); + verify(fastSyncActions).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE); verify(fastSyncActions).downloadPivotBlockHeader(selectPivotBlockState); verify(fastSyncActions).createChainDownloader(downloadPivotBlockHeaderState); verify(worldStateDownloader).run(pivotBlockHeader); @@ -265,8 +263,8 @@ public class FastSyncDownloaderTest { final FastSyncState selectPivotBlockState = new FastSyncState(50); final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(50).buildHeader(); final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader); - when(fastSyncActions.waitForSuitablePeers(EMPTY_SYNC_STATE)).thenReturn(COMPLETE); - when(fastSyncActions.selectPivotBlock(EMPTY_SYNC_STATE)) + when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE); + when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE)) .thenReturn(completedFuture(selectPivotBlockState)); when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState)) .thenReturn(completedFuture(downloadPivotBlockHeaderState)); @@ -277,8 +275,8 @@ public class FastSyncDownloaderTest { final CompletableFuture result = downloader.start(); - verify(fastSyncActions).waitForSuitablePeers(EMPTY_SYNC_STATE); - verify(fastSyncActions).selectPivotBlock(EMPTY_SYNC_STATE); + verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE); + verify(fastSyncActions).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE); verify(fastSyncActions).downloadPivotBlockHeader(selectPivotBlockState); verify(fastSyncActions).createChainDownloader(downloadPivotBlockHeaderState); verify(worldStateDownloader).run(pivotBlockHeader); @@ -307,8 +305,8 @@ public class FastSyncDownloaderTest { final FastSyncState secondDownloadPivotBlockHeaderState = new FastSyncState(secondPivotBlockHeader); // First attempt - when(fastSyncActions.waitForSuitablePeers(EMPTY_SYNC_STATE)).thenReturn(COMPLETE); - when(fastSyncActions.selectPivotBlock(EMPTY_SYNC_STATE)) + when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE); + when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE)) .thenReturn( completedFuture(selectPivotBlockState), completedFuture(secondSelectPivotBlockState)); when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState)) @@ -329,8 +327,8 @@ public class FastSyncDownloaderTest { final CompletableFuture result = downloader.start(); - verify(fastSyncActions).waitForSuitablePeers(EMPTY_SYNC_STATE); - verify(fastSyncActions).selectPivotBlock(EMPTY_SYNC_STATE); + verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE); + verify(fastSyncActions).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE); verify(fastSyncActions).downloadPivotBlockHeader(selectPivotBlockState); verify(storage).storeState(downloadPivotBlockHeaderState); verify(fastSyncActions).createChainDownloader(downloadPivotBlockHeaderState); @@ -345,8 +343,8 @@ public class FastSyncDownloaderTest { // A real chain downloader would cause the chainFuture to complete when cancel is called. chainFuture.completeExceptionally(new CancellationException()); - verify(fastSyncActions, times(2)).waitForSuitablePeers(EMPTY_SYNC_STATE); - verify(fastSyncActions, times(2)).selectPivotBlock(EMPTY_SYNC_STATE); + verify(fastSyncActions, times(2)).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE); + verify(fastSyncActions, times(2)).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE); verify(fastSyncActions).downloadPivotBlockHeader(secondSelectPivotBlockState); verify(storage).storeState(secondDownloadPivotBlockHeaderState); verify(fastSyncActions).createChainDownloader(secondDownloadPivotBlockHeaderState); @@ -360,13 +358,13 @@ public class FastSyncDownloaderTest { @Test public void shouldNotHaveTrailingPeerRequirementsBeforePivotBlockSelected() { - when(fastSyncActions.waitForSuitablePeers(EMPTY_SYNC_STATE)) + when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)) .thenReturn(new CompletableFuture<>()); downloader.start(); - verify(fastSyncActions).waitForSuitablePeers(EMPTY_SYNC_STATE); - assertThat(downloader.calculateTrailingPeerRequirements()).isEmpty(); + verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE); + Assertions.assertThat(downloader.calculateTrailingPeerRequirements()).isEmpty(); } @Test @@ -374,8 +372,8 @@ public class FastSyncDownloaderTest { final FastSyncState selectPivotBlockState = new FastSyncState(50); final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(50).buildHeader(); final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader); - when(fastSyncActions.waitForSuitablePeers(EMPTY_SYNC_STATE)).thenReturn(COMPLETE); - when(fastSyncActions.selectPivotBlock(EMPTY_SYNC_STATE)) + when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE); + when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE)) .thenReturn(completedFuture(selectPivotBlockState)); when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState)) .thenReturn(completedFuture(downloadPivotBlockHeaderState)); @@ -385,7 +383,7 @@ public class FastSyncDownloaderTest { when(worldStateDownloader.run(pivotBlockHeader)).thenReturn(new CompletableFuture<>()); downloader.start(); - assertThat(downloader.calculateTrailingPeerRequirements()) + Assertions.assertThat(downloader.calculateTrailingPeerRequirements()) .contains(new TrailingPeerRequirements(50, 0)); } @@ -394,8 +392,8 @@ public class FastSyncDownloaderTest { final FastSyncState selectPivotBlockState = new FastSyncState(50); final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(50).buildHeader(); final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader); - when(fastSyncActions.waitForSuitablePeers(EMPTY_SYNC_STATE)).thenReturn(COMPLETE); - when(fastSyncActions.selectPivotBlock(EMPTY_SYNC_STATE)) + when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE); + when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE)) .thenReturn(completedFuture(selectPivotBlockState)); when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState)) .thenReturn(completedFuture(downloadPivotBlockHeaderState)); @@ -407,7 +405,7 @@ public class FastSyncDownloaderTest { final CompletableFuture result = downloader.start(); assertThat(result).isDone(); - assertThat(downloader.calculateTrailingPeerRequirements()).isEmpty(); + Assertions.assertThat(downloader.calculateTrailingPeerRequirements()).isEmpty(); } private CompletableFuture completedExceptionally(final Throwable error) { diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncStateStorageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncStateStorageTest.java similarity index 85% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncStateStorageTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncStateStorageTest.java index f6b8939902..5f24b59822 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncStateStorageTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncStateStorageTest.java @@ -10,14 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.eth.sync.fastsync.FastSyncState.EMPTY_SYNC_STATE; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; import java.io.File; @@ -66,7 +65,8 @@ public class FastSyncStateStorageTest { @Test public void shouldReturnEmptyWhenLoadingHeaderAndFileDoesNotExist() { - assertThat(storage.loadState(new MainnetBlockHeaderFunctions())).isEqualTo(EMPTY_SYNC_STATE); + assertThat(storage.loadState(new MainnetBlockHeaderFunctions())) + .isEqualTo(FastSyncState.EMPTY_SYNC_STATE); } @Test @@ -74,7 +74,8 @@ public class FastSyncStateStorageTest { storage.storeState(syncStateWithHeader); assertThat(storage.loadState(new MainnetBlockHeaderFunctions())).isEqualTo(syncStateWithHeader); - storage.storeState(EMPTY_SYNC_STATE); - assertThat(storage.loadState(new MainnetBlockHeaderFunctions())).isEqualTo(EMPTY_SYNC_STATE); + storage.storeState(FastSyncState.EMPTY_SYNC_STATE); + assertThat(storage.loadState(new MainnetBlockHeaderFunctions())) + .isEqualTo(FastSyncState.EMPTY_SYNC_STATE); } } diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncValidationPolicyTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncValidationPolicyTest.java similarity index 85% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncValidationPolicyTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncValidationPolicyTest.java index 8595c7c9ac..7620e24586 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncValidationPolicyTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncValidationPolicyTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; -import static tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode.FULL; -import static tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode.LIGHT; -import static tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem.NO_OP_LABELLED_1_COUNTER; +import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.FULL; +import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.LIGHT; +import static org.hyperledger.besu.metrics.noop.NoOpMetricsSystem.NO_OP_LABELLED_1_COUNTER; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; import org.junit.Test; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/PivotBlockRetrieverTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockRetrieverTest.java similarity index 83% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/PivotBlockRetrieverTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockRetrieverTest.java index 83424125f1..a96e2bb92b 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/PivotBlockRetrieverTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockRetrieverTest.java @@ -10,25 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fastsync; +package org.hyperledger.besu.ethereum.eth.sync.fastsync; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; import java.util.concurrent.CompletableFuture; @@ -67,7 +66,7 @@ public class PivotBlockRetrieverTest { @Test public void shouldSucceedWhenAllPeersAgree() { - final Responder responder = + final RespondingEthPeer.Responder responder = RespondingEthPeer.blockchainResponder(blockchain, protocolContext.getWorldStateArchive()); final RespondingEthPeer respondingPeerA = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000); @@ -90,7 +89,7 @@ public class PivotBlockRetrieverTest { @Test public void shouldIgnorePeersThatDoNotHaveThePivotBlock() { - final Responder responder = + final RespondingEthPeer.Responder responder = RespondingEthPeer.blockchainResponder(blockchain, protocolContext.getWorldStateArchive()); final RespondingEthPeer respondingPeerA = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000); @@ -109,9 +108,9 @@ public class PivotBlockRetrieverTest { @Test public void shouldSucceedWhenMajorityOfPeersAgree() { - final Responder responder = + final RespondingEthPeer.Responder responder = RespondingEthPeer.blockchainResponder(blockchain, protocolContext.getWorldStateArchive()); - final Responder fakeResponder = responderForFakeBlock(); + final RespondingEthPeer.Responder fakeResponder = responderForFakeBlock(); final RespondingEthPeer respondingPeerA = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000); @@ -134,12 +133,12 @@ public class PivotBlockRetrieverTest { @Test public void shouldFailWhenPeersReturnDifferentHeaders() { - final Responder responderA = + final RespondingEthPeer.Responder responderA = RespondingEthPeer.blockchainResponder(blockchain, protocolContext.getWorldStateArchive()); final RespondingEthPeer respondingPeerA = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000); - final Responder responderB = responderForFakeBlock(); + final RespondingEthPeer.Responder responderB = responderForFakeBlock(); final RespondingEthPeer respondingPeerB = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000); @@ -159,7 +158,7 @@ public class PivotBlockRetrieverTest { .isEqualTo(FastSyncError.PIVOT_BLOCK_HEADER_MISMATCH); } - private Responder responderForFakeBlock() { + private RespondingEthPeer.Responder responderForFakeBlock() { final Blockchain mockBlockchain = mock(Blockchain.class); when(mockBlockchain.getBlockHeader(PIVOT_BLOCK_NUMBER)) .thenReturn( diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluatorTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluatorTest.java similarity index 93% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluatorTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluatorTest.java index cd1366c8da..98ec188c75 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluatorTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluatorTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fullsync; +package org.hyperledger.besu.ethereum.eth.sync.fullsync; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.ChainState; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.ChainState; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Optional; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullImportBlockStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullImportBlockStepTest.java similarity index 79% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullImportBlockStepTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullImportBlockStepTest.java index d549016cd2..3818c6a4ad 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullImportBlockStepTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullImportBlockStepTest.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fullsync; +package org.hyperledger.besu.ethereum.eth.sync.fullsync; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.SKIP_DETACHED; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode.SKIP_DETACHED; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncChainDownloaderForkTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderForkTest.java similarity index 73% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncChainDownloaderForkTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderForkTest.java index 8ae7f89d41..dd31dce1c5 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncChainDownloaderForkTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderForkTest.java @@ -10,28 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fullsync; +package org.hyperledger.besu.ethereum.eth.sync.fullsync; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.eth.sync.ChainDownloader; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.uint.UInt256; import org.junit.After; import org.junit.Before; @@ -93,7 +92,8 @@ public class FullSyncChainDownloaderForkTest { otherBlockchainSetup.importAllBlocks(); final UInt256 localTd = localBlockchain.getChainHead().getTotalDifficulty(); - final Responder responder = RespondingEthPeer.blockchainResponder(otherBlockchain); + final RespondingEthPeer.Responder responder = + RespondingEthPeer.blockchainResponder(otherBlockchain); final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, localTd.plus(100), 100); diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncChainDownloaderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderTest.java similarity index 85% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncChainDownloaderTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderTest.java index daadf41ad0..b27a39c6ae 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncChainDownloaderTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderTest.java @@ -10,38 +10,37 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fullsync; +package org.hyperledger.besu.ethereum.eth.sync.fullsync; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; -import tech.pegasys.pantheon.ethereum.eth.messages.GetBlockHeadersMessage; -import tech.pegasys.pantheon.ethereum.eth.sync.ChainDownloader; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.uint.UInt256; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; +import org.hyperledger.besu.ethereum.eth.messages.GetBlockHeadersMessage; +import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.uint.UInt256; import java.util.ArrayList; import java.util.List; @@ -116,7 +115,8 @@ public class FullSyncChainDownloaderTest { final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, otherBlockchain); - final Responder responder = RespondingEthPeer.blockchainResponder(otherBlockchain); + final RespondingEthPeer.Responder responder = + RespondingEthPeer.blockchainResponder(otherBlockchain); final SynchronizerConfiguration syncConfig = syncConfigBuilder().downloaderChainSegmentSize(10).build(); @@ -142,7 +142,8 @@ public class FullSyncChainDownloaderTest { final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, otherBlockchain); - final Responder responder = RespondingEthPeer.blockchainResponder(otherBlockchain); + final RespondingEthPeer.Responder responder = + RespondingEthPeer.blockchainResponder(otherBlockchain); final SynchronizerConfiguration syncConfig = syncConfigBuilder().downloaderChainSegmentSize(10).build(); @@ -168,7 +169,8 @@ public class FullSyncChainDownloaderTest { final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, otherBlockchain); - final Responder responder = RespondingEthPeer.blockchainResponder(otherBlockchain); + final RespondingEthPeer.Responder responder = + RespondingEthPeer.blockchainResponder(otherBlockchain); final SynchronizerConfiguration syncConfig = syncConfigBuilder().downloaderChainSegmentSize(4).build(); @@ -194,7 +196,8 @@ public class FullSyncChainDownloaderTest { final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, otherBlockchain); - final Responder responder = RespondingEthPeer.blockchainResponder(otherBlockchain); + final RespondingEthPeer.Responder responder = + RespondingEthPeer.blockchainResponder(otherBlockchain); final ChainDownloader downloader = downloader(); downloader.start(); @@ -226,7 +229,8 @@ public class FullSyncChainDownloaderTest { final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, otherBlockchain); - final Responder responder = RespondingEthPeer.blockchainResponder(otherBlockchain); + final RespondingEthPeer.Responder responder = + RespondingEthPeer.blockchainResponder(otherBlockchain); final SynchronizerConfiguration syncConfig = syncConfigBuilder().downloaderChainSegmentSize(10).build(); @@ -248,7 +252,8 @@ public class FullSyncChainDownloaderTest { public void choosesBestPeerAsSyncTarget_byTd() { final UInt256 localTd = localBlockchain.getChainHead().getTotalDifficulty(); - final Responder responder = RespondingEthPeer.blockchainResponder(otherBlockchain); + final RespondingEthPeer.Responder responder = + RespondingEthPeer.blockchainResponder(otherBlockchain); final RespondingEthPeer peerA = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, localTd.plus(100)); final RespondingEthPeer peerB = @@ -269,7 +274,8 @@ public class FullSyncChainDownloaderTest { public void choosesBestPeerAsSyncTarget_byTdAndHeight() { final UInt256 localTd = localBlockchain.getChainHead().getTotalDifficulty(); - final Responder responder = RespondingEthPeer.blockchainResponder(otherBlockchain); + final RespondingEthPeer.Responder responder = + RespondingEthPeer.blockchainResponder(otherBlockchain); final RespondingEthPeer peerA = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, localTd.plus(100), 100); final RespondingEthPeer peerB = @@ -306,8 +312,10 @@ public class FullSyncChainDownloaderTest { final Blockchain shorterChain = createShortChain(otherBlockchain, secondBestPeerChainHead); final RespondingEthPeer secondBestPeer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, shorterChain); - final Responder bestResponder = RespondingEthPeer.blockchainResponder(otherBlockchain); - final Responder secondBestResponder = RespondingEthPeer.blockchainResponder(shorterChain); + final RespondingEthPeer.Responder bestResponder = + RespondingEthPeer.blockchainResponder(otherBlockchain); + final RespondingEthPeer.Responder secondBestResponder = + RespondingEthPeer.blockchainResponder(shorterChain); downloader.start(); // Process through sync target selection @@ -371,14 +379,16 @@ public class FullSyncChainDownloaderTest { final long bestPeerChainHead = otherBlockchain.getChainHeadBlockNumber(); final RespondingEthPeer bestPeer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, otherBlockchain); - final Responder bestResponder = RespondingEthPeer.blockchainResponder(otherBlockchain); + final RespondingEthPeer.Responder bestResponder = + RespondingEthPeer.blockchainResponder(otherBlockchain); // Create some other peers that are available to sync from final int otherPeersCount = 5; final List otherPeers = new ArrayList<>(otherPeersCount); final long otherChainhead = bestPeerChainHead - 3; final Blockchain shorterChain = createShortChain(otherBlockchain, otherChainhead); - final Responder otherResponder = RespondingEthPeer.blockchainResponder(shorterChain); + final RespondingEthPeer.Responder otherResponder = + RespondingEthPeer.blockchainResponder(shorterChain); for (int i = 0; i < otherPeersCount; i++) { final RespondingEthPeer otherPeer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, shorterChain); diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncDownloaderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloaderTest.java similarity index 77% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncDownloaderTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloaderTest.java index ec48251260..e46ed21673 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncDownloaderTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloaderTest.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fullsync; +package org.hyperledger.besu.ethereum.eth.sync.fullsync; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.TrailingPeerRequirements; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.TrailingPeerRequirements; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; import org.junit.After; import org.junit.Before; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncTargetManagerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncTargetManagerTest.java similarity index 76% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncTargetManagerTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncTargetManagerTest.java index 2b8c8c357b..ceaaa1eb33 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fullsync/FullSyncTargetManagerTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncTargetManagerTest.java @@ -10,28 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.fullsync; +package org.hyperledger.besu.ethereum.eth.sync.fullsync; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncTarget; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncTarget; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.util.Optional; import java.util.concurrent.CompletableFuture; @@ -46,7 +45,7 @@ public class FullSyncTargetManagerTest { private MutableBlockchain localBlockchain; private final WorldStateArchive localWorldState = mock(WorldStateArchive.class); - private Responder responder; + private RespondingEthPeer.Responder responder; private FullSyncTargetManager syncTargetManager; @Before diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/state/PendingBlocksTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/state/PendingBlocksTest.java similarity index 96% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/state/PendingBlocksTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/state/PendingBlocksTest.java index addc8b80f7..ecb7a320e2 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/state/PendingBlocksTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/state/PendingBlocksTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.state; +package org.hyperledger.besu.ethereum.eth.sync.state; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; import java.util.Arrays; import java.util.Collections; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/state/SyncStateTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncStateTest.java similarity index 92% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/state/SyncStateTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncStateTest.java index 06d5f7711e..a861b146aa 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/state/SyncStateTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncStateTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.state; +package org.hyperledger.besu.ethereum.eth.sync.state; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -22,20 +22,20 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; -import tech.pegasys.pantheon.ethereum.chain.BlockAddedObserver; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.ChainHead; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.ChainState; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; -import tech.pegasys.pantheon.plugin.services.PantheonEvents.SyncStatusListener; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.ethereum.chain.BlockAddedEvent; +import org.hyperledger.besu.ethereum.chain.BlockAddedObserver; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.ChainHead; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.ChainState; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers; +import org.hyperledger.besu.plugin.services.BesuEvents.SyncStatusListener; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Collections; import java.util.Optional; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/CompleteBlocksTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/CompleteBlocksTaskTest.java similarity index 82% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/CompleteBlocksTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/CompleteBlocksTaskTest.java index 599202d4e5..798c90a40b 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/CompleteBlocksTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/CompleteBlocksTaskTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.tasks; +package org.hyperledger.besu.ethereum.eth.sync.tasks; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskTest; -import tech.pegasys.pantheon.ethereum.eth.manager.task.EthTask; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskTest; +import org.hyperledger.besu.ethereum.eth.manager.task.EthTask; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskParameterizedTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskParameterizedTest.java similarity index 81% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskParameterizedTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskParameterizedTest.java index 184bb2af1b..fedb243247 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskParameterizedTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskParameterizedTest.java @@ -10,31 +10,31 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.tasks; +package org.hyperledger.besu.ethereum.eth.sync.tasks; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.task.EthTask; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.uint.UInt256; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.manager.task.EthTask; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.uint.UInt256; import java.io.IOException; import java.util.ArrayList; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskTest.java similarity index 85% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskTest.java index 329b50c97b..43213a30cf 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskTest.java @@ -10,10 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.tasks; +package org.hyperledger.besu.ethereum.eth.sync.tasks; import static com.google.common.base.Preconditions.checkArgument; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; @@ -21,32 +23,29 @@ import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; - -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.EthTaskException; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.EthTaskException.FailureReason; -import tech.pegasys.pantheon.ethereum.eth.manager.task.EthTask; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.ExceptionUtils; + +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.EthTaskException; +import org.hyperledger.besu.ethereum.eth.manager.task.EthTask; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.ExceptionUtils; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -108,7 +107,8 @@ public class DetermineCommonAncestorTaskTest { assertThat(failure.get()).isNotNull(); final Throwable error = ExceptionUtils.rootCause(failure.get()); assertThat(error).isInstanceOf(EthTaskException.class); - assertThat(((EthTaskException) error).reason()).isEqualTo(FailureReason.PEER_DISCONNECTED); + assertThat(((EthTaskException) error).reason()) + .isEqualTo(EthTaskException.FailureReason.PEER_DISCONNECTED); } @Test diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DownloadHeaderSequenceTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DownloadHeaderSequenceTaskTest.java similarity index 82% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DownloadHeaderSequenceTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DownloadHeaderSequenceTaskTest.java index 46c54ff816..bc5950a468 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DownloadHeaderSequenceTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DownloadHeaderSequenceTaskTest.java @@ -10,23 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.tasks; +package org.hyperledger.besu.ethereum.eth.sync.tasks; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskTest; -import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.MaxRetriesReachedException; -import tech.pegasys.pantheon.ethereum.eth.manager.task.EthTask; -import tech.pegasys.pantheon.ethereum.eth.messages.BlockHeadersMessage; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; -import tech.pegasys.pantheon.ethereum.eth.sync.ValidationPolicy; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskTest; +import org.hyperledger.besu.ethereum.eth.manager.exceptions.MaxRetriesReachedException; +import org.hyperledger.besu.ethereum.eth.manager.task.EthTask; +import org.hyperledger.besu.ethereum.eth.messages.BlockHeadersMessage; +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; +import org.hyperledger.besu.ethereum.eth.sync.ValidationPolicy; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; import java.util.ArrayList; import java.util.Collections; @@ -87,7 +86,7 @@ public class DownloadHeaderSequenceTaskTest extends RetryingMessageTaskTest> future = task.run(); // Respond with only the reference header - final Responder responder = + final RespondingEthPeer.Responder responder = (cap, message) -> Optional.of(BlockHeadersMessage.create(Collections.singletonList(referenceHeader))); respondingPeer.respondWhile(responder, () -> !future.isDone()); @@ -117,8 +116,9 @@ public class DownloadHeaderSequenceTaskTest extends RetryingMessageTaskTest> future = task.run(); // Filter response to include only reference header and previous header - final Responder fullResponder = RespondingEthPeer.blockchainResponder(blockchain); - final Responder responder = + final RespondingEthPeer.Responder fullResponder = + RespondingEthPeer.blockchainResponder(blockchain); + final RespondingEthPeer.Responder responder = (cap, message) -> { final Optional fullResponse = fullResponder.respond(cap, message); if (!fullResponse.isPresent() || message.getCode() != EthPV62.GET_BLOCK_HEADERS) { diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetReceiptsForHeadersTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/GetReceiptsForHeadersTaskTest.java similarity index 84% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetReceiptsForHeadersTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/GetReceiptsForHeadersTaskTest.java index 83a1186b2a..c2eb1e6758 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetReceiptsForHeadersTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/GetReceiptsForHeadersTaskTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.tasks; +package org.hyperledger.besu.ethereum.eth.sync.tasks; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.core.Hash.EMPTY_TRIE_HASH; +import static org.hyperledger.besu.ethereum.core.Hash.EMPTY_TRIE_HASH; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskTest; -import tech.pegasys.pantheon.ethereum.eth.manager.task.EthTask; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskTest; +import org.hyperledger.besu.ethereum.eth.manager.task.EthTask; import java.util.ArrayList; import java.util.HashMap; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PersistBlockTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/PersistBlockTaskTest.java similarity index 94% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PersistBlockTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/PersistBlockTaskTest.java index b2069fde70..2615068c0c 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PersistBlockTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/PersistBlockTaskTest.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.tasks; +package org.hyperledger.besu.ethereum.eth.sync.tasks; import static java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockchainSetupUtil; -import tech.pegasys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil; +import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.Arrays; import java.util.Collections; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByNumberTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByNumberTaskTest.java similarity index 84% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByNumberTaskTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByNumberTaskTest.java index fb1a1d6f37..0da2cc68e7 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByNumberTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByNumberTaskTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.tasks; +package org.hyperledger.besu.ethereum.eth.sync.tasks; import static java.util.Collections.singletonList; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskTest; -import tech.pegasys.pantheon.ethereum.eth.manager.task.EthTask; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskTest; +import org.hyperledger.besu.ethereum.eth.manager.task.EthTask; import java.util.List; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/CompleteTaskStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CompleteTaskStepTest.java similarity index 89% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/CompleteTaskStepTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CompleteTaskStepTest.java index 66a671be5a..cd6d6843c4 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/CompleteTaskStepTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CompleteTaskStepTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.stream.Stream; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/LoadLocalDataStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/LoadLocalDataStepTest.java similarity index 83% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/LoadLocalDataStepTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/LoadLocalDataStepTest.java index 36034cb6e5..982702d8db 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/LoadLocalDataStepTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/LoadLocalDataStepTest.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.services.pipeline.Pipe; -import tech.pegasys.pantheon.services.tasks.Task; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.services.pipeline.Pipe; +import org.hyperledger.besu.services.tasks.Task; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; import java.util.stream.Stream; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/NodeDataRequestTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/NodeDataRequestTest.java similarity index 95% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/NodeDataRequestTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/NodeDataRequestTest.java index 52bd33bddf..6f0c45cfa9 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/NodeDataRequestTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/NodeDataRequestTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; import org.junit.Test; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/PersistDataStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/PersistDataStepTest.java similarity index 89% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/PersistDataStepTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/PersistDataStepTest.java index 8a761a4a56..29c9a019e1 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/PersistDataStepTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/PersistDataStepTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; @@ -18,13 +18,13 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.services.tasks.Task; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.services.tasks.Task; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/RequestDataStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestDataStepTest.java similarity index 92% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/RequestDataStepTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestDataStepTest.java index cf9c8e04fd..5874b971cb 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/RequestDataStepTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestDataStepTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; import static java.util.Arrays.asList; import static java.util.Collections.emptyMap; @@ -22,12 +22,12 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.task.EthTask; -import tech.pegasys.pantheon.services.tasks.Task; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.task.EthTask; +import org.hyperledger.besu.services.tasks.Task; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Map; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/StubTask.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/StubTask.java similarity index 88% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/StubTask.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/StubTask.java index 1bbe80e666..8fa3c393e2 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/StubTask.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/StubTask.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.services.tasks.Task; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.services.tasks.Task; public class StubTask implements Task { diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldDownloadStateTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldDownloadStateTest.java similarity index 84% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldDownloadStateTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldDownloadStateTest.java index df9c9fb84b..1085844737 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldDownloadStateTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldDownloadStateTest.java @@ -10,25 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static tech.pegasys.pantheon.ethereum.eth.sync.worldstate.NodeDataRequest.createAccountDataRequest; - -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.eth.manager.task.EthTask; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStateKeyValueStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import tech.pegasys.pantheon.services.tasks.CachingTaskCollection; -import tech.pegasys.pantheon.services.tasks.InMemoryTaskQueue; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.bytes.BytesValue; + +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.eth.manager.task.EthTask; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; +import org.hyperledger.besu.services.tasks.CachingTaskCollection; +import org.hyperledger.besu.services.tasks.InMemoryTaskQueue; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; @@ -91,7 +90,7 @@ public class WorldDownloadStateTest { @Test public void shouldNotCompleteWhenThereArePendingTasks() { - pendingRequests.add(createAccountDataRequest(Hash.EMPTY_TRIE_HASH)); + pendingRequests.add(NodeDataRequest.createAccountDataRequest(Hash.EMPTY_TRIE_HASH)); downloadState.checkCompletion(worldStateStorage, header); @@ -107,8 +106,8 @@ public class WorldDownloadStateTest { downloadState.addOutstandingTask(outstandingTask1); downloadState.addOutstandingTask(outstandingTask2); - pendingRequests.add(createAccountDataRequest(Hash.EMPTY_TRIE_HASH)); - pendingRequests.add(createAccountDataRequest(Hash.EMPTY)); + pendingRequests.add(NodeDataRequest.createAccountDataRequest(Hash.EMPTY_TRIE_HASH)); + pendingRequests.add(NodeDataRequest.createAccountDataRequest(Hash.EMPTY)); downloadState.setWorldStateDownloadProcess(worldStateDownloadProcess); future.cancel(true); @@ -181,8 +180,9 @@ public class WorldDownloadStateTest { public void shouldNotAddRequestsAfterDownloadIsCompleted() { downloadState.checkCompletion(worldStateStorage, header); - downloadState.enqueueRequests(Stream.of(createAccountDataRequest(Hash.EMPTY_TRIE_HASH))); - downloadState.enqueueRequest(createAccountDataRequest(Hash.EMPTY_TRIE_HASH)); + downloadState.enqueueRequests( + Stream.of(NodeDataRequest.createAccountDataRequest(Hash.EMPTY_TRIE_HASH))); + downloadState.enqueueRequest(NodeDataRequest.createAccountDataRequest(Hash.EMPTY_TRIE_HASH)); assertThat(pendingRequests.isEmpty()).isTrue(); } diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldStateDownloaderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloaderTest.java similarity index 91% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldStateDownloaderTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloaderTest.java index 46833c25d9..4974f2fcbf 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/worldstate/WorldStateDownloaderTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloaderTest.java @@ -10,10 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.sync.worldstate; +package org.hyperledger.besu.ethereum.eth.sync.worldstate; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.mock; @@ -22,51 +23,48 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; - -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.AccountStorageEntry; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator.BlockOptions; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.WorldState; -import tech.pegasys.pantheon.ethereum.eth.manager.DeterministicEthScheduler; -import tech.pegasys.pantheon.ethereum.eth.manager.DeterministicEthScheduler.TimeoutPolicy; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV63; -import tech.pegasys.pantheon.ethereum.eth.messages.GetNodeDataMessage; -import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStateKeyValueStorage; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage; -import tech.pegasys.pantheon.ethereum.trie.MerklePatriciaTrie; -import tech.pegasys.pantheon.ethereum.trie.Node; -import tech.pegasys.pantheon.ethereum.trie.StoredMerklePatriciaTrie; -import tech.pegasys.pantheon.ethereum.trie.TrieNodeDecoder; -import tech.pegasys.pantheon.ethereum.worldstate.StateTrieAccountValue; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStatePreimageStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage.Updater; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import tech.pegasys.pantheon.services.tasks.CachingTaskCollection; -import tech.pegasys.pantheon.services.tasks.InMemoryTaskQueue; -import tech.pegasys.pantheon.testutil.MockExecutorService; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; + +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.AccountStorageEntry; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.WorldState; +import org.hyperledger.besu.ethereum.eth.manager.DeterministicEthScheduler; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.messages.EthPV63; +import org.hyperledger.besu.ethereum.eth.messages.GetNodeDataMessage; +import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage; +import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie; +import org.hyperledger.besu.ethereum.trie.Node; +import org.hyperledger.besu.ethereum.trie.StoredMerklePatriciaTrie; +import org.hyperledger.besu.ethereum.trie.TrieNodeDecoder; +import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; +import org.hyperledger.besu.services.tasks.CachingTaskCollection; +import org.hyperledger.besu.services.tasks.InMemoryTaskQueue; +import org.hyperledger.besu.testutil.MockExecutorService; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Collections; @@ -219,7 +217,8 @@ public class WorldStateDownloaderTest { @Test public void canRecoverFromTimeouts() { - final TimeoutPolicy timeoutPolicy = TimeoutPolicy.timeoutXTimes(2); + final DeterministicEthScheduler.TimeoutPolicy timeoutPolicy = + DeterministicEthScheduler.TimeoutPolicy.timeoutXTimes(2); final EthProtocolManager ethProtocolManager = EthProtocolManagerTestUtil.create(timeoutPolicy); final MockExecutorService serviceExecutor = ((DeterministicEthScheduler) ethProtocolManager.ethContext().getScheduler()) @@ -256,7 +255,7 @@ public class WorldStateDownloaderTest { serviceExecutor.runPendingFuturesInSeparateThreads(persistenceThread); // Respond to node data requests - final Responder responder = + final RespondingEthPeer.Responder responder = RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive); respondUntilDone(peers, responder, result); @@ -313,9 +312,9 @@ public class WorldStateDownloaderTest { // Respond to node data requests final List sentMessages = new ArrayList<>(); - final Responder blockChainResponder = + final RespondingEthPeer.Responder blockChainResponder = RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive); - final Responder responder = + final RespondingEthPeer.Responder responder = RespondingEthPeer.wrapResponderWithCollector(blockChainResponder, sentMessages); respondUntilDone(peers, responder, result); @@ -385,7 +384,7 @@ public class WorldStateDownloaderTest { final CompletableFuture result = downloader.run(header); // Send a few responses - final Responder responder = + final RespondingEthPeer.Responder responder = RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive); for (int i = 0; i < 3; i++) { @@ -478,9 +477,9 @@ public class WorldStateDownloaderTest { // Respond to node data requests final List sentMessages = new ArrayList<>(); - final Responder blockChainResponder = + final RespondingEthPeer.Responder blockChainResponder = RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive); - final Responder responder = + final RespondingEthPeer.Responder responder = RespondingEthPeer.wrapResponderWithCollector(blockChainResponder, sentMessages); respondUntilDone(peers, responder, result); @@ -574,9 +573,9 @@ public class WorldStateDownloaderTest { // Respond to node data requests final List sentMessages = new ArrayList<>(); - final Responder blockChainResponder = + final RespondingEthPeer.Responder blockChainResponder = RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive); - final Responder responder = + final RespondingEthPeer.Responder responder = RespondingEthPeer.wrapResponderWithCollector(blockChainResponder, sentMessages); respondUntilDone(peers, responder, result); @@ -645,7 +644,7 @@ public class WorldStateDownloaderTest { assertThat(secondResult).isCompletedExceptionally(); assertThat(result).isNotCompletedExceptionally(); - final Responder emptyResponder = RespondingEthPeer.emptyResponder(); + final RespondingEthPeer.Responder emptyResponder = RespondingEthPeer.emptyResponder(); peer.respondWhileOtherThreadsWork(emptyResponder, () -> !result.isDone()); assertThat(result).isCompletedExceptionally(); @@ -653,7 +652,7 @@ public class WorldStateDownloaderTest { // Finally, check that when we restart the download with state that is available it works final CompletableFuture retryResult = downloader.run(header); - final Responder responder = + final RespondingEthPeer.Responder responder = RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive); peer.respondWhileOtherThreadsWork(responder, () -> !retryResult.isDone()); assertThat(retryResult).isCompleted(); @@ -702,9 +701,9 @@ public class WorldStateDownloaderTest { // Respond to node data requests final List sentMessages = new ArrayList<>(); - final Responder blockChainResponder = + final RespondingEthPeer.Responder blockChainResponder = RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive); - final Responder responder = + final RespondingEthPeer.Responder responder = RespondingEthPeer.wrapResponderWithCollector(blockChainResponder, sentMessages); CompletableFuture result = downloader.run(header); @@ -860,7 +859,7 @@ public class WorldStateDownloaderTest { // Respond to node data requests // Send one round of full responses, so that we can get multiple requests queued up - final Responder fullResponder = + final RespondingEthPeer.Responder fullResponder = RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive); for (final RespondingEthPeer peer : usefulPeers) { peer.respond(fullResponder); @@ -889,7 +888,7 @@ public class WorldStateDownloaderTest { final List peers, final WorldStateArchive remoteWorldStateArchive, final CompletableFuture downloaderFuture) { - final Responder responder = + final RespondingEthPeer.Responder responder = RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive); respondUntilDone(peers, responder, downloaderFuture); } @@ -898,12 +897,12 @@ public class WorldStateDownloaderTest { final List peers, final WorldStateArchive remoteWorldStateArchive, final CompletableFuture downloaderFuture) { - final Responder fullResponder = + final RespondingEthPeer.Responder fullResponder = RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive); - final Responder partialResponder = + final RespondingEthPeer.Responder partialResponder = RespondingEthPeer.partialResponder( mock(Blockchain.class), remoteWorldStateArchive, MainnetProtocolSchedule.create(), .5f); - final Responder emptyResponder = RespondingEthPeer.emptyResponder(); + final RespondingEthPeer.Responder emptyResponder = RespondingEthPeer.emptyResponder(); // Send a few partial responses for (int i = 0; i < 5; i++) { @@ -979,7 +978,7 @@ public class WorldStateDownloaderTest { private void respondUntilDone( final List peers, - final Responder responder, + final RespondingEthPeer.Responder responder, final CompletableFuture result) { if (peers.size() == 1) { // Use a blocking approach to waiting for the next message when we can. diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/PeerTransactionTrackerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PeerTransactionTrackerTest.java similarity index 94% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/PeerTransactionTrackerTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PeerTransactionTrackerTest.java index 7d52f1f302..047cba2a68 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/PeerTransactionTrackerTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PeerTransactionTrackerTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; import com.google.common.collect.ImmutableSet; import org.junit.Test; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactionsTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsTest.java similarity index 95% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactionsTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsTest.java index 4728f53c22..1c1097fc9f 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/PendingTransactionsTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -18,16 +18,15 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionTestFixture; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions.TransactionSelectionResult; -import tech.pegasys.pantheon.metrics.StubMetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionTestFixture; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.metrics.StubMetricsSystem; +import org.hyperledger.besu.testutil.TestClock; import java.time.temporal.ChronoUnit; import java.util.ArrayList; @@ -251,7 +250,7 @@ public class PendingTransactionsTest { transactions.selectTransactions( transaction -> { parsedTransactions.add(transaction); - return TransactionSelectionResult.COMPLETE_OPERATION; + return PendingTransactions.TransactionSelectionResult.COMPLETE_OPERATION; }); assertThat(parsedTransactions.size()).isEqualTo(1); @@ -267,7 +266,7 @@ public class PendingTransactionsTest { transactions.selectTransactions( transaction -> { parsedTransactions.add(transaction); - return TransactionSelectionResult.CONTINUE; + return PendingTransactions.TransactionSelectionResult.CONTINUE; }); assertThat(parsedTransactions.size()).isEqualTo(2); @@ -284,7 +283,7 @@ public class PendingTransactionsTest { transactions.selectTransactions( transaction -> { parsedTransactions.add(transaction); - return TransactionSelectionResult.DELETE_TRANSACTION_AND_CONTINUE; + return PendingTransactions.TransactionSelectionResult.DELETE_TRANSACTION_AND_CONTINUE; }); assertThat(parsedTransactions.size()).isEqualTo(2); @@ -383,7 +382,7 @@ public class PendingTransactionsTest { transactions.selectTransactions( transaction -> { iterationOrder.add(transaction); - return TransactionSelectionResult.CONTINUE; + return PendingTransactions.TransactionSelectionResult.CONTINUE; }); assertThat(iterationOrder).containsExactly(transaction1, transaction2, transaction3); @@ -401,7 +400,7 @@ public class PendingTransactionsTest { transactions.selectTransactions( transaction -> { iterationOrder.add(transaction); - return TransactionSelectionResult.CONTINUE; + return PendingTransactions.TransactionSelectionResult.CONTINUE; }); assertThat(iterationOrder).containsExactly(transaction2, transaction1); @@ -423,7 +422,7 @@ public class PendingTransactionsTest { transactions.selectTransactions( transaction -> { iterationOrder.add(transaction); - return TransactionSelectionResult.CONTINUE; + return PendingTransactions.TransactionSelectionResult.CONTINUE; }); // Ignoring nonces, the order would be 3, 2, 4, 1 but we have to delay 3 and 2 until after 1. diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TestNode.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNode.java similarity index 73% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TestNode.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNode.java index f7f3e98f9f..027c711f90 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TestNode.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNode.java @@ -10,47 +10,47 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; import static java.util.Collections.singletonList; import static org.assertj.core.util.Preconditions.checkNotNull; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; - -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.GenesisState; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule; -import tech.pegasys.pantheon.ethereum.eth.EthProtocol; -import tech.pegasys.pantheon.ethereum.eth.EthProtocolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.config.RlpxConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.network.DefaultP2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.network.NetworkRunner; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.bytes.BytesValue; + +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.GenesisState; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule; +import org.hyperledger.besu.ethereum.eth.EthProtocol; +import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration; +import org.hyperledger.besu.ethereum.p2p.network.DefaultP2PNetwork; +import org.hyperledger.besu.ethereum.p2p.network.NetworkRunner; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.Closeable; import java.io.IOException; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TestNodeList.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNodeList.java similarity index 95% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TestNodeList.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNodeList.java index fa43ca54ba..172a27f042 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TestNodeList.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNodeList.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static java.lang.String.format; import static org.apache.logging.log4j.util.Strings.join; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.eth.transactions.TestNode.shortId; +import static org.hyperledger.besu.ethereum.eth.transactions.TestNode.shortId; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; import java.io.Closeable; import java.io.IOException; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolPropagationTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolPropagationTest.java similarity index 89% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolPropagationTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolPropagationTest.java index 94afc65753..4daf65f98e 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolPropagationTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolPropagationTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; - -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.PrivateKey; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionTestFixture; -import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.util.bytes.Bytes32; +package org.hyperledger.besu.ethereum.eth.transactions; + +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.PrivateKey; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionTestFixture; +import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.util.bytes.Bytes32; import java.util.concurrent.TimeUnit; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolTest.java similarity index 91% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolTest.java index 3e44dc894e..9880942536 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; @@ -18,6 +18,10 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonList; import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.EXCEEDS_BLOCK_GAS_LIMIT; +import static org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.GAS_PRICE_TOO_LOW; +import static org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.NONCE_TOO_LOW; +import static org.hyperledger.besu.ethereum.mainnet.ValidationResult.valid; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; @@ -28,41 +32,36 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.EXCEEDS_BLOCK_GAS_LIMIT; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.GAS_PRICE_TOO_LOW; -import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.NONCE_TOO_LOW; -import static tech.pegasys.pantheon.ethereum.mainnet.ValidationResult.valid; - -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Account; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockBody; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; -import tech.pegasys.pantheon.ethereum.core.ExecutionContextTestFixture; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; -import tech.pegasys.pantheon.ethereum.core.TransactionTestFixture; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; -import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool.TransactionBatchAddedListener; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidationParams; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator; -import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.testutil.TestClock; -import tech.pegasys.pantheon.util.uint.UInt256; + +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Account; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockBody; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; +import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.TransactionReceipt; +import org.hyperledger.besu.ethereum.core.TransactionTestFixture; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil; +import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator; +import org.hyperledger.besu.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; +import org.hyperledger.besu.ethereum.mainnet.ValidationResult; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.testutil.TestClock; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Collections; import java.util.List; @@ -79,8 +78,8 @@ public class TransactionPoolTest { private static final KeyPair KEY_PAIR1 = KeyPair.generate(); private final PendingTransactionListener listener = mock(PendingTransactionListener.class); - private final TransactionBatchAddedListener batchAddedListener = - mock(TransactionBatchAddedListener.class); + private final TransactionPool.TransactionBatchAddedListener batchAddedListener = + mock(TransactionPool.TransactionBatchAddedListener.class); private final MetricsSystem metricsSystem = new NoOpMetricsSystem(); @SuppressWarnings("unchecked") diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageProcessorTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageProcessorTest.java similarity index 89% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageProcessorTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageProcessorTest.java index 4147cd62d0..253834aef8 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageProcessorTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageProcessorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; import static java.time.Duration.ofMillis; import static java.time.Duration.ofMinutes; @@ -19,11 +19,11 @@ import static java.util.Arrays.asList; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.messages.TransactionsMessage; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.messages.TransactionsMessage; +import org.hyperledger.besu.plugin.services.metrics.Counter; import com.google.common.collect.ImmutableSet; import org.junit.Test; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageSenderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageSenderTest.java similarity index 90% rename from ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageSenderTest.java rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageSenderTest.java index 36beb0595c..7ba488eb61 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageSenderTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageSenderTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.eth.transactions; +package org.hyperledger.besu.ethereum.eth.transactions; import static com.google.common.collect.Sets.newHashSet; import static org.assertj.core.api.Assertions.assertThat; @@ -20,12 +20,12 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; -import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; -import tech.pegasys.pantheon.ethereum.eth.messages.TransactionsMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.eth.manager.EthPeer; +import org.hyperledger.besu.ethereum.eth.messages.EthPV62; +import org.hyperledger.besu.ethereum.eth.messages.TransactionsMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; import java.util.List; import java.util.Set; diff --git a/ethereum/mock-p2p/build.gradle b/ethereum/mock-p2p/build.gradle index f7bc9ca67e..64c0d656ad 100644 --- a/ethereum/mock-p2p/build.gradle +++ b/ethereum/mock-p2p/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-mock-p2p' + baseName 'besu-mock-p2p' manifest { attributes( 'Specification-Title': baseName, diff --git a/ethereum/mock-p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/testing/MockNetwork.java b/ethereum/mock-p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/testing/MockNetwork.java similarity index 89% rename from ethereum/mock-p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/testing/MockNetwork.java rename to ethereum/mock-p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/testing/MockNetwork.java index 5e738fa5d1..76973bf01d 100644 --- a/ethereum/mock-p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/testing/MockNetwork.java +++ b/ethereum/mock-p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/testing/MockNetwork.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.testing; - -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.ConnectCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.DisconnectCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.MessageCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.DefaultMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.util.Subscribers; +package org.hyperledger.besu.ethereum.p2p.testing; + +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.ConnectCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.DisconnectCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.MessageCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.util.Subscribers; import java.net.InetSocketAddress; import java.util.ArrayList; diff --git a/ethereum/mock-p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/testing/MockNetworkTest.java b/ethereum/mock-p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/testing/MockNetworkTest.java similarity index 87% rename from ethereum/mock-p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/testing/MockNetworkTest.java rename to ethereum/mock-p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/testing/MockNetworkTest.java index d2997f79d9..2db3c2aa4f 100644 --- a/ethereum/mock-p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/testing/MockNetworkTest.java +++ b/ethereum/mock-p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/testing/MockNetworkTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.testing; +package org.hyperledger.besu.ethereum.p2p.testing; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; import java.util.Optional; diff --git a/ethereum/p2p/build.gradle b/ethereum/p2p/build.gradle index 3e174062d8..8d3d13c1fa 100644 --- a/ethereum/p2p/build.gradle +++ b/ethereum/p2p/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-p2p' + baseName 'besu-p2p' manifest { attributes( 'Specification-Title': baseName, diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/DiscoveryConfiguration.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/DiscoveryConfiguration.java similarity index 98% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/DiscoveryConfiguration.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/DiscoveryConfiguration.java index 8f052b04c3..b4aea6ec1a 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/DiscoveryConfiguration.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/DiscoveryConfiguration.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.config; +package org.hyperledger.besu.ethereum.p2p.config; import static java.util.stream.Collectors.toList; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.util.NetworkUtility; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.util.NetworkUtility; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/NetworkingConfiguration.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/NetworkingConfiguration.java similarity index 98% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/NetworkingConfiguration.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/NetworkingConfiguration.java index 44d503d6c1..6ea5a7dac1 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/NetworkingConfiguration.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/NetworkingConfiguration.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.config; +package org.hyperledger.besu.ethereum.p2p.config; import static com.google.common.base.Preconditions.checkArgument; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/RlpxConfiguration.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/RlpxConfiguration.java similarity index 96% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/RlpxConfiguration.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/RlpxConfiguration.java index 7ddb563dbf..6f9996cfa8 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/RlpxConfiguration.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/RlpxConfiguration.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.config; +package org.hyperledger.besu.ethereum.p2p.config; import static com.google.common.base.Preconditions.checkState; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.SubProtocol; -import tech.pegasys.pantheon.util.NetworkUtility; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol; +import org.hyperledger.besu.util.NetworkUtility; import java.util.Arrays; import java.util.Collections; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/SubProtocolConfiguration.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/SubProtocolConfiguration.java similarity index 86% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/SubProtocolConfiguration.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/SubProtocolConfiguration.java index c6f19e3df1..f1c71e36a7 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/SubProtocolConfiguration.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/SubProtocolConfiguration.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.config; +package org.hyperledger.besu.ethereum.p2p.config; -import tech.pegasys.pantheon.ethereum.p2p.network.ProtocolManager; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.SubProtocol; +import org.hyperledger.besu.ethereum.p2p.network.ProtocolManager; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/DiscoveryPeer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/DiscoveryPeer.java similarity index 89% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/DiscoveryPeer.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/DiscoveryPeer.java index a5e9a7778a..f7c3201ec9 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/DiscoveryPeer.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/DiscoveryPeer.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; - -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.PeerId; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.p2p.discovery; + +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.PeerId; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; /** * Represents an Ethereum node that we interacting with through the discovery and wire protocols. diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/Endpoint.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/Endpoint.java similarity index 93% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/Endpoint.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/Endpoint.java index 5008152ddd..b36be403f5 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/Endpoint.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/Endpoint.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; +package org.hyperledger.besu.ethereum.p2p.discovery; import static com.google.common.base.Preconditions.checkArgument; -import static tech.pegasys.pantheon.util.Preconditions.checkGuard; +import static org.hyperledger.besu.util.Preconditions.checkGuard; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.NetworkUtility; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.NetworkUtility; +import org.hyperledger.besu.util.bytes.BytesValue; import java.net.InetAddress; import java.util.Objects; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerBondedObserver.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerBondedObserver.java similarity index 83% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerBondedObserver.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerBondedObserver.java index 8954a4bcbe..a346efe2d4 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerBondedObserver.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerBondedObserver.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; +package org.hyperledger.besu.ethereum.p2p.discovery; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent; @FunctionalInterface public interface PeerBondedObserver { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryAgent.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgent.java similarity index 89% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryAgent.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgent.java index ccc2092fb4..0082588fe0 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryAgent.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgent.java @@ -10,28 +10,28 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; +package org.hyperledger.besu.ethereum.p2p.discovery; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import static tech.pegasys.pantheon.util.bytes.BytesValue.wrapBuffer; - -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.Packet; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerDiscoveryController; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerDiscoveryController.AsyncExecutor; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerRequirement; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PingPacketData; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.TimerUtil; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.PeerId; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions; -import tech.pegasys.pantheon.nat.upnp.UpnpNatManager; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.NetworkUtility; -import tech.pegasys.pantheon.util.Subscribers; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import static org.hyperledger.besu.util.bytes.BytesValue.wrapBuffer; + +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.Packet; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerDiscoveryController; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerDiscoveryController.AsyncExecutor; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerRequirement; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PingPacketData; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.TimerUtil; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.PeerId; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions; +import org.hyperledger.besu.nat.upnp.UpnpNatManager; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.NetworkUtility; +import org.hyperledger.besu.util.Subscribers; +import org.hyperledger.besu.util.bytes.BytesValue; import java.net.InetSocketAddress; import java.net.SocketException; @@ -73,7 +73,7 @@ public abstract class PeerDiscoveryAgent { private final BytesValue id; protected final DiscoveryConfiguration config; - /* This is the {@link tech.pegasys.pantheon.ethereum.p2p.Peer} object representing our local node. + /* This is the {@link org.hyperledger.besu.ethereum.p2p.Peer} object representing our local node. * This value is empty on construction, and is set after the discovery agent is started. */ private Optional localNode = Optional.empty(); diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryEvent.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryEvent.java similarity index 89% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryEvent.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryEvent.java index 20f2f92291..ad42fc2c68 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryEvent.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryEvent.java @@ -10,7 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; +package org.hyperledger.besu.ethereum.p2p.discovery; + +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerDiscoveryController; import com.google.common.base.MoreObjects; @@ -44,7 +46,7 @@ public abstract class PeerDiscoveryEvent { * An event that is dispatched whenever we bond with a new peer. See Javadoc on * PeerDiscoveryController to understand when this happens. * - *

{@link tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerDiscoveryController} + *

{@link PeerDiscoveryController} */ public static class PeerBondedEvent extends PeerDiscoveryEvent { public PeerBondedEvent(final DiscoveryPeer peer, final long timestamp) { @@ -56,7 +58,7 @@ public abstract class PeerDiscoveryEvent { * An event that is dispatched whenever we drop a peer from the peer table. See Javadoc on * PeerDiscoveryController to understand when this happens. * - *

{@link tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerDiscoveryController} + *

{@link PeerDiscoveryController} */ public static class PeerDroppedEvent extends PeerDiscoveryEvent { public PeerDroppedEvent(final DiscoveryPeer peer, final long timestamp) { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketDecodingException.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketDecodingException.java similarity index 94% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketDecodingException.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketDecodingException.java index a24d650b6e..c62f24262c 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketDecodingException.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketDecodingException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; +package org.hyperledger.besu.ethereum.p2p.discovery; /** Signals that an error occurred while deserializing a discovery packet from the wire. */ public class PeerDiscoveryPacketDecodingException extends RuntimeException { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryServiceException.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryServiceException.java similarity index 93% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryServiceException.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryServiceException.java index e0ade1c92b..12bc84aa3d 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryServiceException.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryServiceException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; +package org.hyperledger.besu.ethereum.p2p.discovery; /** Thrown to indicate that an error occurred during the operation of the P2P Discovery Service. */ public class PeerDiscoveryServiceException extends RuntimeException { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryStatus.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryStatus.java similarity index 95% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryStatus.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryStatus.java index f79c3e978c..8825d3cbcd 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryStatus.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryStatus.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; +package org.hyperledger.besu.ethereum.p2p.discovery; /** The status of a {@link DiscoveryPeer}, in relation to the peer discovery state machine. */ public enum PeerDiscoveryStatus { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/VertxPeerDiscoveryAgent.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/VertxPeerDiscoveryAgent.java similarity index 89% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/VertxPeerDiscoveryAgent.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/VertxPeerDiscoveryAgent.java index 45ca9e151b..096dd5b42b 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/VertxPeerDiscoveryAgent.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/VertxPeerDiscoveryAgent.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; +package org.hyperledger.besu.ethereum.p2p.discovery; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.Packet; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerDiscoveryController; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerDiscoveryController.AsyncExecutor; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.TimerUtil; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.VertxTimerUtil; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.nat.upnp.UpnpNatManager; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.NetworkUtility; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.Packet; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerDiscoveryController; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerDiscoveryController.AsyncExecutor; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.TimerUtil; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.VertxTimerUtil; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.nat.upnp.UpnpNatManager; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.NetworkUtility; import java.io.IOException; import java.net.BindException; @@ -67,7 +67,7 @@ public class VertxPeerDiscoveryAgent extends PeerDiscoveryAgent { this.vertx = vertx; metricsSystem.createIntegerGauge( - PantheonMetricCategory.NETWORK, + BesuMetricCategory.NETWORK, "vertx_eventloop_pending_tasks", "The number of pending tasks in the Vertx event loop", pendingTaskCounter(vertx.nettyEventLoopGroup())); diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/Bucket.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/Bucket.java similarity index 95% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/Bucket.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/Bucket.java index 04d0136114..fd350c9b58 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/Bucket.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/Bucket.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static java.lang.System.arraycopy; import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.PeerId; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.peers.PeerId; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; import java.util.List; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/DiscoveryProtocolLogger.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/DiscoveryProtocolLogger.java similarity index 83% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/DiscoveryProtocolLogger.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/DiscoveryProtocolLogger.java index 1e65c4f902..b2f4d3f058 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/DiscoveryProtocolLogger.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/DiscoveryProtocolLogger.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -30,13 +30,13 @@ public class DiscoveryProtocolLogger { public DiscoveryProtocolLogger(final MetricsSystem metricsSystem) { outgoingMessageCounter = metricsSystem.createLabelledCounter( - PantheonMetricCategory.NETWORK, + BesuMetricCategory.NETWORK, "discovery_messages_outbound", "Total number of P2P discovery messages sent", "name"); incomingMessageCounter = metricsSystem.createLabelledCounter( - PantheonMetricCategory.NETWORK, + BesuMetricCategory.NETWORK, "discovery_messages_inbound", "Total number of P2P discovery messages received", "name"); diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/FindNeighborsPacketData.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/FindNeighborsPacketData.java similarity index 90% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/FindNeighborsPacketData.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/FindNeighborsPacketData.java index b89593e1d0..fc704697fe 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/FindNeighborsPacketData.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/FindNeighborsPacketData.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; public class FindNeighborsPacketData implements PacketData { private static final int TARGET_SIZE = 64; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/NeighborsPacketData.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/NeighborsPacketData.java similarity index 90% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/NeighborsPacketData.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/NeighborsPacketData.java index bc2d1d6e8c..f9e7e1db06 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/NeighborsPacketData.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/NeighborsPacketData.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; import java.util.List; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/OutboundMessageHandler.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/OutboundMessageHandler.java similarity index 85% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/OutboundMessageHandler.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/OutboundMessageHandler.java index 0c43da994f..84c92e8587 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/OutboundMessageHandler.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/OutboundMessageHandler.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; @FunctionalInterface public interface OutboundMessageHandler { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/Packet.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/Packet.java similarity index 88% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/Packet.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/Packet.java index 92ebcc6d4e..d82340b0b4 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/Packet.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/Packet.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static com.google.common.base.Preconditions.checkArgument; -import static tech.pegasys.pantheon.crypto.Hash.keccak256; -import static tech.pegasys.pantheon.util.Preconditions.checkGuard; -import static tech.pegasys.pantheon.util.bytes.BytesValues.asUnsignedBigInteger; - -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.PublicKey; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryPacketDecodingException; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; -import tech.pegasys.pantheon.util.uint.UInt256Bytes; +import static org.hyperledger.besu.crypto.Hash.keccak256; +import static org.hyperledger.besu.util.Preconditions.checkGuard; +import static org.hyperledger.besu.util.bytes.BytesValues.asUnsignedBigInteger; + +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.PublicKey; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryPacketDecodingException; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytesValue; +import org.hyperledger.besu.util.uint.UInt256Bytes; import java.math.BigInteger; import java.util.Arrays; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketData.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketData.java similarity index 89% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketData.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketData.java index 9bece12ed9..6f40ee7366 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketData.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketData.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; public interface PacketData { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketType.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketType.java similarity index 94% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketType.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketType.java index f6e81965a7..24cd8d905e 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketType.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketType.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; import java.util.Arrays; import java.util.Optional; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryController.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryController.java similarity index 94% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryController.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryController.java index e44662417c..fdbc070cc5 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryController.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryController.java @@ -10,30 +10,29 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import static tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerTable.AddResult.AddOutcome; - -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerBondedObserver; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryStatus; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.peers.PeerId; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.util.Subscribers; -import tech.pegasys.pantheon.util.bytes.BytesValue; + +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerBondedObserver; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryEvent; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryStatus; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.peers.PeerId; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.util.Subscribers; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Collection; @@ -172,21 +171,21 @@ public class PeerDiscoveryController { this.peerPermissions = new PeerDiscoveryPermissions(localPeer, peerPermissions); metricsSystem.createIntegerGauge( - PantheonMetricCategory.NETWORK, + BesuMetricCategory.NETWORK, "discovery_inflight_interactions_current", "Current number of inflight discovery interactions", inflightInteractions::size); interactionCounter = metricsSystem.createLabelledCounter( - PantheonMetricCategory.NETWORK, + BesuMetricCategory.NETWORK, "discovery_interaction_count", "Total number of discovery interactions initiated", "type"); interactionRetryCounter = metricsSystem.createLabelledCounter( - PantheonMetricCategory.NETWORK, + BesuMetricCategory.NETWORK, "discovery_interaction_retry_count", "Total number of interaction retries performed", "type"); @@ -352,7 +351,7 @@ public class PeerDiscoveryController { } final PeerTable.AddResult result = peerTable.tryAdd(peer); - if (result.getOutcome() == AddOutcome.SELF) { + if (result.getOutcome() == PeerTable.AddResult.AddOutcome.SELF) { return false; } @@ -368,11 +367,11 @@ public class PeerDiscoveryController { notifyPeerBonded(peer, now); } - if (result.getOutcome() == AddOutcome.ALREADY_EXISTED) { + if (result.getOutcome() == PeerTable.AddResult.AddOutcome.ALREADY_EXISTED) { // Bump peer. peerTable.tryEvict(peer); peerTable.tryAdd(peer); - } else if (result.getOutcome() == AddOutcome.BUCKET_FULL) { + } else if (result.getOutcome() == PeerTable.AddResult.AddOutcome.BUCKET_FULL) { peerTable.tryEvict(result.getEvictionCandidate()); peerTable.tryAdd(peer); } @@ -381,7 +380,8 @@ public class PeerDiscoveryController { } private void notifyPeerBonded(final DiscoveryPeer peer, final long now) { - final PeerBondedEvent event = new PeerBondedEvent(peer, now); + final PeerDiscoveryEvent.PeerBondedEvent event = + new PeerDiscoveryEvent.PeerBondedEvent(peer, now); dispatchPeerBondedEvent(peerBondedObservers, event); } @@ -547,7 +547,8 @@ public class PeerDiscoveryController { // Dispatches an event to a set of observers. private void dispatchPeerBondedEvent( - final Subscribers observers, final PeerBondedEvent event) { + final Subscribers observers, + final PeerDiscoveryEvent.PeerBondedEvent event) { observers.forEach(observer -> observer.onPeerBonded(event)); } diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryPermissions.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryPermissions.java similarity index 63% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryPermissions.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryPermissions.java index 945e7ccb75..e83c62696a 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryPermissions.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryPermissions.java @@ -10,12 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions.Action; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PermissionsUpdateCallback; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions; +import org.hyperledger.besu.ethereum.p2p.permissions.PermissionsUpdateCallback; class PeerDiscoveryPermissions { private final Peer localNode; @@ -31,24 +30,27 @@ class PeerDiscoveryPermissions { } public boolean isAllowedInPeerTable(final Peer peer) { - return peerPermissions.isPermitted(localNode, peer, Action.DISCOVERY_ALLOW_IN_PEER_TABLE); + return peerPermissions.isPermitted( + localNode, peer, PeerPermissions.Action.DISCOVERY_ALLOW_IN_PEER_TABLE); } public boolean allowOutboundBonding(final Peer peer) { - return peerPermissions.isPermitted(localNode, peer, Action.DISCOVERY_ALLOW_OUTBOUND_BONDING); + return peerPermissions.isPermitted( + localNode, peer, PeerPermissions.Action.DISCOVERY_ALLOW_OUTBOUND_BONDING); } public boolean allowInboundBonding(final Peer peer) { - return peerPermissions.isPermitted(localNode, peer, Action.DISCOVERY_ACCEPT_INBOUND_BONDING); + return peerPermissions.isPermitted( + localNode, peer, PeerPermissions.Action.DISCOVERY_ACCEPT_INBOUND_BONDING); } public boolean allowOutboundNeighborsRequest(final Peer peer) { return peerPermissions.isPermitted( - localNode, peer, Action.DISCOVERY_ALLOW_OUTBOUND_NEIGHBORS_REQUEST); + localNode, peer, PeerPermissions.Action.DISCOVERY_ALLOW_OUTBOUND_NEIGHBORS_REQUEST); } public boolean allowInboundNeighborsRequest(final Peer peer) { return peerPermissions.isPermitted( - localNode, peer, Action.DISCOVERY_SERVE_INBOUND_NEIGHBORS_REQUEST); + localNode, peer, PeerPermissions.Action.DISCOVERY_SERVE_INBOUND_NEIGHBORS_REQUEST); } } diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDistanceCalculator.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDistanceCalculator.java similarity index 92% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDistanceCalculator.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDistanceCalculator.java index a95f519cf4..181cda4b7b 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDistanceCalculator.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDistanceCalculator.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerRequirement.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerRequirement.java similarity index 94% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerRequirement.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerRequirement.java index 7398324a4b..f4f7ee62f4 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerRequirement.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerRequirement.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import java.util.Collection; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerTable.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerTable.java similarity index 91% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerTable.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerTable.java index a2357a2fe9..130ae08d81 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerTable.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerTable.java @@ -10,19 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static java.util.Comparator.comparingInt; import static java.util.stream.Collectors.toList; -import static tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerDistanceCalculator.distance; -import tech.pegasys.pantheon.crypto.Hash; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryStatus; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerTable.AddResult.AddOutcome; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.peers.PeerId; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryStatus; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerTable.AddResult.AddOutcome; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.peers.PeerId; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; import java.util.List; @@ -193,7 +192,8 @@ public class PeerTable { final BytesValue keccak256 = Hash.keccak256(target); return streamAllPeers() .filter(p -> p.getStatus() == PeerDiscoveryStatus.BONDED) - .sorted(comparingInt((peer) -> distance(peer.keccak256(), keccak256))) + .sorted( + comparingInt((peer) -> PeerDistanceCalculator.distance(peer.keccak256(), keccak256))) .limit(limit) .collect(toList()); } @@ -211,7 +211,9 @@ public class PeerTable { */ private int distanceFrom(final PeerId peer) { final Integer distance = distanceCache.get(peer.getId()); - return distance == null ? distance(keccak256, peer.keccak256()) : distance; + return distance == null + ? PeerDistanceCalculator.distance(keccak256, peer.keccak256()) + : distance; } /** A class that encapsulates the result of a peer addition to the table. */ diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PingPacketData.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketData.java similarity index 91% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PingPacketData.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketData.java index eee997ab8c..526b6debad 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PingPacketData.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketData.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.ethereum.p2p.discovery.Endpoint; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.ethereum.p2p.discovery.Endpoint; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; public class PingPacketData implements PacketData { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PongPacketData.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PongPacketData.java similarity index 88% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PongPacketData.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PongPacketData.java index b26bd3dba8..c7c7972cb2 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PongPacketData.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PongPacketData.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; -import tech.pegasys.pantheon.ethereum.p2p.discovery.Endpoint; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.discovery.Endpoint; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; public class PongPacketData implements PacketData { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/RecursivePeerRefreshState.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RecursivePeerRefreshState.java similarity index 95% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/RecursivePeerRefreshState.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RecursivePeerRefreshState.java index 2670050868..89d61a8c2b 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/RecursivePeerRefreshState.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RecursivePeerRefreshState.java @@ -10,13 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; -import static tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerDistanceCalculator.distance; - -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryStatus; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryStatus; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Map; @@ -96,7 +94,7 @@ public class RecursivePeerRefreshState { this.initialPeers = initialPeers; for (final DiscoveryPeer peer : initialPeers) { final MetadataPeer iterationParticipant = - new MetadataPeer(peer, distance(target, peer.getId())); + new MetadataPeer(peer, PeerDistanceCalculator.distance(target, peer.getId())); oneTrueMap.put(peer.getId(), iterationParticipant); } } @@ -194,7 +192,9 @@ public class RecursivePeerRefreshState { for (final DiscoveryPeer receivedDiscoPeer : peers) { if (satisfiesMapAdditionCriteria(receivedDiscoPeer)) { final MetadataPeer receivedMetadataPeer = - new MetadataPeer(receivedDiscoPeer, distance(target, receivedDiscoPeer.getId())); + new MetadataPeer( + receivedDiscoPeer, + PeerDistanceCalculator.distance(target, receivedDiscoPeer.getId())); oneTrueMap.put(receivedDiscoPeer.getId(), receivedMetadataPeer); } } diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/RetryDelayFunction.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RetryDelayFunction.java similarity index 94% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/RetryDelayFunction.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RetryDelayFunction.java index fe7aad7a3e..a6f396e979 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/RetryDelayFunction.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RetryDelayFunction.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import java.util.function.UnaryOperator; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/TimerUtil.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/TimerUtil.java similarity index 93% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/TimerUtil.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/TimerUtil.java index fe04ee4800..84b0e0a772 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/TimerUtil.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/TimerUtil.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; public interface TimerUtil { long setPeriodic(long delayInMs, TimerHandler handler); diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/VertxTimerUtil.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/VertxTimerUtil.java similarity index 94% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/VertxTimerUtil.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/VertxTimerUtil.java index ccf6607420..f28fd7b635 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/VertxTimerUtil.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/VertxTimerUtil.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import io.vertx.core.Vertx; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/DefaultP2PNetwork.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetwork.java similarity index 90% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/DefaultP2PNetwork.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetwork.java index 3bd0c28083..c87e6ab1b6 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/DefaultP2PNetwork.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetwork.java @@ -10,38 +10,38 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.network; +package org.hyperledger.besu.ethereum.p2p.network; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryAgent; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryStatus; -import tech.pegasys.pantheon.ethereum.p2p.discovery.VertxPeerDiscoveryAgent; -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeerPrivileges; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.LocalNode; -import tech.pegasys.pantheon.ethereum.p2p.peers.MaintainedPeers; -import tech.pegasys.pantheon.ethereum.p2p.peers.MutableLocalNode; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.peers.PeerPrivileges; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissionsBlacklist; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.ConnectCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.DisconnectCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.MessageCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.RlpxAgent; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.nat.upnp.UpnpNatManager; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryAgent; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryStatus; +import org.hyperledger.besu.ethereum.p2p.discovery.VertxPeerDiscoveryAgent; +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeerPrivileges; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.LocalNode; +import org.hyperledger.besu.ethereum.p2p.peers.MaintainedPeers; +import org.hyperledger.besu.ethereum.p2p.peers.MutableLocalNode; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.peers.PeerPrivileges; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsBlacklist; +import org.hyperledger.besu.ethereum.p2p.rlpx.ConnectCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.DisconnectCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.MessageCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.RlpxAgent; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.nat.upnp.UpnpNatManager; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.bytes.BytesValue; import java.time.Duration; import java.util.Arrays; @@ -379,11 +379,11 @@ public class DefaultP2PNetwork implements P2PNetwork { .requestPortForward( this.config.getDiscovery().getBindPort(), UpnpNatManager.Protocol.UDP, - "pantheon-discovery"); + "besu-discovery"); this.natManager .get() .requestPortForward( - this.config.getRlpx().getBindPort(), UpnpNatManager.Protocol.TCP, "pantheon-rlpx"); + this.config.getRlpx().getBindPort(), UpnpNatManager.Protocol.TCP, "besu-rlpx"); } else { LOG.info("No external IP detected within timeout."); } diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/NetworkRunner.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/NetworkRunner.java similarity index 92% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/NetworkRunner.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/NetworkRunner.java index e441586760..e738607fbb 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/NetworkRunner.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/NetworkRunner.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.network; +package org.hyperledger.besu.ethereum.p2p.network; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.SubProtocol; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; import java.util.ArrayList; import java.util.Arrays; @@ -55,7 +55,7 @@ public class NetworkRunner implements AutoCloseable { this.subProtocols = subProtocols; inboundMessageCounter = metricsSystem.createLabelledCounter( - PantheonMetricCategory.NETWORK, + BesuMetricCategory.NETWORK, "p2p_messages_inbound", "Count of each P2P message received inbound.", "protocol", diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/NoopP2PNetwork.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/NoopP2PNetwork.java similarity index 78% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/NoopP2PNetwork.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/NoopP2PNetwork.java index 7b02c753a8..7a247d0cda 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/NoopP2PNetwork.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/NoopP2PNetwork.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.network; - -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.P2PDisabledException; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.ConnectCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.DisconnectCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.MessageCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; +package org.hyperledger.besu.ethereum.p2p.network; + +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.P2PDisabledException; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.ConnectCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.DisconnectCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.MessageCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; import java.io.IOException; import java.util.Collection; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/P2PNetwork.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/P2PNetwork.java similarity index 87% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/P2PNetwork.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/P2PNetwork.java index ff28404a96..b54ebc1c23 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/P2PNetwork.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/P2PNetwork.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.network; - -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.ConnectCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.DisconnectCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.MessageCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; +package org.hyperledger.besu.ethereum.p2p.network; + +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.ConnectCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.DisconnectCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.MessageCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; import java.io.Closeable; import java.util.Collection; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/PeerReputationManager.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/PeerReputationManager.java similarity index 82% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/PeerReputationManager.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/PeerReputationManager.java index 98327062da..caab6f02f0 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/PeerReputationManager.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/PeerReputationManager.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.network; +package org.hyperledger.besu.ethereum.p2p.network; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissionsBlacklist; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.DisconnectCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsBlacklist; +import org.hyperledger.besu.ethereum.p2p.rlpx.DisconnectCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; import java.util.Set; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/ProtocolManager.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/ProtocolManager.java similarity index 85% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/ProtocolManager.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/ProtocolManager.java index 3cb7701324..6ad32bbf36 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/ProtocolManager.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/ProtocolManager.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.network; +package org.hyperledger.besu.ethereum.p2p.network; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; import java.util.List; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/exceptions/BreachOfProtocolException.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/BreachOfProtocolException.java similarity index 92% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/exceptions/BreachOfProtocolException.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/BreachOfProtocolException.java index 2897553269..af602c217d 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/exceptions/BreachOfProtocolException.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/BreachOfProtocolException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.network.exceptions; +package org.hyperledger.besu.ethereum.p2p.network.exceptions; public class BreachOfProtocolException extends RuntimeException { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/exceptions/IncompatiblePeerException.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/IncompatiblePeerException.java similarity index 92% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/exceptions/IncompatiblePeerException.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/IncompatiblePeerException.java index e20ae6cde0..04b85a12e3 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/exceptions/IncompatiblePeerException.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/IncompatiblePeerException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.network.exceptions; +package org.hyperledger.besu.ethereum.p2p.network.exceptions; public class IncompatiblePeerException extends RuntimeException { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/exceptions/P2PDisabledException.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/P2PDisabledException.java similarity index 92% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/exceptions/P2PDisabledException.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/P2PDisabledException.java index 24f93c9b89..60ac026d91 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/exceptions/P2PDisabledException.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/P2PDisabledException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.network.exceptions; +package org.hyperledger.besu.ethereum.p2p.network.exceptions; public class P2PDisabledException extends RuntimeException { public P2PDisabledException(final String message) { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/exceptions/PeerDisconnectedException.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/PeerDisconnectedException.java similarity index 83% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/exceptions/PeerDisconnectedException.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/PeerDisconnectedException.java index b70b426302..748f62e288 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/exceptions/PeerDisconnectedException.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/PeerDisconnectedException.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.network.exceptions; +package org.hyperledger.besu.ethereum.p2p.network.exceptions; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; public class PeerDisconnectedException extends RuntimeException { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/exceptions/UnexpectedPeerConnectionException.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/UnexpectedPeerConnectionException.java similarity index 92% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/exceptions/UnexpectedPeerConnectionException.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/UnexpectedPeerConnectionException.java index 2cf3735265..1e0ae4f98a 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/network/exceptions/UnexpectedPeerConnectionException.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/UnexpectedPeerConnectionException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.network.exceptions; +package org.hyperledger.besu.ethereum.p2p.network.exceptions; public class UnexpectedPeerConnectionException extends RuntimeException { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultLocalNode.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultLocalNode.java similarity index 93% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultLocalNode.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultLocalNode.java index c788533a5a..ad526f66d9 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultLocalNode.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultLocalNode.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; import java.util.List; import java.util.Optional; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultPeer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultPeer.java similarity index 98% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultPeer.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultPeer.java index c32a50d113..9be492bf81 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultPeer.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultPeer.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; import java.net.URI; import java.util.Objects; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultPeerId.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultPeerId.java similarity index 87% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultPeerId.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultPeerId.java index fbb8ca3309..dbc01acf03 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultPeerId.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultPeerId.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; -import tech.pegasys.pantheon.crypto.Hash; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Objects; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultPeerPrivileges.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultPeerPrivileges.java similarity index 94% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultPeerPrivileges.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultPeerPrivileges.java index d6b76cb396..e24b3e5fd6 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultPeerPrivileges.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultPeerPrivileges.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; public class DefaultPeerPrivileges implements PeerPrivileges { private final MaintainedPeers maintainedPeers; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/EnodeURL.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURL.java similarity index 98% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/EnodeURL.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURL.java index 20e3b720e2..ca5865e000 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/EnodeURL.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURL.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import tech.pegasys.pantheon.util.NetworkUtility; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.NetworkUtility; +import org.hyperledger.besu.util.bytes.BytesValue; import java.net.InetAddress; import java.net.URI; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/LocalNode.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/LocalNode.java similarity index 92% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/LocalNode.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/LocalNode.java index 611697890d..80a01d4d6d 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/LocalNode.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/LocalNode.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; import java.util.List; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/MaintainedPeers.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/MaintainedPeers.java similarity index 96% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/MaintainedPeers.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/MaintainedPeers.java index 3074d16f43..f537b1810e 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/MaintainedPeers.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/MaintainedPeers.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.util.Subscribers; import java.util.Set; import java.util.stream.Stream; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/MutableLocalNode.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/MutableLocalNode.java similarity index 90% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/MutableLocalNode.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/MutableLocalNode.java index a529957ff6..d139357207 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/MutableLocalNode.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/MutableLocalNode.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; import java.util.List; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/Peer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/Peer.java similarity index 88% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/Peer.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/Peer.java index e61ddacc3a..8eda71889a 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/Peer.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/Peer.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; -import tech.pegasys.pantheon.crypto.SecureRandomProvider; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SecureRandomProvider; +import org.hyperledger.besu.util.bytes.BytesValue; public interface Peer extends PeerId { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerId.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/PeerId.java similarity index 87% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerId.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/PeerId.java index 18e7c09065..95a6f4d37c 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerId.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/PeerId.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; public interface PeerId { /** diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerPrivileges.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/PeerPrivileges.java similarity index 95% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerPrivileges.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/PeerPrivileges.java index bd2ebf1c9c..1d358d2435 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerPrivileges.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/PeerPrivileges.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; public interface PeerPrivileges { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/StaticNodesParser.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/StaticNodesParser.java similarity index 98% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/StaticNodesParser.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/StaticNodesParser.java index 7c0172126d..dd54278774 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/StaticNodesParser.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/StaticNodesParser.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; import static com.google.common.base.Preconditions.checkArgument; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PeerPermissions.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissions.java similarity index 96% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PeerPermissions.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissions.java index 24a9a57362..494f386925 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PeerPermissions.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissions.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.permissions; +package org.hyperledger.besu.ethereum.p2p.permissions; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.util.Subscribers; import java.util.Arrays; import java.util.List; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PeerPermissionsBlacklist.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsBlacklist.java similarity index 90% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PeerPermissionsBlacklist.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsBlacklist.java index f0c0700dc9..eab0962bff 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PeerPermissionsBlacklist.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsBlacklist.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.permissions; +package org.hyperledger.besu.ethereum.p2p.permissions; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.util.LimitedSet; -import tech.pegasys.pantheon.util.LimitedSet.Mode; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.util.LimitedSet; +import org.hyperledger.besu.util.LimitedSet.Mode; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collections; import java.util.Optional; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PeerPermissionsException.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsException.java similarity index 85% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PeerPermissionsException.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsException.java index 179cbf7eae..1ab09a6ac4 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PeerPermissionsException.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsException.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.permissions; +package org.hyperledger.besu.ethereum.p2p.permissions; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions.Action; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions.Action; public class PeerPermissionsException extends RuntimeException { private final Peer peer; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PermissionsUpdateCallback.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PermissionsUpdateCallback.java similarity index 92% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PermissionsUpdateCallback.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PermissionsUpdateCallback.java index 9cd1cb6bed..b2e6362d94 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PermissionsUpdateCallback.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PermissionsUpdateCallback.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.permissions; +package org.hyperledger.besu.ethereum.p2p.permissions; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; import java.util.List; import java.util.Optional; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/ConnectCallback.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/ConnectCallback.java similarity index 84% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/ConnectCallback.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/ConnectCallback.java index b5b42a9ab9..dabd518964 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/ConnectCallback.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/ConnectCallback.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx; +package org.hyperledger.besu.ethereum.p2p.rlpx; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; @FunctionalInterface public interface ConnectCallback { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/DisconnectCallback.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/DisconnectCallback.java similarity index 77% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/DisconnectCallback.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/DisconnectCallback.java index 0df7876cd8..19a5e1912a 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/DisconnectCallback.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/DisconnectCallback.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx; +package org.hyperledger.besu.ethereum.p2p.rlpx; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; @FunctionalInterface public interface DisconnectCallback { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/MessageCallback.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/MessageCallback.java similarity index 80% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/MessageCallback.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/MessageCallback.java index c499ada281..c31647485e 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/MessageCallback.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/MessageCallback.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx; +package org.hyperledger.besu.ethereum.p2p.rlpx; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; @FunctionalInterface public interface MessageCallback { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/RlpxAgent.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxAgent.java similarity index 92% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/RlpxAgent.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxAgent.java index 879bf3f437..1974323091 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/RlpxAgent.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxAgent.java @@ -10,34 +10,34 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx; +package org.hyperledger.besu.ethereum.p2p.rlpx; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.isNull; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.p2p.config.RlpxConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.LocalNode; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.peers.PeerPrivileges; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.ConnectionInitializer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnectionEvents; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerRlpxPermissions; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.RlpxConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.netty.NettyConnectionInitializer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.util.FutureUtils; -import tech.pegasys.pantheon.util.Subscribers; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.LocalNode; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.peers.PeerPrivileges; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.ConnectionInitializer; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEvents; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerRlpxPermissions; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.RlpxConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.NettyConnectionInitializer; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.util.FutureUtils; +import org.hyperledger.besu.util.Subscribers; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; @@ -97,15 +97,15 @@ public class RlpxAgent { // Setup metrics connectedPeersCounter = metricsSystem.createCounter( - PantheonMetricCategory.PEERS, "connected_total", "Total number of peers connected"); + BesuMetricCategory.PEERS, "connected_total", "Total number of peers connected"); metricsSystem.createIntegerGauge( - PantheonMetricCategory.ETHEREUM, + BesuMetricCategory.ETHEREUM, "peer_count", "The current number of peers connected", this::getConnectionCount); metricsSystem.createIntegerGauge( - PantheonMetricCategory.ETHEREUM, + BesuMetricCategory.ETHEREUM, "peer_limit", "The maximum number of peers this node allows to connect", () -> maxConnections); diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/AbstractPeerConnection.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/AbstractPeerConnection.java similarity index 88% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/AbstractPeerConnection.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/AbstractPeerConnection.java index 19976e34c0..591ec74607 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/AbstractPeerConnection.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/AbstractPeerConnection.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections; - -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.CapabilityMultiplexer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.SubProtocol; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.WireMessageCodes; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections; + +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.CapabilityMultiplexer; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.WireMessageCodes; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; import java.net.InetSocketAddress; import java.util.HashMap; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/ConnectionInitializer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/ConnectionInitializer.java similarity index 90% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/ConnectionInitializer.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/ConnectionInitializer.java index 40df4844af..a46db80c65 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/ConnectionInitializer.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/ConnectionInitializer.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.ConnectCallback; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.ConnectCallback; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/PeerConnection.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/PeerConnection.java similarity index 86% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/PeerConnection.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/PeerConnection.java index 909b4f708e..901822ba83 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/PeerConnection.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/PeerConnection.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections; - -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections; + +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/PeerConnectionEventDispatcher.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/PeerConnectionEventDispatcher.java similarity index 75% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/PeerConnectionEventDispatcher.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/PeerConnectionEventDispatcher.java index be0f988cc6..a4324ef735 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/PeerConnectionEventDispatcher.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/PeerConnectionEventDispatcher.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; public interface PeerConnectionEventDispatcher { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/PeerConnectionEvents.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/PeerConnectionEvents.java similarity index 72% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/PeerConnectionEvents.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/PeerConnectionEvents.java index 11907c180b..eb16bc895d 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/PeerConnectionEvents.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/PeerConnectionEvents.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.DisconnectCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.MessageCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.DefaultMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Message; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.ethereum.p2p.rlpx.DisconnectCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.MessageCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.util.Subscribers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -37,7 +37,7 @@ public class PeerConnectionEvents implements PeerConnectionEventDispatcher { public PeerConnectionEvents(final MetricsSystem metricsSystem) { disconnectCounter = metricsSystem.createLabelledCounter( - PantheonMetricCategory.PEERS, + BesuMetricCategory.PEERS, "disconnected_total", "Total number of peers disconnected", "initiator", diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/PeerRlpxPermissions.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/PeerRlpxPermissions.java similarity index 64% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/PeerRlpxPermissions.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/PeerRlpxPermissions.java index 5c9f412af8..5e5d5ea597 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/PeerRlpxPermissions.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/PeerRlpxPermissions.java @@ -10,14 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections; -import tech.pegasys.pantheon.ethereum.p2p.peers.LocalNode; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions.Action; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissionsException; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PermissionsUpdateCallback; +import org.hyperledger.besu.ethereum.p2p.peers.LocalNode; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsException; +import org.hyperledger.besu.ethereum.p2p.permissions.PermissionsUpdateCallback; public class PeerRlpxPermissions { private final LocalNode localNode; @@ -33,11 +32,12 @@ public class PeerRlpxPermissions { return false; } return peerPermissions.isPermitted( - localNode.getPeer(), peer, Action.RLPX_ALLOW_NEW_OUTBOUND_CONNECTION); + localNode.getPeer(), peer, PeerPermissions.Action.RLPX_ALLOW_NEW_OUTBOUND_CONNECTION); } public PeerPermissionsException newOutboundConnectionException(final Peer peer) { - return new PeerPermissionsException(peer, Action.RLPX_ALLOW_NEW_OUTBOUND_CONNECTION); + return new PeerPermissionsException( + peer, PeerPermissions.Action.RLPX_ALLOW_NEW_OUTBOUND_CONNECTION); } public boolean allowNewInboundConnectionFrom(final Peer peer) { @@ -45,17 +45,17 @@ public class PeerRlpxPermissions { return false; } return peerPermissions.isPermitted( - localNode.getPeer(), peer, Action.RLPX_ALLOW_NEW_INBOUND_CONNECTION); + localNode.getPeer(), peer, PeerPermissions.Action.RLPX_ALLOW_NEW_INBOUND_CONNECTION); } public boolean allowOngoingConnection(final Peer peer, final boolean remotelyInitiated) { if (!localNode.isReady()) { return false; } - final Action action = + final PeerPermissions.Action action = remotelyInitiated - ? Action.RLPX_ALLOW_ONGOING_REMOTELY_INITIATED_CONNECTION - : Action.RLPX_ALLOW_ONGOING_LOCALLY_INITIATED_CONNECTION; + ? PeerPermissions.Action.RLPX_ALLOW_ONGOING_REMOTELY_INITIATED_CONNECTION + : PeerPermissions.Action.RLPX_ALLOW_ONGOING_LOCALLY_INITIATED_CONNECTION; return peerPermissions.isPermitted(localNode.getPeer(), peer, action); } diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/RlpxConnection.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/RlpxConnection.java similarity index 95% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/RlpxConnection.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/RlpxConnection.java index 868659f3a2..db87834560 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/RlpxConnection.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/RlpxConnection.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Objects; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java similarity index 81% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java index 18fb7e1538..1d76b2a4a4 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java @@ -10,22 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.netty; - -import tech.pegasys.pantheon.ethereum.p2p.peers.LocalNode; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.framing.Framer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.Handshaker; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.SubProtocol; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.HelloMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.WireMessageCodes; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty; + +import org.hyperledger.besu.ethereum.p2p.peers.LocalNode; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher; +import org.hyperledger.besu.ethereum.p2p.rlpx.framing.Framer; +import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.Handshaker; +import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.HelloMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.WireMessageCodes; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; @@ -92,7 +91,7 @@ abstract class AbstractHandshakeHandler extends SimpleChannelInboundHandler { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/ApiHandler.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/ApiHandler.java similarity index 77% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/ApiHandler.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/ApiHandler.java index 299bf9fef3..0da9a1c5c3 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/ApiHandler.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/ApiHandler.java @@ -10,18 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.netty; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.CapabilityMultiplexer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.PongMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.WireMessageCodes; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.CapabilityMultiplexer; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.PongMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.WireMessageCodes; +import org.hyperledger.besu.ethereum.rlp.RLPException; import java.util.concurrent.atomic.AtomicBoolean; @@ -66,7 +64,7 @@ final class ApiHandler extends SimpleChannelInboundHandler { LOG.debug("Received Wire PING"); try { connection.send(null, PongMessage.get()); - } catch (final PeerNotConnected peerNotConnected) { + } catch (final PeerConnection.PeerNotConnected peerNotConnected) { // Nothing to do } break; @@ -76,7 +74,7 @@ final class ApiHandler extends SimpleChannelInboundHandler { break; case WireMessageCodes.DISCONNECT: final DisconnectMessage disconnect = DisconnectMessage.readFrom(message); - DisconnectReason reason = DisconnectReason.UNKNOWN; + DisconnectMessage.DisconnectReason reason = DisconnectMessage.DisconnectReason.UNKNOWN; try { reason = disconnect.getReason(); LOG.debug( @@ -104,7 +102,7 @@ final class ApiHandler extends SimpleChannelInboundHandler { public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable throwable) { LOG.error("Error:", throwable); connectionEventDispatcher.dispatchDisconnect( - connection, DisconnectReason.TCP_SUBSYSTEM_ERROR, false); + connection, DisconnectMessage.DisconnectReason.TCP_SUBSYSTEM_ERROR, false); ctx.close(); } } diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/DeFramer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/DeFramer.java similarity index 77% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/DeFramer.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/DeFramer.java index 22a9ff3746..6b673cb6fa 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/DeFramer.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/DeFramer.java @@ -10,33 +10,32 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.netty; - -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.BreachOfProtocolException; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.IncompatiblePeerException; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.PeerDisconnectedException; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.UnexpectedPeerConnectionException; -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.LocalNode; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.framing.Framer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.framing.FramingException; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.CapabilityMultiplexer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.SubProtocol; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.HelloMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.WireMessageCodes; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty; + +import org.hyperledger.besu.ethereum.p2p.network.exceptions.BreachOfProtocolException; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.IncompatiblePeerException; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.PeerDisconnectedException; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.UnexpectedPeerConnectionException; +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.LocalNode; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher; +import org.hyperledger.besu.ethereum.p2p.rlpx.framing.Framer; +import org.hyperledger.besu.ethereum.p2p.rlpx.framing.FramingException; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.CapabilityMultiplexer; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.HelloMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.WireMessageCodes; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; import java.io.IOException; import java.net.InetSocketAddress; @@ -86,7 +85,7 @@ final class DeFramer extends ByteToMessageDecoder { this.connectionEventDispatcher = connectionEventDispatcher; this.outboundMessagesCounter = metricsSystem.createLabelledCounter( - PantheonMetricCategory.NETWORK, + BesuMetricCategory.NETWORK, "p2p_messages_outbound", "Count of each P2P message sent outbound.", "protocol", @@ -141,7 +140,7 @@ final class DeFramer extends ByteToMessageDecoder { String.format( "Expected id %s, but got %s", expectedPeer.get().getId(), peerInfo.getNodeId()); connectFuture.completeExceptionally(new UnexpectedPeerConnectionException(unexpectedMsg)); - connection.disconnect(DisconnectReason.UNEXPECTED_ID); + connection.disconnect(DisconnectMessage.DisconnectReason.UNEXPECTED_ID); } // Check that we have shared caps @@ -150,7 +149,7 @@ final class DeFramer extends ByteToMessageDecoder { "Disconnecting from {} because no capabilities are shared.", peerInfo.getClientId()); connectFuture.completeExceptionally( new IncompatiblePeerException("No shared capabilities")); - connection.disconnect(DisconnectReason.USELESS_PEER); + connection.disconnect(DisconnectMessage.DisconnectReason.USELESS_PEER); } // Setup next stage @@ -179,7 +178,9 @@ final class DeFramer extends ByteToMessageDecoder { message.getData().toString()); ctx.writeAndFlush( new OutboundMessage( - null, DisconnectMessage.create(DisconnectReason.BREACH_OF_PROTOCOL))) + null, + DisconnectMessage.create( + DisconnectMessage.DisconnectReason.BREACH_OF_PROTOCOL))) .addListener((f) -> ctx.close()); connectFuture.completeExceptionally( new BreachOfProtocolException("Message received before HELLO's exchanged")); @@ -210,7 +211,7 @@ final class DeFramer extends ByteToMessageDecoder { if (cause instanceof FramingException || cause instanceof RLPException) { LOG.debug("Invalid incoming message", throwable); if (connectFuture.isDone() && !connectFuture.isCompletedExceptionally()) { - connectFuture.get().disconnect(DisconnectReason.BREACH_OF_PROTOCOL); + connectFuture.get().disconnect(DisconnectMessage.DisconnectReason.BREACH_OF_PROTOCOL); return; } } else if (cause instanceof IOException) { @@ -220,7 +221,9 @@ final class DeFramer extends ByteToMessageDecoder { LOG.error("Exception while processing incoming message", throwable); } if (connectFuture.isDone() && !connectFuture.isCompletedExceptionally()) { - connectFuture.get().terminateConnection(DisconnectReason.TCP_SUBSYSTEM_ERROR, false); + connectFuture + .get() + .terminateConnection(DisconnectMessage.DisconnectReason.TCP_SUBSYSTEM_ERROR, false); } else { connectFuture.completeExceptionally(throwable); ctx.close(); diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerInbound.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerInbound.java similarity index 75% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerInbound.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerInbound.java index 5414cbeab7..50bfd8655f 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerInbound.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerInbound.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.netty; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.p2p.peers.LocalNode; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.Handshaker; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.SubProtocol; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.p2p.peers.LocalNode; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher; +import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.Handshaker; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.List; import java.util.Optional; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerOutbound.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerOutbound.java similarity index 80% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerOutbound.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerOutbound.java index 0bcf769ab1..ebe0effbf3 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerOutbound.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerOutbound.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.netty; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.p2p.peers.LocalNode; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.Handshaker; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.SubProtocol; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.p2p.peers.LocalNode; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher; +import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.Handshaker; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.List; import java.util.Optional; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/MessageFramer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/MessageFramer.java similarity index 85% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/MessageFramer.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/MessageFramer.java index 99f465ae08..6b3f8c4c6c 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/MessageFramer.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/MessageFramer.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.netty; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.framing.Framer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.CapabilityMultiplexer; +import org.hyperledger.besu.ethereum.p2p.rlpx.framing.Framer; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.CapabilityMultiplexer; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/NettyConnectionInitializer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyConnectionInitializer.java similarity index 90% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/NettyConnectionInitializer.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyConnectionInitializer.java index a3e9edc3e6..717dfd6e7c 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/NettyConnectionInitializer.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyConnectionInitializer.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.netty; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty; import static com.google.common.base.Preconditions.checkState; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.p2p.config.RlpxConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.LocalNode; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.ConnectCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.ConnectionInitializer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.LocalNode; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.ConnectCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.ConnectionInitializer; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.Subscribers; import java.net.InetSocketAddress; import java.util.concurrent.CompletableFuture; @@ -80,13 +80,13 @@ public class NettyConnectionInitializer implements ConnectionInitializer { this.metricsSystem = metricsSystem; metricsSystem.createIntegerGauge( - PantheonMetricCategory.NETWORK, + BesuMetricCategory.NETWORK, "netty_workers_pending_tasks", "The number of pending tasks in the Netty workers event loop", pendingTaskCounter(workers)); metricsSystem.createIntegerGauge( - PantheonMetricCategory.NETWORK, + BesuMetricCategory.NETWORK, "netty_boss_pending_tasks", "The number of pending tasks in the Netty boss event loop", pendingTaskCounter(boss)); diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/NettyPeerConnection.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyPeerConnection.java similarity index 67% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/NettyPeerConnection.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyPeerConnection.java index 42bf8f7413..c51d604d0d 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/NettyPeerConnection.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyPeerConnection.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.netty; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty; import static java.util.concurrent.TimeUnit.SECONDS; -import static tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason.TCP_SUBSYSTEM_ERROR; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.AbstractPeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.CapabilityMultiplexer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.AbstractPeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.CapabilityMultiplexer; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; import java.net.InetSocketAddress; import java.util.concurrent.Callable; @@ -53,7 +53,11 @@ final class NettyPeerConnection extends AbstractPeerConnection { outboundMessagesCounter); this.ctx = ctx; - ctx.channel().closeFuture().addListener(f -> terminateConnection(TCP_SUBSYSTEM_ERROR, false)); + ctx.channel() + .closeFuture() + .addListener( + f -> + terminateConnection(DisconnectMessage.DisconnectReason.TCP_SUBSYSTEM_ERROR, false)); } @Override diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/OutboundMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/OutboundMessage.java similarity index 83% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/OutboundMessage.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/OutboundMessage.java index e964f26e1f..c330557128 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/OutboundMessage.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/OutboundMessage.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.netty; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; final class OutboundMessage { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/TimeoutHandler.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TimeoutHandler.java similarity index 96% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/TimeoutHandler.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TimeoutHandler.java index 41bff96ffb..8369e06cbf 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/TimeoutHandler.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TimeoutHandler.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.netty; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/WireKeepAlive.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/WireKeepAlive.java similarity index 80% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/WireKeepAlive.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/WireKeepAlive.java index 15967f6d35..442af32ddb 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/WireKeepAlive.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/WireKeepAlive.java @@ -10,12 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.netty; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.PingMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.PingMessage; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; @@ -51,7 +50,7 @@ final class WireKeepAlive extends ChannelDuplexHandler { if (waitingForPong.get()) { // We are still waiting for a response from our last pong, disconnect with timeout error LOG.debug("Wire PONG never received, disconnecting from peer."); - connection.disconnect(DisconnectReason.TIMEOUT); + connection.disconnect(DisconnectMessage.DisconnectReason.TIMEOUT); return; } @@ -59,7 +58,7 @@ final class WireKeepAlive extends ChannelDuplexHandler { LOG.debug("Idle connection detected, sending Wire PING to peer."); connection.send(null, PingMessage.get()); waitingForPong.set(true); - } catch (final PeerNotConnected ignored) { + } catch (final PeerConnection.PeerNotConnected ignored) { LOG.trace("PING not sent because peer is already disconnected"); } } diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/Framer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/Framer.java similarity index 96% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/Framer.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/Framer.java index ebfd627d5f..6674713358 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/Framer.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/Framer.java @@ -10,17 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.framing; +package org.hyperledger.besu.ethereum.p2p.rlpx.framing; import static io.netty.buffer.ByteBufUtil.hexDump; import static io.netty.buffer.Unpooled.wrappedBuffer; import static org.bouncycastle.pqc.math.linearalgebra.ByteUtils.xor; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.HandshakeSecrets; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.HandshakeSecrets; +import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.Handshaker; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; @@ -39,7 +40,7 @@ import org.bouncycastle.crypto.params.ParametersWithIV; * schemes defined in the Ethereum protocols. * *

These frames are encrypted and authenticated using the secrets generated during the - * cryptographic handshake ({@link tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.Handshaker}. + * cryptographic handshake ({@link Handshaker}. * *

This component is well-versed in TCP streaming complexities: it is capable of processing * fragmented frames, as well as streams of multiple messages within the same incoming buffer, as diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/FramingException.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/FramingException.java similarity index 94% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/FramingException.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/FramingException.java index 0c515c0ffe..c365e73ef0 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/FramingException.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/FramingException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.framing; +package org.hyperledger.besu.ethereum.p2p.rlpx.framing; /** Thrown when the framer encounters an error during framing or deframing. */ public class FramingException extends RuntimeException { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/SnappyCompressor.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/SnappyCompressor.java similarity index 96% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/SnappyCompressor.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/SnappyCompressor.java index 20179d3682..487dfdee62 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/SnappyCompressor.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/SnappyCompressor.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.framing; +package org.hyperledger.besu.ethereum.p2p.rlpx.framing; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/HandshakeException.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/HandshakeException.java similarity index 93% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/HandshakeException.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/HandshakeException.java index 5943e88345..f67d406df6 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/HandshakeException.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/HandshakeException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake; +package org.hyperledger.besu.ethereum.p2p.rlpx.handshake; /** Signals that an error occurred during the RLPx cryptographic handshake. */ public class HandshakeException extends RuntimeException { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/HandshakeSecrets.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/HandshakeSecrets.java similarity index 97% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/HandshakeSecrets.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/HandshakeSecrets.java index d05769db76..af712169eb 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/HandshakeSecrets.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/HandshakeSecrets.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake; +package org.hyperledger.besu.ethereum.p2p.rlpx.handshake; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; import java.util.Objects; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/Handshaker.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/Handshaker.java similarity index 97% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/Handshaker.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/Handshaker.java index dd94e1ab92..c329bcc898 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/Handshaker.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/Handshaker.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake; +package org.hyperledger.besu.ethereum.p2p.rlpx.handshake; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker; import java.util.Optional; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESEncryptionEngine.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESEncryptionEngine.java similarity index 98% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESEncryptionEngine.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESEncryptionEngine.java index ee7dee2556..9bff46fc19 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESEncryptionEngine.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESEncryptionEngine.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.util.bytes.BytesValue; import java.math.BigInteger; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshaker.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshaker.java similarity index 95% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshaker.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshaker.java index d1271c1c44..513d347915 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshaker.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshaker.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies; import static com.google.common.base.Preconditions.checkState; -import static tech.pegasys.pantheon.crypto.Hash.keccak256; -import static tech.pegasys.pantheon.util.bytes.Bytes32s.xor; -import static tech.pegasys.pantheon.util.bytes.BytesValues.concatenate; - -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.PublicKey; -import tech.pegasys.pantheon.crypto.SecureRandomProvider; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.HandshakeException; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.HandshakeSecrets; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.Handshaker; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import static org.hyperledger.besu.crypto.Hash.keccak256; +import static org.hyperledger.besu.util.bytes.Bytes32s.xor; +import static org.hyperledger.besu.util.bytes.BytesValues.concatenate; + +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.PublicKey; +import org.hyperledger.besu.crypto.SecureRandomProvider; +import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.HandshakeException; +import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.HandshakeSecrets; +import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.Handshaker; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.security.SecureRandom; import java.util.Optional; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessage.java similarity index 95% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessage.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessage.java index e6dcbdd46a..43a18792b6 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessage.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessage.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SecureRandomProvider; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SecureRandomProvider; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytesValue; import java.nio.ByteBuffer; import java.security.SecureRandom; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessage.java similarity index 78% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessage.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessage.java index 4f01e3fe18..cd54f30e48 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessage.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessage.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; public interface InitiatorHandshakeMessage { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV1.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV1.java similarity index 73% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV1.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV1.java index 0b5e6dffa3..ea53d8709a 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV1.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV1.java @@ -10,23 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies; import static com.google.common.base.Preconditions.checkState; -import static tech.pegasys.pantheon.crypto.SECP256K1.calculateKeyAgreement; -import static tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker.HASH_EPH_PUBKEY_LENGTH; -import static tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker.NONCE_LENGTH; -import static tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker.PUBKEY_LENGTH; -import static tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker.SIGNATURE_LENGTH; -import static tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker.TOKEN_FLAG_LENGTH; - -import tech.pegasys.pantheon.crypto.Hash; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.Bytes32s; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytes32; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; +import static org.hyperledger.besu.crypto.SECP256K1.calculateKeyAgreement; + +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.Bytes32s; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytes32; +import org.hyperledger.besu.util.bytes.MutableBytesValue; /** * The initiator's handshake message. @@ -53,7 +48,11 @@ import tech.pegasys.pantheon.util.bytes.MutableBytesValue; */ public final class InitiatorHandshakeMessageV1 implements InitiatorHandshakeMessage { public static final int MESSAGE_LENGTH = - SIGNATURE_LENGTH + HASH_EPH_PUBKEY_LENGTH + PUBKEY_LENGTH + NONCE_LENGTH + TOKEN_FLAG_LENGTH; + ECIESHandshaker.SIGNATURE_LENGTH + + ECIESHandshaker.HASH_EPH_PUBKEY_LENGTH + + ECIESHandshaker.PUBKEY_LENGTH + + ECIESHandshaker.NONCE_LENGTH + + ECIESHandshaker.TOKEN_FLAG_LENGTH; private final SECP256K1.PublicKey pubKey; private final SECP256K1.Signature signature; @@ -106,12 +105,19 @@ public final class InitiatorHandshakeMessageV1 implements InitiatorHandshakeMess int offset = 0; final SECP256K1.Signature signature = - SECP256K1.Signature.decode(bytes.slice(offset, SIGNATURE_LENGTH)); + SECP256K1.Signature.decode(bytes.slice(offset, ECIESHandshaker.SIGNATURE_LENGTH)); final Bytes32 ephPubKeyHash = - Bytes32.wrap(bytes.slice(offset += SIGNATURE_LENGTH, HASH_EPH_PUBKEY_LENGTH), 0); + Bytes32.wrap( + bytes.slice( + offset += ECIESHandshaker.SIGNATURE_LENGTH, ECIESHandshaker.HASH_EPH_PUBKEY_LENGTH), + 0); final SECP256K1.PublicKey pubKey = - SECP256K1.PublicKey.create(bytes.slice(offset += HASH_EPH_PUBKEY_LENGTH, PUBKEY_LENGTH)); - final Bytes32 nonce = Bytes32.wrap(bytes.slice(offset += PUBKEY_LENGTH, NONCE_LENGTH), 0); + SECP256K1.PublicKey.create( + bytes.slice( + offset += ECIESHandshaker.HASH_EPH_PUBKEY_LENGTH, ECIESHandshaker.PUBKEY_LENGTH)); + final Bytes32 nonce = + Bytes32.wrap( + bytes.slice(offset += ECIESHandshaker.PUBKEY_LENGTH, ECIESHandshaker.NONCE_LENGTH), 0); final boolean token = bytes.get(offset) == 0x01; final Bytes32 staticSharedSecret = calculateKeyAgreement(keyPair.getPrivateKey(), pubKey); @@ -128,9 +134,15 @@ public final class InitiatorHandshakeMessageV1 implements InitiatorHandshakeMess public BytesValue encode() { final MutableBytesValue bytes = MutableBytesValue.create(MESSAGE_LENGTH); signature.encodedBytes().copyTo(bytes, 0); - ephPubKeyHash.copyTo(bytes, SIGNATURE_LENGTH); - pubKey.getEncodedBytes().copyTo(bytes, SIGNATURE_LENGTH + HASH_EPH_PUBKEY_LENGTH); - nonce.copyTo(bytes, SIGNATURE_LENGTH + HASH_EPH_PUBKEY_LENGTH + PUBKEY_LENGTH); + ephPubKeyHash.copyTo(bytes, ECIESHandshaker.SIGNATURE_LENGTH); + pubKey + .getEncodedBytes() + .copyTo(bytes, ECIESHandshaker.SIGNATURE_LENGTH + ECIESHandshaker.HASH_EPH_PUBKEY_LENGTH); + nonce.copyTo( + bytes, + ECIESHandshaker.SIGNATURE_LENGTH + + ECIESHandshaker.HASH_EPH_PUBKEY_LENGTH + + ECIESHandshaker.PUBKEY_LENGTH); bytes.set(MESSAGE_LENGTH - 1, (byte) (token ? 0x01 : 0x00)); return bytes; } diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4.java similarity index 86% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4.java index addce49b0e..6f59e5b8bc 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies; -import tech.pegasys.pantheon.crypto.Hash; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.Bytes32s; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytes32; +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.Bytes32s; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytes32; public final class InitiatorHandshakeMessageV4 implements InitiatorHandshakeMessage { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessage.java similarity index 77% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessage.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessage.java index 1f54375770..3bcdfa27ba 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessage.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessage.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; public interface ResponderHandshakeMessage { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV1.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV1.java similarity index 73% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV1.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV1.java index 8cc8cffc11..960eeede09 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV1.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV1.java @@ -10,17 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies; import static com.google.common.base.Preconditions.checkArgument; -import static tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker.NONCE_LENGTH; -import static tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker.PUBKEY_LENGTH; -import static tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker.TOKEN_FLAG_LENGTH; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytesValue; /** * The responder's handshake message. @@ -44,7 +41,10 @@ import tech.pegasys.pantheon.util.bytes.MutableBytesValue; * responder response */ public final class ResponderHandshakeMessageV1 implements ResponderHandshakeMessage { - public static final int MESSAGE_LENGTH = PUBKEY_LENGTH + NONCE_LENGTH + TOKEN_FLAG_LENGTH; + public static final int MESSAGE_LENGTH = + ECIESHandshaker.PUBKEY_LENGTH + + ECIESHandshaker.NONCE_LENGTH + + ECIESHandshaker.TOKEN_FLAG_LENGTH; private final SECP256K1.PublicKey ephPublicKey; // 64 bytes - uncompressed and no type byte private final Bytes32 nonce; // 32 bytes @@ -65,10 +65,12 @@ public final class ResponderHandshakeMessageV1 implements ResponderHandshakeMess public static ResponderHandshakeMessageV1 decode(final BytesValue bytes) { checkArgument(bytes.size() == MESSAGE_LENGTH); - final BytesValue pubk = bytes.slice(0, PUBKEY_LENGTH); + final BytesValue pubk = bytes.slice(0, ECIESHandshaker.PUBKEY_LENGTH); final SECP256K1.PublicKey ephPubKey = SECP256K1.PublicKey.create(pubk); - final Bytes32 nonce = Bytes32.wrap(bytes.slice(PUBKEY_LENGTH, NONCE_LENGTH), 0); - final boolean token = bytes.get(PUBKEY_LENGTH + NONCE_LENGTH) == 0x01; + final Bytes32 nonce = + Bytes32.wrap(bytes.slice(ECIESHandshaker.PUBKEY_LENGTH, ECIESHandshaker.NONCE_LENGTH), 0); + final boolean token = + bytes.get(ECIESHandshaker.PUBKEY_LENGTH + ECIESHandshaker.NONCE_LENGTH) == 0x01; return new ResponderHandshakeMessageV1(ephPubKey, nonce, token); } @@ -76,8 +78,9 @@ public final class ResponderHandshakeMessageV1 implements ResponderHandshakeMess public BytesValue encode() { final MutableBytesValue bytes = MutableBytesValue.create(MESSAGE_LENGTH); ephPublicKey.getEncodedBytes().copyTo(bytes, 0); - nonce.copyTo(bytes, PUBKEY_LENGTH); - BytesValue.of((byte) (token ? 0x01 : 0x00)).copyTo(bytes, PUBKEY_LENGTH + NONCE_LENGTH); + nonce.copyTo(bytes, ECIESHandshaker.PUBKEY_LENGTH); + BytesValue.of((byte) (token ? 0x01 : 0x00)) + .copyTo(bytes, ECIESHandshaker.PUBKEY_LENGTH + ECIESHandshaker.NONCE_LENGTH); return bytes; } diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV4.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV4.java similarity index 82% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV4.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV4.java index 56b5171431..6e3414f400 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV4.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV4.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; public class ResponderHandshakeMessageV4 implements ResponderHandshakeMessage { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/AbstractMessageData.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/AbstractMessageData.java similarity index 92% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/AbstractMessageData.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/AbstractMessageData.java index 17477827fc..6706530d4e 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/AbstractMessageData.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/AbstractMessageData.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Objects; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/Capability.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/Capability.java similarity index 88% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/Capability.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/Capability.java index 6ff0f78e87..2438f7e980 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/Capability.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/Capability.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire; -import static tech.pegasys.pantheon.util.bytes.BytesValue.wrap; +import static org.hyperledger.besu.util.bytes.BytesValue.wrap; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.BytesValues; import java.nio.charset.StandardCharsets; import java.util.Objects; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/CapabilityMultiplexer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/CapabilityMultiplexer.java similarity index 98% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/CapabilityMultiplexer.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/CapabilityMultiplexer.java index 174ed87265..b7f91d3b53 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/CapabilityMultiplexer.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/CapabilityMultiplexer.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire; import static java.util.Comparator.comparing; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Comparator; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/DefaultMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/DefaultMessage.java similarity index 89% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/DefaultMessage.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/DefaultMessage.java index ef8b401032..0d828caff4 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/DefaultMessage.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/DefaultMessage.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; /** * Simple implementation of {@link Message} that associates a {@link MessageData} instance with a diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/Message.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/Message.java similarity index 88% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/Message.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/Message.java index a4c05e4765..de8af4d562 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/Message.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/Message.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; /** A P2P network message received from another peer. */ public interface Message { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/MessageData.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/MessageData.java similarity index 90% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/MessageData.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/MessageData.java index 2fe61894b1..2b5e3283cc 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/MessageData.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/MessageData.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; /** A P2P Network Message's Data. */ public interface MessageData { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/PeerInfo.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/PeerInfo.java similarity index 89% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/PeerInfo.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/PeerInfo.java index 98fc06b43c..b8d9f20047 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/PeerInfo.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/PeerInfo.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire; -import static tech.pegasys.pantheon.util.bytes.BytesValue.wrap; +import static org.hyperledger.besu.util.bytes.BytesValue.wrap; -import tech.pegasys.pantheon.crypto.SECP256K1.PublicKey; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Util; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.crypto.SECP256K1.PublicKey; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Util; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.nio.charset.StandardCharsets; import java.util.Collections; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/RawMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/RawMessage.java similarity index 89% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/RawMessage.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/RawMessage.java index 52158d7ecd..660f34826b 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/RawMessage.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/RawMessage.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; public final class RawMessage extends AbstractMessageData { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/SubProtocol.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/SubProtocol.java similarity index 97% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/SubProtocol.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/SubProtocol.java index 5e9a892a7d..2f72291401 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/SubProtocol.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/SubProtocol.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire; public interface SubProtocol { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/DisconnectMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/DisconnectMessage.java similarity index 90% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/DisconnectMessage.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/DisconnectMessage.java index ea3f340451..9544c713c0 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/DisconnectMessage.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/DisconnectMessage.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages; - -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.AbstractMessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages; + +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; import java.util.stream.Stream; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/EmptyMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/EmptyMessage.java similarity index 81% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/EmptyMessage.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/EmptyMessage.java index 9a4e068c2f..49c49a122c 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/EmptyMessage.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/EmptyMessage.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.util.bytes.BytesValue; /** A message without a body. */ abstract class EmptyMessage implements MessageData { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/HelloMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/HelloMessage.java similarity index 79% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/HelloMessage.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/HelloMessage.java index fd82197825..d6bee61c90 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/HelloMessage.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/HelloMessage.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages; - -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.AbstractMessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages; + +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.BytesValue; public final class HelloMessage extends AbstractMessageData { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/PingMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/PingMessage.java similarity index 93% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/PingMessage.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/PingMessage.java index 9855e6f8c0..7662eeda26 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/PingMessage.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/PingMessage.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages; public final class PingMessage extends EmptyMessage { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/PongMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/PongMessage.java similarity index 93% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/PongMessage.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/PongMessage.java index 8544f9bb0b..47e11b879a 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/PongMessage.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/PongMessage.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages; public final class PongMessage extends EmptyMessage { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/WireMessageCodes.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/WireMessageCodes.java similarity index 94% rename from ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/WireMessageCodes.java rename to ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/WireMessageCodes.java index 97a719b43f..f354be0257 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/WireMessageCodes.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/WireMessageCodes.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages; public final class WireMessageCodes { public static final int HELLO = 0x00; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/NetworkingTestHelper.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/NetworkingTestHelper.java similarity index 77% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/NetworkingTestHelper.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/NetworkingTestHelper.java index 7bf06bd9a5..0e9c4ac488 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/NetworkingTestHelper.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/NetworkingTestHelper.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p; +package org.hyperledger.besu.ethereum.p2p; -import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.config.RlpxConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration; public class NetworkingTestHelper { diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/config/DiscoveryConfigurationTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/config/DiscoveryConfigurationTest.java similarity index 92% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/config/DiscoveryConfigurationTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/config/DiscoveryConfigurationTest.java index 398b79f59e..4d73eedf2b 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/config/DiscoveryConfigurationTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/config/DiscoveryConfigurationTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.config; +package org.hyperledger.besu.ethereum.p2p.config; import static org.assertj.core.api.Java6Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; import java.util.Collections; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/config/RlpxConfigurationTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/config/RlpxConfigurationTest.java similarity index 97% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/config/RlpxConfigurationTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/config/RlpxConfigurationTest.java index 58348ed59e..a366eccd7e 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/config/RlpxConfigurationTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/config/RlpxConfigurationTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.config; +package org.hyperledger.besu.ethereum.p2p.config; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryAgentTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgentTest.java similarity index 95% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryAgentTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgentTest.java index f3f9a8de68..3056505f8b 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryAgentTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgentTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; +package org.hyperledger.besu.ethereum.p2p.discovery; import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; @@ -20,18 +20,18 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper.AgentBuilder; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.FindNeighborsPacketData; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent.IncomingPacket; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.NeighborsPacketData; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.Packet; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PacketType; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions.Action; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissionsBlacklist; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryTestHelper.AgentBuilder; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.FindNeighborsPacketData; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent.IncomingPacket; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.NeighborsPacketData; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.Packet; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PacketType; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions.Action; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsBlacklist; import java.util.Collections; import java.util.List; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryBondingTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryBondingTest.java similarity index 87% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryBondingTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryBondingTest.java index 6e458c0261..cfa310f6b6 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryBondingTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryBondingTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; +package org.hyperledger.besu.ethereum.p2p.discovery; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.FindNeighborsPacketData; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent.IncomingPacket; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.Packet; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PacketType; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PongPacketData; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.FindNeighborsPacketData; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent.IncomingPacket; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.Packet; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PacketType; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PongPacketData; import java.util.Collections; import java.util.List; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryBootstrappingTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryBootstrappingTest.java similarity index 90% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryBootstrappingTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryBootstrappingTest.java index a549991434..1ce8065b62 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryBootstrappingTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryBootstrappingTest.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; +package org.hyperledger.besu.ethereum.p2p.discovery; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent.IncomingPacket; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.Packet; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PacketType; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PingPacketData; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent.IncomingPacket; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.Packet; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PacketType; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PingPacketData; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryObserversTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryObserversTest.java similarity index 94% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryObserversTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryObserversTest.java index cb084aefed..c410674e95 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryObserversTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryObserversTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; +package org.hyperledger.besu.ethereum.p2p.discovery; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Collection; @@ -28,6 +28,7 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.assertj.core.api.Assertions; import org.junit.Test; public class PeerDiscoveryObserversTest { @@ -120,7 +121,7 @@ public class PeerDiscoveryObserversTest { .collect(Collectors.toList()); assertThat(discoveredPeers.size()).isEqualTo(allPeers.size()); - assertThat(discoveredPeers) + Assertions.assertThat(discoveredPeers) .extracting(DiscoveryPeer::getId) .containsExactlyInAnyOrderElementsOf( allPeers.stream().map(DiscoveryPeer::getId).collect(Collectors.toList())); diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java similarity index 90% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java index b97da0be00..07d7048293 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; +package org.hyperledger.besu.ethereum.p2p.discovery; import static com.google.common.net.InetAddresses.isInetAddress; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.FindNeighborsPacketData; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.NeighborsPacketData; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.Packet; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PingPacketData; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PongPacketData; -import tech.pegasys.pantheon.util.NetworkUtility; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.FindNeighborsPacketData; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.NeighborsPacketData; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.Packet; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PingPacketData; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PongPacketData; +import org.hyperledger.besu.util.NetworkUtility; import java.io.IOException; import java.time.Instant; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketSedesTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketSedesTest.java similarity index 87% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketSedesTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketSedesTest.java index e3a9f1e298..35f18c03da 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketSedesTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketSedesTest.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; +package org.hyperledger.besu.ethereum.p2p.discovery; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.data.Offset.offset; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.FindNeighborsPacketData; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.NeighborsPacketData; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.Packet; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PacketData; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PacketType; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.FindNeighborsPacketData; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.NeighborsPacketData; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.Packet; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PacketData; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PacketType; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytesValue; import java.util.List; import java.util.Random; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryTestHelper.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryTestHelper.java similarity index 90% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryTestHelper.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryTestHelper.java index 7840ef1942..a345f95d5b 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryTestHelper.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryTestHelper.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; +package org.hyperledger.besu.ethereum.p2p.discovery; import static java.util.Arrays.asList; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.Packet; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PacketType; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PingPacketData; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.Packet; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PacketType; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PingPacketData; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; import java.util.Collections; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryTimestampsTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryTimestampsTest.java similarity index 84% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryTimestampsTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryTimestampsTest.java index 4206fb9635..128365374d 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryTimestampsTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryTimestampsTest.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery; +package org.hyperledger.besu.ethereum.p2p.discovery; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.BlockingAsyncExecutor; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.MockTimerUtil; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.Packet; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PacketType; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerDiscoveryController; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerTable; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PingPacketData; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.BlockingAsyncExecutor; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.MockTimerUtil; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.Packet; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PacketType; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerDiscoveryController; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerTable; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PingPacketData; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.util.Subscribers; import java.util.Collections; import java.util.List; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/BlockingAsyncExecutor.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/BlockingAsyncExecutor.java similarity index 84% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/BlockingAsyncExecutor.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/BlockingAsyncExecutor.java index 9b77590aef..93e78661e9 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/BlockingAsyncExecutor.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/BlockingAsyncExecutor.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerDiscoveryController.AsyncExecutor; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerDiscoveryController.AsyncExecutor; import java.util.concurrent.CompletableFuture; import java.util.function.Supplier; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/BucketTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/BucketTest.java similarity index 96% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/BucketTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/BucketTest.java index 58fe9edfd3..0efc24fc98 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/BucketTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/BucketTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static junit.framework.TestCase.assertFalse; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryTestHelper; import java.util.List; import java.util.Optional; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/FindNeighborsPacketDataTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/FindNeighborsPacketDataTest.java similarity index 89% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/FindNeighborsPacketDataTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/FindNeighborsPacketDataTest.java index 9d58ca24df..d9a22204f2 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/FindNeighborsPacketDataTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/FindNeighborsPacketDataTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/MockPacketDataFactory.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockPacketDataFactory.java similarity index 90% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/MockPacketDataFactory.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockPacketDataFactory.java index 230b9ff88c..7bb16f9d78 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/MockPacketDataFactory.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockPacketDataFactory.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; import java.util.Optional; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/MockPeerDiscoveryAgent.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockPeerDiscoveryAgent.java similarity index 85% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/MockPeerDiscoveryAgent.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockPeerDiscoveryAgent.java index 09f9be1312..39ed9228e3 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/MockPeerDiscoveryAgent.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockPeerDiscoveryAgent.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryAgent; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerDiscoveryController.AsyncExecutor; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryAgent; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerDiscoveryController.AsyncExecutor; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.util.bytes.BytesValue; import java.net.InetSocketAddress; import java.util.ArrayDeque; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/MockTimerUtil.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockTimerUtil.java similarity index 97% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/MockTimerUtil.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockTimerUtil.java index 6f2ce1ec66..7e478543e8 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/MockTimerUtil.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockTimerUtil.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import java.util.ArrayList; import java.util.HashMap; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/NeighborsPacketDataTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/NeighborsPacketDataTest.java similarity index 87% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/NeighborsPacketDataTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/NeighborsPacketDataTest.java index 996055131b..71335b19a8 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/NeighborsPacketDataTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/NeighborsPacketDataTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.p2p.peers.PeerTestHelper.enode; +import static org.hyperledger.besu.ethereum.p2p.peers.PeerTestHelper.enode; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; import java.util.List; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketTest.java similarity index 93% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketTest.java index 830182c419..b5f5198b8c 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.p2p.discovery.Endpoint; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.discovery.Endpoint; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.OptionalInt; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketTypeTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketTypeTest.java similarity index 95% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketTypeTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketTypeTest.java index 907476f049..f12704feab 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketTypeTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketTypeTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryControllerDistanceCalculatorTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryControllerDistanceCalculatorTest.java similarity index 92% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryControllerDistanceCalculatorTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryControllerDistanceCalculatorTest.java index 5ace8b4245..fd8a5b71dd 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryControllerDistanceCalculatorTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryControllerDistanceCalculatorTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerDistanceCalculator.distance; +import static org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerDistanceCalculator.distance; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Random; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryControllerTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryControllerTest.java similarity index 97% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryControllerTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryControllerTest.java index 59e0653699..26b481f269 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryControllerTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryControllerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static com.google.common.base.Preconditions.checkNotNull; import static org.assertj.core.api.Assertions.assertThat; @@ -28,25 +28,25 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.discovery.Endpoint; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerBondedObserver; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryStatus; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions.Action; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissionsBlacklist; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.util.Subscribers; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; -import tech.pegasys.pantheon.util.uint.UInt256Value; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.discovery.Endpoint; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerBondedObserver; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryStatus; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryTestHelper; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions.Action; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsBlacklist; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.util.Subscribers; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytesValue; +import org.hyperledger.besu.util.uint.UInt256; +import org.hyperledger.besu.util.uint.UInt256Value; import java.util.ArrayList; import java.util.Arrays; @@ -59,6 +59,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.stream.Collectors; +import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -405,7 +406,7 @@ public class PeerDiscoveryControllerTest { final Packet nieghborsPacket = neighborsPackets.get(0); final Optional maybeData = nieghborsPacket.getPacketData(FindNeighborsPacketData.class); - assertThat(maybeData).isPresent(); + Assertions.assertThat(maybeData).isPresent(); final FindNeighborsPacketData data = maybeData.get(); assertThat(data.getTarget()).isEqualTo(localPeer.getId()); diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryTableRefreshTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryTableRefreshTest.java similarity index 87% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryTableRefreshTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryTableRefreshTest.java index 7a9d7f79e4..3b87a28efa 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryTableRefreshTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryTableRefreshTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; @@ -19,14 +19,14 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryStatus; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.util.Subscribers; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryStatus; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryTestHelper; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.util.Subscribers; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.HashSet; @@ -34,6 +34,7 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -101,7 +102,7 @@ public class PeerDiscoveryTableRefreshTest { for (final Packet captured : capturedFindNeighborsPackets) { final Optional maybeData = captured.getPacketData(FindNeighborsPacketData.class); - assertThat(maybeData).isPresent(); + Assertions.assertThat(maybeData).isPresent(); final FindNeighborsPacketData neighborsData = maybeData.get(); targets.add(neighborsData.getTarget()); } diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerRequirementCombineTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerRequirementCombineTest.java similarity index 98% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerRequirementCombineTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerRequirementCombineTest.java index 55f6d3afde..b38776eddb 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerRequirementCombineTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerRequirementCombineTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerTableTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerTableTest.java similarity index 86% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerTableTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerTableTest.java index b2986f479d..2e040de47f 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerTableTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerTableTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerTable.AddResult.AddOutcome; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerTable.EvictResult; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerTable.EvictResult.EvictOutcome; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryTestHelper; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerTable.AddResult.AddOutcome; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerTable.EvictResult; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerTable.EvictResult.EvictOutcome; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; import java.util.List; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PingPacketDataTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketDataTest.java similarity index 93% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PingPacketDataTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketDataTest.java index 4672717b07..03c5f0d19b 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PingPacketDataTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketDataTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.p2p.discovery.Endpoint; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.discovery.Endpoint; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.OptionalInt; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PongPacketDataTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PongPacketDataTest.java similarity index 89% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PongPacketDataTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PongPacketDataTest.java index 172db39c6b..73ade61513 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PongPacketDataTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PongPacketDataTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.p2p.discovery.Endpoint; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.discovery.Endpoint; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.OptionalInt; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/RecursivePeerRefreshStateTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RecursivePeerRefreshStateTest.java similarity index 97% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/RecursivePeerRefreshStateTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RecursivePeerRefreshStateTest.java index 7c09a6e6cc..30b2e38608 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/RecursivePeerRefreshStateTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RecursivePeerRefreshStateTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; +package org.hyperledger.besu.ethereum.p2p.discovery.internal; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; @@ -23,12 +23,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryStatus; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.RecursivePeerRefreshState.BondingAgent; -import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.RecursivePeerRefreshState.FindNeighbourDispatcher; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryStatus; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.RecursivePeerRefreshState.BondingAgent; +import org.hyperledger.besu.ethereum.p2p.discovery.internal.RecursivePeerRefreshState.FindNeighbourDispatcher; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collections; import java.util.List; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/network/DefaultP2PNetworkTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetworkTest.java similarity index 77% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/network/DefaultP2PNetworkTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetworkTest.java index d4ccace260..3066d50554 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/network/DefaultP2PNetworkTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetworkTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.network; +package org.hyperledger.besu.ethereum.p2p.network; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -20,30 +20,29 @@ import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.p2p.peers.PeerTestHelper.createPeer; -import static tech.pegasys.pantheon.ethereum.p2p.peers.PeerTestHelper.enode; - -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.config.RlpxConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.discovery.Endpoint; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerBondedObserver; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryAgent; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryStatus; -import tech.pegasys.pantheon.ethereum.p2p.peers.MaintainedPeers; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.RlpxAgent; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.MockPeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MockSubProtocol; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.nat.upnp.UpnpNatManager; -import tech.pegasys.pantheon.nat.upnp.UpnpNatManager.Protocol; + +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.discovery.Endpoint; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerBondedObserver; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryAgent; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryEvent; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryStatus; +import org.hyperledger.besu.ethereum.p2p.peers.MaintainedPeers; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.peers.PeerTestHelper; +import org.hyperledger.besu.ethereum.p2p.rlpx.RlpxAgent; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.MockPeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MockSubProtocol; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.nat.upnp.UpnpNatManager; +import org.hyperledger.besu.nat.upnp.UpnpNatManager.Protocol; import java.util.ArrayList; import java.util.List; @@ -53,6 +52,7 @@ import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -99,7 +99,7 @@ public final class DefaultP2PNetworkTest { public void addMaintainConnectionPeer_newPeer() { final DefaultP2PNetwork network = network(); network.start(); - final Peer peer = createPeer(); + final Peer peer = PeerTestHelper.createPeer(); assertThat(network.addMaintainConnectionPeer(peer)).isTrue(); @@ -111,7 +111,7 @@ public final class DefaultP2PNetworkTest { public void addMaintainConnectionPeer_existingPeer() { final DefaultP2PNetwork network = network(); network.start(); - final Peer peer = createPeer(); + final Peer peer = PeerTestHelper.createPeer(); assertThat(network.addMaintainConnectionPeer(peer)).isTrue(); assertThat(network.addMaintainConnectionPeer(peer)).isFalse(); @@ -123,7 +123,7 @@ public final class DefaultP2PNetworkTest { public void removeMaintainedConnectionPeer_alreadyMaintainedPeer() { final DefaultP2PNetwork network = network(); network.start(); - final Peer peer = createPeer(); + final Peer peer = PeerTestHelper.createPeer(); assertThat(network.addMaintainConnectionPeer(peer)).isTrue(); assertThat(network.removeMaintainedConnectionPeer(peer)).isTrue(); @@ -138,7 +138,7 @@ public final class DefaultP2PNetworkTest { public void removeMaintainedConnectionPeer_nonMaintainedPeer() { final DefaultP2PNetwork network = network(); network.start(); - final Peer peer = createPeer(); + final Peer peer = PeerTestHelper.createPeer(); assertThat(network.removeMaintainedConnectionPeer(peer)).isFalse(); @@ -150,7 +150,7 @@ public final class DefaultP2PNetworkTest { @Test public void checkMaintainedConnectionPeers_unconnectedPeer() { final DefaultP2PNetwork network = network(); - final Peer peer = createPeer(); + final Peer peer = PeerTestHelper.createPeer(); maintainedPeers.add(peer); network.start(); @@ -164,7 +164,7 @@ public final class DefaultP2PNetworkTest { @Test public void checkMaintainedConnectionPeers_connectedPeer() { final DefaultP2PNetwork network = network(); - final Peer peer = createPeer(); + final Peer peer = PeerTestHelper.createPeer(); maintainedPeers.add(peer); network.start(); @@ -180,7 +180,7 @@ public final class DefaultP2PNetworkTest { @Test public void checkMaintainedConnectionPeers_connectingPeer() { final DefaultP2PNetwork network = network(); - final Peer peer = createPeer(); + final Peer peer = PeerTestHelper.createPeer(); maintainedPeers.add(peer); network.start(); @@ -196,7 +196,7 @@ public final class DefaultP2PNetworkTest { public void beforeStartingNetworkEnodeURLShouldNotBePresent() { final P2PNetwork network = network(); - assertThat(network.getLocalEnode()).isNotPresent(); + Assertions.assertThat(network.getLocalEnode()).isNotPresent(); } @Test @@ -204,7 +204,7 @@ public final class DefaultP2PNetworkTest { final P2PNetwork network = network(); network.start(); - assertThat(network.getLocalEnode()).isPresent(); + Assertions.assertThat(network.getLocalEnode()).isPresent(); } @Test @@ -223,15 +223,16 @@ public final class DefaultP2PNetworkTest { verify(natManager) .requestPortForward(eq(config.getDiscovery().getBindPort()), eq(Protocol.UDP), any()); - assertThat(network.getLocalEnode().get().getIpAsString()).isEqualTo(externalIp); + Assertions.assertThat(network.getLocalEnode().get().getIpAsString()).isEqualTo(externalIp); } @Test public void handlePeerBondedEvent_forListeningPeer() { final DefaultP2PNetwork network = network(); network.start(); - final DiscoveryPeer peer = DiscoveryPeer.fromEnode(enode()); - final PeerBondedEvent peerBondedEvent = new PeerBondedEvent(peer, System.currentTimeMillis()); + final DiscoveryPeer peer = DiscoveryPeer.fromEnode(PeerTestHelper.enode()); + final PeerDiscoveryEvent.PeerBondedEvent peerBondedEvent = + new PeerDiscoveryEvent.PeerBondedEvent(peer, System.currentTimeMillis()); discoverySubscriberCaptor.getValue().onPeerBonded(peerBondedEvent); verify(rlpxAgent, times(1)).connect(peer); @@ -244,7 +245,8 @@ public final class DefaultP2PNetworkTest { final DiscoveryPeer peer = DiscoveryPeer.fromIdAndEndpoint( Peer.randomId(), new Endpoint("127.0.0.1", 999, OptionalInt.empty())); - final PeerBondedEvent peerBondedEvent = new PeerBondedEvent(peer, System.currentTimeMillis()); + final PeerDiscoveryEvent.PeerBondedEvent peerBondedEvent = + new PeerDiscoveryEvent.PeerBondedEvent(peer, System.currentTimeMillis()); discoverySubscriberCaptor.getValue().onPeerBonded(peerBondedEvent); verify(rlpxAgent, times(1)).connect(peer); @@ -252,7 +254,7 @@ public final class DefaultP2PNetworkTest { @Test public void attemptPeerConnections_bondedPeers() { - final DiscoveryPeer discoPeer = DiscoveryPeer.fromEnode(enode()); + final DiscoveryPeer discoPeer = DiscoveryPeer.fromEnode(PeerTestHelper.enode()); discoPeer.setStatus(PeerDiscoveryStatus.BONDED); final Stream peerStream = Stream.of(discoPeer); when(discoveryAgent.streamDiscoveredPeers()).thenReturn(peerStream); @@ -268,7 +270,7 @@ public final class DefaultP2PNetworkTest { @Test public void attemptPeerConnections_unbondedPeers() { - final DiscoveryPeer discoPeer = DiscoveryPeer.fromEnode(enode()); + final DiscoveryPeer discoPeer = DiscoveryPeer.fromEnode(PeerTestHelper.enode()); discoPeer.setStatus(PeerDiscoveryStatus.KNOWN); final Stream peerStream = Stream.of(discoPeer); when(discoveryAgent.streamDiscoveredPeers()).thenReturn(peerStream); @@ -285,9 +287,9 @@ public final class DefaultP2PNetworkTest { @Test public void attemptPeerConnections_sortsPeersByLastContacted() { final List discoPeers = new ArrayList<>(); - discoPeers.add(DiscoveryPeer.fromEnode(enode())); - discoPeers.add(DiscoveryPeer.fromEnode(enode())); - discoPeers.add(DiscoveryPeer.fromEnode(enode())); + discoPeers.add(DiscoveryPeer.fromEnode(PeerTestHelper.enode())); + discoPeers.add(DiscoveryPeer.fromEnode(PeerTestHelper.enode())); + discoPeers.add(DiscoveryPeer.fromEnode(PeerTestHelper.enode())); discoPeers.forEach(p -> p.setStatus(PeerDiscoveryStatus.BONDED)); discoPeers.get(0).setLastAttemptedConnection(10); discoPeers.get(2).setLastAttemptedConnection(15); diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/network/NetworkingServiceLifecycleTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/NetworkingServiceLifecycleTest.java similarity index 88% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/network/NetworkingServiceLifecycleTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/NetworkingServiceLifecycleTest.java index afb5c4f5b4..bd730a1647 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/network/NetworkingServiceLifecycleTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/NetworkingServiceLifecycleTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.network; +package org.hyperledger.besu.ethereum.p2p.network; import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.ethereum.p2p.NetworkingTestHelper.configWithRandomPorts; +import static org.hyperledger.besu.ethereum.p2p.NetworkingTestHelper.configWithRandomPorts; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryServiceException; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryServiceException; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.io.IOException; import java.util.Arrays; @@ -130,7 +130,7 @@ public class NetworkingServiceLifecycleTest { assertThat(e).hasCauseExactlyInstanceOf(PeerDiscoveryServiceException.class); assertThat(e) .hasMessageStartingWith( - "tech.pegasys.pantheon.ethereum.p2p.discovery." + "org.hyperledger.besu.ethereum.p2p.discovery." + "PeerDiscoveryServiceException: Failed to bind Ethereum UDP discovery listener to 0.0.0.0:"); assertThat(e).hasMessageContaining("Address already in use"); } finally { diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/network/P2PNetworkTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/P2PNetworkTest.java similarity index 85% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/network/P2PNetworkTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/P2PNetworkTest.java index 6af15bc806..a5aa5e82e4 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/network/P2PNetworkTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/P2PNetworkTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.network; +package org.hyperledger.besu.ethereum.p2p.network; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -19,24 +19,23 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.config.RlpxConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.IncompatiblePeerException; -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions.Action; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissionsBlacklist; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.SubProtocol; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; +import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.IncompatiblePeerException; +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsBlacklist; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.util.bytes.BytesValue; import java.net.InetAddress; import java.util.Arrays; @@ -44,6 +43,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import io.vertx.core.Vertx; +import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; @@ -74,7 +74,7 @@ public class P2PNetworkTest { final BytesValue listenId = listenerEnode.getNodeId(); final int listenPort = listenerEnode.getListeningPort().getAsInt(); - assertThat( + Assertions.assertThat( connector .connect(createPeer(listenId, listenPort)) .get(30L, TimeUnit.SECONDS) @@ -103,7 +103,7 @@ public class P2PNetworkTest { final PeerConnection firstConnection = firstFuture.get(30L, TimeUnit.SECONDS); final PeerConnection secondConnection = secondFuture.get(30L, TimeUnit.SECONDS); - assertThat(firstConnection.getPeerInfo().getNodeId()).isEqualTo(listenId); + Assertions.assertThat(firstConnection.getPeerInfo().getNodeId()).isEqualTo(listenId); // Connections should reference the same instance - i.e. we shouldn't create 2 distinct // connections @@ -141,7 +141,7 @@ public class P2PNetworkTest { final int listenPort = listenerEnode.getListeningPort().getAsInt(); final Peer listeningPeer = createPeer(listenId, listenPort); - assertThat( + Assertions.assertThat( connector1 .connect(listeningPeer) .get(30L, TimeUnit.SECONDS) @@ -158,14 +158,14 @@ public class P2PNetworkTest { reasonFuture.complete(reason); }); connector2.start(); - assertThat( + Assertions.assertThat( connector2 .connect(listeningPeer) .get(30L, TimeUnit.SECONDS) .getPeerInfo() .getNodeId()) .isEqualTo(listenId); - assertThat(peerFuture.get(30L, TimeUnit.SECONDS).getPeerInfo().getNodeId()) + Assertions.assertThat(peerFuture.get(30L, TimeUnit.SECONDS).getPeerInfo().getNodeId()) .isEqualTo(listenId); assertThat(reasonFuture.get(30L, TimeUnit.SECONDS)) .isEqualByComparingTo(DisconnectReason.TOO_MANY_PEERS); @@ -233,9 +233,10 @@ public class P2PNetworkTest { final CompletableFuture connectFuture = remoteNetwork.connect(localPeer); // Check connection is made, and then a disconnect is registered at remote - assertThat(connectFuture.get(5L, TimeUnit.SECONDS).getPeerInfo().getNodeId()) + Assertions.assertThat(connectFuture.get(5L, TimeUnit.SECONDS).getPeerInfo().getNodeId()) + .isEqualTo(localId); + Assertions.assertThat(peerFuture.get(5L, TimeUnit.SECONDS).getPeerInfo().getNodeId()) .isEqualTo(localId); - assertThat(peerFuture.get(5L, TimeUnit.SECONDS).getPeerInfo().getNodeId()).isEqualTo(localId); assertThat(reasonFuture.get(5L, TimeUnit.SECONDS)) .isEqualByComparingTo(DisconnectReason.UNKNOWN); } @@ -258,7 +259,9 @@ public class P2PNetworkTest { // Deny incoming connection permissions for remotePeer when(peerPermissions.isPermitted( - eq(localPeer), eq(remotePeer), eq(Action.RLPX_ALLOW_NEW_INBOUND_CONNECTION))) + eq(localPeer), + eq(remotePeer), + eq(PeerPermissions.Action.RLPX_ALLOW_NEW_INBOUND_CONNECTION))) .thenReturn(false); // Setup disconnect listener @@ -275,9 +278,10 @@ public class P2PNetworkTest { // Check connection is made, and then a disconnect is registered at remote final BytesValue localId = localEnode.getNodeId(); - assertThat(connectFuture.get(5L, TimeUnit.SECONDS).getPeerInfo().getNodeId()) + Assertions.assertThat(connectFuture.get(5L, TimeUnit.SECONDS).getPeerInfo().getNodeId()) + .isEqualTo(localId); + Assertions.assertThat(peerFuture.get(5L, TimeUnit.SECONDS).getPeerInfo().getNodeId()) .isEqualTo(localId); - assertThat(peerFuture.get(5L, TimeUnit.SECONDS).getPeerInfo().getNodeId()).isEqualTo(localId); assertThat(reasonFuture.get(5L, TimeUnit.SECONDS)) .isEqualByComparingTo(DisconnectReason.UNKNOWN); } diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/network/PeerReputationManagerTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/PeerReputationManagerTest.java similarity index 83% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/network/PeerReputationManagerTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/PeerReputationManagerTest.java index c56f41f7d1..b9e3633d4d 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/network/PeerReputationManagerTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/PeerReputationManagerTest.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.network; +package org.hyperledger.besu.ethereum.p2p.network; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions.Action; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissionsBlacklist; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsBlacklist; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; @@ -91,7 +91,7 @@ public class PeerReputationManagerTest { final PeerPermissionsBlacklist blacklist, final Peer remotePeer, final boolean expectedResult) { - for (Action action : Action.values()) { + for (PeerPermissions.Action action : PeerPermissions.Action.values()) { assertThat(blacklist.isPermitted(localNode, remotePeer, action)).isEqualTo(expectedResult); } } diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultLocalNodeTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultLocalNodeTest.java similarity index 74% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultLocalNodeTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultLocalNodeTest.java index 7694662899..d141535004 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultLocalNodeTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultLocalNodeTest.java @@ -10,20 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Java6Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.ethereum.p2p.peers.LocalNode.NodeNotReadyException; -import tech.pegasys.pantheon.ethereum.p2p.peers.MutableLocalNode.NodeAlreadySetException; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; import java.util.List; +import org.assertj.core.api.Assertions; import org.junit.Test; public class DefaultLocalNodeTest { @@ -47,8 +46,8 @@ public class DefaultLocalNodeTest { public void create() { final LocalNode localNode = createLocalNode(); assertThat(localNode.isReady()).isFalse(); - assertThatThrownBy(localNode::getPeerInfo).isInstanceOf(NodeNotReadyException.class); - assertThatThrownBy(localNode::getPeer).isInstanceOf(NodeNotReadyException.class); + assertThatThrownBy(localNode::getPeerInfo).isInstanceOf(LocalNode.NodeNotReadyException.class); + assertThatThrownBy(localNode::getPeer).isInstanceOf(LocalNode.NodeNotReadyException.class); } @Test @@ -60,7 +59,8 @@ public class DefaultLocalNodeTest { validateReadyNode(localNode); // Verify we can't set the enode a second time - assertThatThrownBy(() -> localNode.setEnode(enode)).isInstanceOf(NodeAlreadySetException.class); + assertThatThrownBy(() -> localNode.setEnode(enode)) + .isInstanceOf(MutableLocalNode.NodeAlreadySetException.class); } private MutableLocalNode createLocalNode() { @@ -68,7 +68,7 @@ public class DefaultLocalNodeTest { } private void validateReadyNode(final LocalNode localNode) { - assertThat(localNode.getPeerInfo()).isEqualTo(peerInfo); + Assertions.assertThat(localNode.getPeerInfo()).isEqualTo(peerInfo); assertThat(localNode.getPeer()).isEqualTo(peer); } } diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/EnodeURLTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLTest.java similarity index 99% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/EnodeURLTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLTest.java index 14dc256c84..6c6c224c5b 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/EnodeURLTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.catchThrowable; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.net.URI; import java.util.OptionalInt; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/MaintainedPeersTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/MaintainedPeersTest.java similarity index 97% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/MaintainedPeersTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/MaintainedPeersTest.java index 60052b0ef6..417c08d9f6 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/MaintainedPeersTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/MaintainedPeersTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static tech.pegasys.pantheon.ethereum.p2p.peers.PeerTestHelper.enodeBuilder; +import static org.hyperledger.besu.ethereum.p2p.peers.PeerTestHelper.enodeBuilder; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTest.java similarity index 94% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTest.java index 7a4d0cb10d..36e03849d7 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static tech.pegasys.pantheon.util.bytes.BytesValue.fromHexString; +import static org.hyperledger.besu.util.bytes.BytesValue.fromHexString; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryStatus; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryStatus; +import org.hyperledger.besu.util.bytes.BytesValue; import com.google.common.net.InetAddresses; import org.junit.Test; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerTestHelper.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTestHelper.java similarity index 90% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerTestHelper.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTestHelper.java index a11b8a0933..888d5add8d 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerTestHelper.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTestHelper.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/StaticNodesParserTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/StaticNodesParserTest.java similarity index 99% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/StaticNodesParserTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/StaticNodesParserTest.java index ba61b9cc64..d7c5bccde8 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/StaticNodesParserTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/StaticNodesParserTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.peers; +package org.hyperledger.besu.ethereum.p2p.peers; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PeerPermissionsBlacklistTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsBlacklistTest.java similarity index 95% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PeerPermissionsBlacklistTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsBlacklistTest.java index c03550894f..c84c8dbde4 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PeerPermissionsBlacklistTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsBlacklistTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.permissions; +package org.hyperledger.besu.ethereum.p2p.permissions; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions.Action; +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions.Action; import java.util.Collections; import java.util.List; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PeerPermissionsTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsTest.java similarity index 95% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PeerPermissionsTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsTest.java index 4c6538a40a..49601bfc29 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/permissions/PeerPermissionsTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.permissions; +package org.hyperledger.besu.ethereum.p2p.permissions; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.never; @@ -18,10 +18,10 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions.Action; +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions.Action; import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/RlpxAgentTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxAgentTest.java similarity index 92% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/RlpxAgentTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxAgentTest.java index 380ddafbf2..8ac9d9ee51 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/RlpxAgentTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxAgentTest.java @@ -10,10 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx; +package org.hyperledger.besu.ethereum.p2p.rlpx; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.hyperledger.besu.ethereum.p2p.peers.PeerTestHelper.createMutableLocalNode; +import static org.hyperledger.besu.ethereum.p2p.peers.PeerTestHelper.createPeer; +import static org.hyperledger.besu.ethereum.p2p.peers.PeerTestHelper.enode; +import static org.hyperledger.besu.ethereum.p2p.peers.PeerTestHelper.enodeBuilder; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; @@ -22,34 +26,28 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.p2p.peers.PeerTestHelper.createMutableLocalNode; -import static tech.pegasys.pantheon.ethereum.p2p.peers.PeerTestHelper.createPeer; -import static tech.pegasys.pantheon.ethereum.p2p.peers.PeerTestHelper.enode; -import static tech.pegasys.pantheon.ethereum.p2p.peers.PeerTestHelper.enodeBuilder; - -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.ethereum.p2p.config.RlpxConfiguration; -import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.MutableLocalNode; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.peers.PeerPrivileges; -import tech.pegasys.pantheon.ethereum.p2p.peers.PeerTestHelper; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions.Action; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissionsException; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.MockConnectionInitializer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.MockPeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnectionEvents; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.PingMessage; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.bytes.BytesValue; + +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration; +import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer; +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.MutableLocalNode; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.peers.PeerPrivileges; +import org.hyperledger.besu.ethereum.p2p.peers.PeerTestHelper; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsException; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.MockConnectionInitializer; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.MockPeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEvents; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.PingMessage; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; import java.util.List; @@ -60,6 +58,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Stream; +import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; @@ -267,7 +266,7 @@ public class RlpxAgentTest { connectionInitializer.simulateIncomingConnection(incomingConnection); // New connection should be kept - assertThat(agent.getPeerConnection(peer).get().get()).isEqualTo(incomingConnection); + Assertions.assertThat(agent.getPeerConnection(peer).get().get()).isEqualTo(incomingConnection); assertThat(agent.getConnectionCount()).isEqualTo(1); assertThat(existingConnection.get().isDisconnected()).isTrue(); assertThat(((MockPeerConnection) existingConnection.get()).getDisconnectReason()) @@ -620,7 +619,9 @@ public class RlpxAgentTest { doReturn(false) .when(peerPermissions) .isPermitted( - eq(localNode.getPeer()), eq(peer), eq(Action.RLPX_ALLOW_NEW_OUTBOUND_CONNECTION)); + eq(localNode.getPeer()), + eq(peer), + eq(PeerPermissions.Action.RLPX_ALLOW_NEW_OUTBOUND_CONNECTION)); final CompletableFuture connection = agent.connect(peer); assertThat(connection).isDone(); @@ -638,7 +639,9 @@ public class RlpxAgentTest { doReturn(false) .when(peerPermissions) .isPermitted( - eq(localNode.getPeer()), eq(peer), eq(Action.RLPX_ALLOW_NEW_INBOUND_CONNECTION)); + eq(localNode.getPeer()), + eq(peer), + eq(PeerPermissions.Action.RLPX_ALLOW_NEW_INBOUND_CONNECTION)); connectionInitializer.simulateIncomingConnection(connection); assertPeerConnectionNotTracked(peer); @@ -725,7 +728,7 @@ public class RlpxAgentTest { .isPermitted( eq(localNode.getPeer()), eq(nonPermittedPeer), - eq(Action.RLPX_ALLOW_ONGOING_LOCALLY_INITIATED_CONNECTION)); + eq(PeerPermissions.Action.RLPX_ALLOW_ONGOING_LOCALLY_INITIATED_CONNECTION)); peerPermissions.testDispatchUpdate(true, Optional.empty()); assertThat(agent.getConnectionCount()).isEqualTo(1); @@ -752,7 +755,7 @@ public class RlpxAgentTest { .isPermitted( eq(localNode.getPeer()), eq(nonPermittedPeer), - eq(Action.RLPX_ALLOW_ONGOING_LOCALLY_INITIATED_CONNECTION)); + eq(PeerPermissions.Action.RLPX_ALLOW_ONGOING_LOCALLY_INITIATED_CONNECTION)); peerPermissions.testDispatchUpdate(true, Optional.of(Arrays.asList(nonPermittedPeer))); assertThat(agent.getConnectionCount()).isEqualTo(1); @@ -780,7 +783,7 @@ public class RlpxAgentTest { .isPermitted( eq(localNode.getPeer()), any(), - eq(Action.RLPX_ALLOW_ONGOING_REMOTELY_INITIATED_CONNECTION)); + eq(PeerPermissions.Action.RLPX_ALLOW_ONGOING_REMOTELY_INITIATED_CONNECTION)); peerPermissions.testDispatchUpdate(true, Optional.empty()); assertThat(agent.getConnectionCount()).isEqualTo(1); @@ -808,7 +811,7 @@ public class RlpxAgentTest { .isPermitted( eq(localNode.getPeer()), any(), - eq(Action.RLPX_ALLOW_ONGOING_LOCALLY_INITIATED_CONNECTION)); + eq(PeerPermissions.Action.RLPX_ALLOW_ONGOING_LOCALLY_INITIATED_CONNECTION)); peerPermissions.testDispatchUpdate(true, Optional.empty()); assertThat(agent.getConnectionCount()).isEqualTo(1); @@ -871,7 +874,7 @@ public class RlpxAgentTest { agent.connect(peer); assertThat(connection.get()).isNotNull(); - assertThat(connection.get().getPeer()).isEqualTo(peer); + Assertions.assertThat(connection.get().getPeer()).isEqualTo(peer); } @Test @@ -885,7 +888,7 @@ public class RlpxAgentTest { connectionInitializer.simulateIncomingConnection(connection(peer)); assertThat(connection.get()).isNotNull(); - assertThat(connection.get().getPeer()).isEqualTo(peer); + Assertions.assertThat(connection.get().getPeer()).isEqualTo(peer); } @Test @@ -900,11 +903,12 @@ public class RlpxAgentTest { agent.disconnect(peer.getId(), DisconnectReason.REQUESTED); assertThat(connection.get()).isNotNull(); - assertThat(connection.get().getPeer()).isEqualTo(peer); + Assertions.assertThat(connection.get().getPeer()).isEqualTo(peer); } @Test - public void subscribeMessage() throws ExecutionException, InterruptedException, PeerNotConnected { + public void subscribeMessage() + throws ExecutionException, InterruptedException, PeerConnection.PeerNotConnected { final Peer peer = createPeer(); final Capability cap = Capability.create("eth", 63); startAgent(); @@ -944,7 +948,7 @@ public class RlpxAgentTest { private void assertPeerConnectionNotTracked(final Peer peer) { assertThat(agent.getPeerConnection(peer)).isEmpty(); - assertThat(agent.connectionsById.get(peer.getId())).isNull(); + Assertions.assertThat(agent.connectionsById.get(peer.getId())).isNull(); } private void startAgent() { diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/AbstractPeerConnectionTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/AbstractPeerConnectionTest.java similarity index 87% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/AbstractPeerConnectionTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/AbstractPeerConnectionTest.java index a9fc5ef38b..a4b3499f31 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/AbstractPeerConnectionTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/AbstractPeerConnectionTest.java @@ -10,27 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.hyperledger.besu.ethereum.p2p.peers.PeerTestHelper.createPeer; import static org.mockito.Mockito.mock; -import static tech.pegasys.pantheon.ethereum.p2p.peers.PeerTestHelper.createPeer; - -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.CapabilityMultiplexer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.PingMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.WireMessageCodes; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.util.bytes.BytesValue; + +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.CapabilityMultiplexer; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.PingMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.WireMessageCodes; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.util.bytes.BytesValue; import java.net.InetSocketAddress; import java.util.ArrayList; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/MockConnectionInitializer.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/MockConnectionInitializer.java similarity index 92% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/MockConnectionInitializer.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/MockConnectionInitializer.java index 0353f81dee..58ea164f5b 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/MockConnectionInitializer.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/MockConnectionInitializer.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.ConnectCallback; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.ConnectCallback; +import org.hyperledger.besu.util.Subscribers; import java.util.HashMap; import java.util.Map; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/MockPeerConnection.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/MockPeerConnection.java similarity index 78% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/MockPeerConnection.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/MockPeerConnection.java index 868b3f546f..2e5ba4d76d 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/MockPeerConnection.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/MockPeerConnection.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections; +import static org.hyperledger.besu.ethereum.p2p.peers.PeerTestHelper.createPeer; import static org.mockito.Mockito.mock; -import static tech.pegasys.pantheon.ethereum.p2p.peers.PeerTestHelper.createPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.CapabilityMultiplexer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MockSubProtocol; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.SubProtocol; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.CapabilityMultiplexer; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MockSubProtocol; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; import java.net.InetSocketAddress; import java.util.Arrays; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/RlpxConnectionTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/RlpxConnectionTest.java similarity index 96% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/RlpxConnectionTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/RlpxConnectionTest.java index dceff248ea..5f27904efc 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/RlpxConnectionTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/RlpxConnectionTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.hyperledger.besu.ethereum.p2p.peers.PeerTestHelper.createPeer; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static tech.pegasys.pantheon.ethereum.p2p.peers.PeerTestHelper.createPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.RlpxConnection.ConnectionNotEstablishedException; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.RlpxConnection.ConnectionNotEstablishedException; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/DeFramerTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/DeFramerTest.java similarity index 88% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/DeFramerTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/DeFramerTest.java index 4d1f3a01a3..751cace2aa 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/DeFramerTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/DeFramerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.netty; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -22,32 +22,32 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.BreachOfProtocolException; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.IncompatiblePeerException; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.PeerDisconnectedException; -import tech.pegasys.pantheon.ethereum.p2p.network.exceptions.UnexpectedPeerConnectionException; -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.LocalNode; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnectionEvents; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.netty.testhelpers.NettyMocks; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.framing.Framer; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.framing.FramingException; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.Capability; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MockSubProtocol; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.PeerInfo; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.HelloMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.PingMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.WireMessageCodes; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.BreachOfProtocolException; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.IncompatiblePeerException; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.PeerDisconnectedException; +import org.hyperledger.besu.ethereum.p2p.network.exceptions.UnexpectedPeerConnectionException; +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.LocalNode; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEvents; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.testhelpers.NettyMocks; +import org.hyperledger.besu.ethereum.p2p.rlpx.framing.Framer; +import org.hyperledger.besu.ethereum.p2p.rlpx.framing.FramingException; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MockSubProtocol; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.HelloMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.PingMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.WireMessageCodes; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.util.bytes.BytesValue; import java.net.InetSocketAddress; import java.util.ArrayList; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/testhelpers/NettyMocks.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/testhelpers/NettyMocks.java similarity index 94% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/testhelpers/NettyMocks.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/testhelpers/NettyMocks.java index 4e2f84fd21..5a8bd75146 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/connections/netty/testhelpers/NettyMocks.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/testhelpers/NettyMocks.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.netty.testhelpers; +package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.testhelpers; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/FramerTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/FramerTest.java similarity index 95% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/FramerTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/FramerTest.java index 7bc19d5995..a535302602 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/FramerTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/FramerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.framing; +package org.hyperledger.besu.ethereum.p2p.rlpx.framing; import static io.netty.buffer.ByteBufUtil.decodeHexDump; import static io.netty.buffer.Unpooled.buffer; @@ -22,12 +22,12 @@ import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.HandshakeSecrets; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.HandshakeSecrets; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.util.List; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/SnappyCompressorTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/SnappyCompressorTest.java similarity index 97% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/SnappyCompressorTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/SnappyCompressorTest.java index 21d4fb2c0b..a888182a9d 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/SnappyCompressorTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/SnappyCompressorTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.framing; +package org.hyperledger.besu.ethereum.p2p.rlpx.framing; import static io.netty.buffer.ByteBufUtil.decodeHexDump; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.nio.charset.StandardCharsets; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshakeTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshakeTest.java similarity index 96% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshakeTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshakeTest.java index 4d0d238f96..c27554446b 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshakeTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshakeTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; -import tech.pegasys.pantheon.crypto.SECP256K1.PrivateKey; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.Handshaker.HandshakeStatus; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1.KeyPair; +import org.hyperledger.besu.crypto.SECP256K1.PrivateKey; +import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.Handshaker.HandshakeStatus; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessageTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessageTest.java similarity index 89% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessageTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessageTest.java index 7764eb9d9f..83a42ba46f 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessageTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessageTest.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.concurrent.ThreadLocalRandom; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4Test.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4Test.java similarity index 92% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4Test.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4Test.java index 6a89204b40..a0cc4fce7f 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4Test.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4Test.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies; -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.File; import java.io.IOException; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/CapabilityMultiplexerTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/CapabilityMultiplexerTest.java similarity index 95% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/CapabilityMultiplexerTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/CapabilityMultiplexerTest.java index 5a5bf1882d..04607685ca 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/CapabilityMultiplexerTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/CapabilityMultiplexerTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.CapabilityMultiplexer.ProtocolMessage; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.CapabilityMultiplexer.ProtocolMessage; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Arrays; import java.util.HashSet; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/MockSubProtocol.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/MockSubProtocol.java similarity index 95% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/MockSubProtocol.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/MockSubProtocol.java index 6b9faa7c6a..2ee4782fd9 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/MockSubProtocol.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/MockSubProtocol.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire; public class MockSubProtocol { public static SubProtocol create() { diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/WireMessagesSedesTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/WireMessagesSedesTest.java similarity index 91% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/WireMessagesSedesTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/WireMessagesSedesTest.java index 5bd43d7df9..fdc3a24ff4 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/WireMessagesSedesTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/WireMessagesSedesTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire; import static io.netty.buffer.ByteBufUtil.decodeHexDump; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/DisconnectMessageTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/DisconnectMessageTest.java similarity index 90% rename from ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/DisconnectMessageTest.java rename to ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/DisconnectMessageTest.java index 3dbb151ff4..3787517f24 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/wire/messages/DisconnectMessageTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/DisconnectMessageTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages; +package org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.MessageData; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.RawMessage; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; diff --git a/ethereum/p2p/src/test/resources/tech/pegasys/pantheon/ethereum/p2p/peers/invalid_static_nodes.json b/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/invalid_static_nodes.json similarity index 100% rename from ethereum/p2p/src/test/resources/tech/pegasys/pantheon/ethereum/p2p/peers/invalid_static_nodes.json rename to ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/invalid_static_nodes.json diff --git a/ethereum/p2p/src/test/resources/tech/pegasys/pantheon/ethereum/p2p/peers/invalid_static_nodes_no_listening_port.json b/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/invalid_static_nodes_no_listening_port.json similarity index 100% rename from ethereum/p2p/src/test/resources/tech/pegasys/pantheon/ethereum/p2p/peers/invalid_static_nodes_no_listening_port.json rename to ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/invalid_static_nodes_no_listening_port.json diff --git a/ethereum/p2p/src/test/resources/tech/pegasys/pantheon/ethereum/p2p/peers/valid_static_nodes.json b/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/valid_static_nodes.json similarity index 100% rename from ethereum/p2p/src/test/resources/tech/pegasys/pantheon/ethereum/p2p/peers/valid_static_nodes.json rename to ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/valid_static_nodes.json diff --git a/ethereum/p2p/src/test/resources/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/test.initiatormessage b/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/test.initiatormessage similarity index 100% rename from ethereum/p2p/src/test/resources/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/test.initiatormessage rename to ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/test.initiatormessage diff --git a/ethereum/p2p/src/test/resources/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/test.keypair b/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/test.keypair similarity index 100% rename from ethereum/p2p/src/test/resources/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/test.keypair rename to ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/test.keypair diff --git a/ethereum/permissioning/build.gradle b/ethereum/permissioning/build.gradle index 2d67fe461b..8e5bc89fd0 100644 --- a/ethereum/permissioning/build.gradle +++ b/ethereum/permissioning/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-permissioning' + baseName 'besu-permissioning' manifest { attributes( 'Specification-Title': baseName, diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/AccountLocalConfigPermissioningController.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/AccountLocalConfigPermissioningController.java similarity index 93% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/AccountLocalConfigPermissioningController.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/AccountLocalConfigPermissioningController.java index 2000983cb8..e1ab41959c 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/AccountLocalConfigPermissioningController.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/AccountLocalConfigPermissioningController.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.permissioning.account.TransactionPermissioningProvider; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.permissioning.account.TransactionPermissioningProvider; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.util.ArrayList; @@ -62,17 +62,17 @@ public class AccountLocalConfigPermissioningController implements TransactionPer readAccountsFromConfig(configuration); this.checkCounter = metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "account_local_check_count", "Number of times the account local permissioning provider has been checked"); this.checkCounterPermitted = metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "account_local_check_count_permitted", "Number of times the account local permissioning provider has been checked and returned permitted"); this.checkCounterUnpermitted = metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "account_local_check_count_unpermitted", "Number of times the account local permissioning provider has been checked and returned unpermitted"); } diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/LocalPermissioningConfiguration.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfiguration.java similarity index 97% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/LocalPermissioningConfiguration.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfiguration.java index 6f60e0a892..55014e3b51 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/LocalPermissioningConfiguration.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfiguration.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; import java.net.URI; import java.util.ArrayList; diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/NodeLocalConfigPermissioningController.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeLocalConfigPermissioningController.java similarity index 94% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/NodeLocalConfigPermissioningController.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeLocalConfigPermissioningController.java index be49126fdf..c9e26c3e81 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/NodeLocalConfigPermissioningController.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeLocalConfigPermissioningController.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.permissioning.node.NodePermissioningProvider; -import tech.pegasys.pantheon.ethereum.permissioning.node.NodeWhitelistUpdatedEvent; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.util.Subscribers; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.permissioning.node.NodePermissioningProvider; +import org.hyperledger.besu.ethereum.permissioning.node.NodeWhitelistUpdatedEvent; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.util.Subscribers; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.net.URI; @@ -80,17 +80,17 @@ public class NodeLocalConfigPermissioningController implements NodePermissioning this.checkCounter = metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "node_local_check_count", "Number of times the node local permissioning provider has been checked"); this.checkCounterPermitted = metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "node_local_check_count_permitted", "Number of times the node local permissioning provider has been checked and returned permitted"); this.checkCounterUnpermitted = metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "node_local_check_count_unpermitted", "Number of times the node local permissioning provider has been checked and returned unpermitted"); } diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/NodePermissioningControllerFactory.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodePermissioningControllerFactory.java similarity index 87% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/NodePermissioningControllerFactory.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodePermissioningControllerFactory.java index 64998f2a5f..64b201a1a2 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/NodePermissioningControllerFactory.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodePermissioningControllerFactory.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.permissioning.node.NodePermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.node.NodePermissioningProvider; -import tech.pegasys.pantheon.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulator; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.permissioning.node.NodePermissioningController; +import org.hyperledger.besu.ethereum.permissioning.node.NodePermissioningProvider; +import org.hyperledger.besu.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/NodeSmartContractPermissioningController.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractPermissioningController.java similarity index 89% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/NodeSmartContractPermissioningController.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractPermissioningController.java index 9fe4887752..a835049fac 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/NodeSmartContractPermissioningController.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractPermissioningController.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; import static java.nio.charset.StandardCharsets.UTF_8; -import tech.pegasys.pantheon.crypto.Hash; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.permissioning.node.NodePermissioningProvider; -import tech.pegasys.pantheon.ethereum.transaction.CallParameter; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulator; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulatorResult; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.permissioning.node.NodePermissioningProvider; +import org.hyperledger.besu.ethereum.transaction.CallParameter; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.net.InetAddress; import java.util.Optional; @@ -77,17 +77,17 @@ public class NodeSmartContractPermissioningController implements NodePermissioni this.checkCounter = metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "node_smart_contract_check_count", "Number of times the node smart contract permissioning provider has been checked"); this.checkCounterPermitted = metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "node_smart_contract_check_count_permitted", "Number of times the node smart contract permissioning provider has been checked and returned permitted"); this.checkCounterUnpermitted = metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "node_smart_contract_check_count_unpermitted", "Number of times the node smart contract permissioning provider has been checked and returned unpermitted"); } diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/PermissioningConfiguration.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/PermissioningConfiguration.java similarity index 96% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/PermissioningConfiguration.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/PermissioningConfiguration.java index 34efcfde9c..1e92e034f6 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/PermissioningConfiguration.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/PermissioningConfiguration.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; import java.util.Optional; diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/PermissioningConfigurationBuilder.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/PermissioningConfigurationBuilder.java similarity index 97% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/PermissioningConfigurationBuilder.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/PermissioningConfigurationBuilder.java index 805d17c94c..19f18ed152 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/PermissioningConfigurationBuilder.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/PermissioningConfigurationBuilder.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; import java.net.URI; import java.util.List; diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/SmartContractPermissioningConfiguration.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/SmartContractPermissioningConfiguration.java similarity index 95% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/SmartContractPermissioningConfiguration.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/SmartContractPermissioningConfiguration.java index 95e47af4cd..2a31a2b125 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/SmartContractPermissioningConfiguration.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/SmartContractPermissioningConfiguration.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; -import tech.pegasys.pantheon.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Address; public class SmartContractPermissioningConfiguration { private boolean smartContractNodeWhitelistEnabled; diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/TomlConfigFileParser.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/TomlConfigFileParser.java similarity index 98% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/TomlConfigFileParser.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/TomlConfigFileParser.java index 5b4a48075f..1feabfd7ff 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/TomlConfigFileParser.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/TomlConfigFileParser.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/TransactionSmartContractPermissioningController.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/TransactionSmartContractPermissioningController.java similarity index 89% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/TransactionSmartContractPermissioningController.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/TransactionSmartContractPermissioningController.java index ced2f87311..fc7ad107ec 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/TransactionSmartContractPermissioningController.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/TransactionSmartContractPermissioningController.java @@ -10,23 +10,23 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; import static com.google.common.base.Preconditions.checkArgument; import static java.nio.charset.StandardCharsets.UTF_8; -import tech.pegasys.pantheon.crypto.Hash; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.permissioning.account.TransactionPermissioningProvider; -import tech.pegasys.pantheon.ethereum.transaction.CallParameter; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulator; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulatorResult; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.permissioning.account.TransactionPermissioningProvider; +import org.hyperledger.besu.ethereum.transaction.CallParameter; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.util.Optional; @@ -84,17 +84,17 @@ public class TransactionSmartContractPermissioningController this.checkCounter = metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "transaction_smart_contract_check_count", "Number of times the transaction smart contract permissioning provider has been checked"); this.checkCounterPermitted = metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "transaction_smart_contract_check_count_permitted", "Number of times the transaction smart contract permissioning provider has been checked and returned permitted"); this.checkCounterUnpermitted = metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "transaction_smart_contract_check_count_unpermitted", "Number of times the transaction smart contract permissioning provider has been checked and returned unpermitted"); } @@ -107,7 +107,7 @@ public class TransactionSmartContractPermissioningController */ @Override public boolean isPermitted(final Transaction transaction) { - final tech.pegasys.pantheon.ethereum.core.Hash transactionHash = transaction.hash(); + final org.hyperledger.besu.ethereum.core.Hash transactionHash = transaction.hash(); final Address sender = transaction.getSender(); LOG.trace("Account permissioning - Smart Contract : Checking transaction {}", transactionHash); diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/WhitelistFileSyncException.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/WhitelistFileSyncException.java similarity index 92% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/WhitelistFileSyncException.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/WhitelistFileSyncException.java index d4a6eff22a..ecc33ac30c 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/WhitelistFileSyncException.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/WhitelistFileSyncException.java @@ -10,6 +10,6 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; public class WhitelistFileSyncException extends Exception {} diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/WhitelistOperationResult.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/WhitelistOperationResult.java similarity index 94% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/WhitelistOperationResult.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/WhitelistOperationResult.java index ecf32ef42d..6dd14a4a24 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/WhitelistOperationResult.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/WhitelistOperationResult.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; public enum WhitelistOperationResult { SUCCESS, diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/WhitelistPersistor.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/WhitelistPersistor.java similarity index 99% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/WhitelistPersistor.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/WhitelistPersistor.java index e1fce4df63..ba654ff130 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/WhitelistPersistor.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/WhitelistPersistor.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; import java.io.File; import java.io.IOException; diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/account/AccountPermissioningController.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningController.java similarity index 88% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/account/AccountPermissioningController.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningController.java index 59229a33e5..075830f62e 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/account/AccountPermissioningController.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningController.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.account; +package org.hyperledger.besu.ethereum.permissioning.account; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.TransactionSmartContractPermissioningController; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.TransactionSmartContractPermissioningController; import java.util.Optional; diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/account/AccountPermissioningControllerFactory.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerFactory.java similarity index 85% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/account/AccountPermissioningControllerFactory.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerFactory.java index 354c0cba98..a7e005ffe9 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/account/AccountPermissioningControllerFactory.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerFactory.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.account; - -import tech.pegasys.pantheon.crypto.SECP256K1; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.LocalPermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.SmartContractPermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.TransactionSmartContractPermissioningController; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulator; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.util.bytes.BytesValue; +package org.hyperledger.besu.ethereum.permissioning.account; + +import org.hyperledger.besu.crypto.SECP256K1; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.TransactionSmartContractPermissioningController; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/account/TransactionPermissioningProvider.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/TransactionPermissioningProvider.java similarity index 85% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/account/TransactionPermissioningProvider.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/TransactionPermissioningProvider.java index 3ba83abeef..6b540c0794 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/account/TransactionPermissioningProvider.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/TransactionPermissioningProvider.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.account; +package org.hyperledger.besu.ethereum.permissioning.account; -import tech.pegasys.pantheon.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Transaction; @FunctionalInterface public interface TransactionPermissioningProvider { diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/ContextualNodePermissioningProvider.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/ContextualNodePermissioningProvider.java similarity index 93% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/ContextualNodePermissioningProvider.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/ContextualNodePermissioningProvider.java index 598164c97e..8376425e2b 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/ContextualNodePermissioningProvider.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/ContextualNodePermissioningProvider.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.node; +package org.hyperledger.besu.ethereum.permissioning.node; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; import java.util.Optional; diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/InsufficientPeersPermissioningProvider.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/InsufficientPeersPermissioningProvider.java similarity index 90% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/InsufficientPeersPermissioningProvider.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/InsufficientPeersPermissioningProvider.java index 5ef3c9de1f..001e88c3ab 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/InsufficientPeersPermissioningProvider.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/InsufficientPeersPermissioningProvider.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.node; +package org.hyperledger.besu.ethereum.permissioning.node; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; +import org.hyperledger.besu.util.Subscribers; import java.util.Collection; import java.util.Optional; diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/NodePermissioningController.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningController.java similarity index 92% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/NodePermissioningController.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningController.java index a626be0ea1..9bce324d5c 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/NodePermissioningController.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningController.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.node; +package org.hyperledger.besu.ethereum.permissioning.node; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider; -import tech.pegasys.pantheon.util.Subscribers; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider; +import org.hyperledger.besu.util.Subscribers; import java.util.List; import java.util.Optional; diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/NodePermissioningProvider.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningProvider.java similarity index 86% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/NodePermissioningProvider.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningProvider.java index 9acd5336de..ff477e717a 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/NodePermissioningProvider.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningProvider.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.node; +package org.hyperledger.besu.ethereum.permissioning.node; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; @FunctionalInterface public interface NodePermissioningProvider { diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/NodeWhitelistUpdatedEvent.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodeWhitelistUpdatedEvent.java similarity index 93% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/NodeWhitelistUpdatedEvent.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodeWhitelistUpdatedEvent.java index 1f8741f60e..367f1bb841 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/NodeWhitelistUpdatedEvent.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodeWhitelistUpdatedEvent.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.node; +package org.hyperledger.besu.ethereum.permissioning.node; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; import java.util.Collections; import java.util.List; diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/PeerPermissionsAdapter.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/PeerPermissionsAdapter.java similarity index 92% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/PeerPermissionsAdapter.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/PeerPermissionsAdapter.java index b66349aca2..e99dfee48f 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/PeerPermissionsAdapter.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/PeerPermissionsAdapter.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.node; +package org.hyperledger.besu.ethereum.permissioning.node; import static com.google.common.base.Preconditions.checkNotNull; -import tech.pegasys.pantheon.ethereum.chain.Blockchain; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions; -import tech.pegasys.pantheon.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider; +import org.hyperledger.besu.ethereum.chain.Blockchain; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions; +import org.hyperledger.besu.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider; import java.util.List; import java.util.Optional; diff --git a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProvider.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProvider.java similarity index 85% rename from ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProvider.java rename to ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProvider.java index e531d0bfc0..7f41767b50 100644 --- a/ethereum/permissioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProvider.java +++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProvider.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.node.provider; +package org.hyperledger.besu.ethereum.permissioning.node.provider; import static com.google.common.base.Preconditions.checkNotNull; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.permissioning.node.NodePermissioningProvider; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.data.SyncStatus; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.permissioning.node.NodePermissioningProvider; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.data.SyncStatus; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; import java.net.URI; import java.util.Collection; @@ -50,23 +50,23 @@ public class SyncStatusNodePermissioningProvider implements NodePermissioningPro fixedNodes.stream().map(EnodeURL::toURIWithoutDiscoveryPort).collect(Collectors.toSet()); metricsSystem.createIntegerGauge( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "sync_status_node_sync_reached", "Whether the sync status permissioning provider has realised sync yet", () -> hasReachedSync ? 1 : 0); this.checkCounter = metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "sync_status_node_check_count", "Number of times the sync status permissioning provider has been checked"); this.checkCounterPermitted = metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "sync_status_node_check_count_permitted", "Number of times the sync status permissioning provider has been checked and returned permitted"); this.checkCounterUnpermitted = metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "sync_status_node_check_count_unpermitted", "Number of times the sync status permissioning provider has been checked and returned unpermitted"); } diff --git a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/AccountLocalConfigPermissioningControllerTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/AccountLocalConfigPermissioningControllerTest.java similarity index 96% rename from ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/AccountLocalConfigPermissioningControllerTest.java rename to ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/AccountLocalConfigPermissioningControllerTest.java index 9ada586e74..e268b709e7 100644 --- a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/AccountLocalConfigPermissioningControllerTest.java +++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/AccountLocalConfigPermissioningControllerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; @@ -23,11 +23,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -58,19 +58,19 @@ public class AccountLocalConfigPermissioningControllerTest { public void before() { when(metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "account_local_check_count", "Number of times the account local permissioning provider has been checked")) .thenReturn(checkCounter); when(metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "account_local_check_count_permitted", "Number of times the account local permissioning provider has been checked and returned permitted")) .thenReturn(checkPermittedCounter); when(metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "account_local_check_count_unpermitted", "Number of times the account local permissioning provider has been checked and returned unpermitted")) .thenReturn(checkUnpermittedCounter); diff --git a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/LocalPermissioningConfigurationBuilderTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfigurationBuilderTest.java similarity index 99% rename from ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/LocalPermissioningConfigurationBuilderTest.java rename to ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfigurationBuilderTest.java index 597dcf012a..f6d1d56146 100644 --- a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/LocalPermissioningConfigurationBuilderTest.java +++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfigurationBuilderTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/LocalPermissioningConfigurationTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfigurationTest.java similarity index 98% rename from ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/LocalPermissioningConfigurationTest.java rename to ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfigurationTest.java index f117429d36..d45472cab7 100644 --- a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/LocalPermissioningConfigurationTest.java +++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfigurationTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/NodeLocalConfigPermissioningControllerTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeLocalConfigPermissioningControllerTest.java similarity index 83% rename from ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/NodeLocalConfigPermissioningControllerTest.java rename to ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeLocalConfigPermissioningControllerTest.java index 68303a8ea1..ebd69cbc46 100644 --- a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/NodeLocalConfigPermissioningControllerTest.java +++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeLocalConfigPermissioningControllerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; @@ -24,13 +24,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController.NodesWhitelistResult; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.permissioning.node.NodeWhitelistUpdatedEvent; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.permissioning.node.NodeWhitelistUpdatedEvent; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; import java.io.IOException; import java.net.URI; @@ -74,19 +73,19 @@ public class NodeLocalConfigPermissioningControllerTest { bootnodesList.clear(); when(metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "node_local_check_count", "Number of times the node local permissioning provider has been checked")) .thenReturn(checkCounter); when(metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "node_local_check_count_permitted", "Number of times the node local permissioning provider has been checked and returned permitted")) .thenReturn(checkPermittedCounter); when(metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "node_local_check_count_unpermitted", "Number of times the node local permissioning provider has been checked and returned unpermitted")) .thenReturn(checkUnpermittedCounter); @@ -102,8 +101,11 @@ public class NodeLocalConfigPermissioningControllerTest { @Test public void whenAddNodesWithValidInputShouldReturnSuccess() { - NodesWhitelistResult expected = new NodesWhitelistResult(WhitelistOperationResult.SUCCESS); - NodesWhitelistResult actualResult = controller.addNodes(Lists.newArrayList(enode1)); + NodeLocalConfigPermissioningController.NodesWhitelistResult expected = + new NodeLocalConfigPermissioningController.NodesWhitelistResult( + WhitelistOperationResult.SUCCESS); + NodeLocalConfigPermissioningController.NodesWhitelistResult actualResult = + controller.addNodes(Lists.newArrayList(enode1)); assertThat(actualResult).isEqualToComparingOnlyGivenFields(expected, "result"); assertThat(controller.getNodesWhitelist()).containsExactly(enode1); @@ -113,73 +115,89 @@ public class NodeLocalConfigPermissioningControllerTest { public void whenAddNodesInputHasExistingNodeShouldReturnAddErrorExistingEntry() { controller.addNodes(Arrays.asList(enode1)); - NodesWhitelistResult expected = - new NodesWhitelistResult(WhitelistOperationResult.ERROR_EXISTING_ENTRY); - NodesWhitelistResult actualResult = controller.addNodes(Lists.newArrayList(enode1, enode2)); + NodeLocalConfigPermissioningController.NodesWhitelistResult expected = + new NodeLocalConfigPermissioningController.NodesWhitelistResult( + WhitelistOperationResult.ERROR_EXISTING_ENTRY); + NodeLocalConfigPermissioningController.NodesWhitelistResult actualResult = + controller.addNodes(Lists.newArrayList(enode1, enode2)); assertThat(actualResult).isEqualToComparingOnlyGivenFields(expected, "result"); } @Test public void whenAddNodesInputHasDuplicatedNodesShouldReturnDuplicatedEntryError() { - NodesWhitelistResult expected = - new NodesWhitelistResult(WhitelistOperationResult.ERROR_DUPLICATED_ENTRY); + NodeLocalConfigPermissioningController.NodesWhitelistResult expected = + new NodeLocalConfigPermissioningController.NodesWhitelistResult( + WhitelistOperationResult.ERROR_DUPLICATED_ENTRY); - NodesWhitelistResult actualResult = controller.addNodes(Arrays.asList(enode1, enode1)); + NodeLocalConfigPermissioningController.NodesWhitelistResult actualResult = + controller.addNodes(Arrays.asList(enode1, enode1)); assertThat(actualResult).isEqualToComparingOnlyGivenFields(expected, "result"); } @Test public void whenAddNodesInputHasEmptyListOfNodesShouldReturnErrorEmptyEntry() { - NodesWhitelistResult expected = - new NodesWhitelistResult(WhitelistOperationResult.ERROR_EMPTY_ENTRY); - NodesWhitelistResult actualResult = controller.removeNodes(new ArrayList<>()); + NodeLocalConfigPermissioningController.NodesWhitelistResult expected = + new NodeLocalConfigPermissioningController.NodesWhitelistResult( + WhitelistOperationResult.ERROR_EMPTY_ENTRY); + NodeLocalConfigPermissioningController.NodesWhitelistResult actualResult = + controller.removeNodes(new ArrayList<>()); assertThat(actualResult).isEqualToComparingOnlyGivenFields(expected, "result"); } @Test public void whenAddNodesInputHasNullListOfNodesShouldReturnErrorEmptyEntry() { - NodesWhitelistResult expected = - new NodesWhitelistResult(WhitelistOperationResult.ERROR_EMPTY_ENTRY); - NodesWhitelistResult actualResult = controller.removeNodes(null); + NodeLocalConfigPermissioningController.NodesWhitelistResult expected = + new NodeLocalConfigPermissioningController.NodesWhitelistResult( + WhitelistOperationResult.ERROR_EMPTY_ENTRY); + NodeLocalConfigPermissioningController.NodesWhitelistResult actualResult = + controller.removeNodes(null); assertThat(actualResult).isEqualToComparingOnlyGivenFields(expected, "result"); } @Test public void whenRemoveNodesInputHasAbsentNodeShouldReturnRemoveErrorAbsentEntry() { - NodesWhitelistResult expected = - new NodesWhitelistResult(WhitelistOperationResult.ERROR_ABSENT_ENTRY); - NodesWhitelistResult actualResult = controller.removeNodes(Lists.newArrayList(enode1, enode2)); + NodeLocalConfigPermissioningController.NodesWhitelistResult expected = + new NodeLocalConfigPermissioningController.NodesWhitelistResult( + WhitelistOperationResult.ERROR_ABSENT_ENTRY); + NodeLocalConfigPermissioningController.NodesWhitelistResult actualResult = + controller.removeNodes(Lists.newArrayList(enode1, enode2)); assertThat(actualResult).isEqualToComparingOnlyGivenFields(expected, "result"); } @Test public void whenRemoveNodesInputHasDuplicateNodesShouldReturnErrorDuplicatedEntry() { - NodesWhitelistResult expected = - new NodesWhitelistResult(WhitelistOperationResult.ERROR_DUPLICATED_ENTRY); - NodesWhitelistResult actualResult = controller.removeNodes(Lists.newArrayList(enode1, enode1)); + NodeLocalConfigPermissioningController.NodesWhitelistResult expected = + new NodeLocalConfigPermissioningController.NodesWhitelistResult( + WhitelistOperationResult.ERROR_DUPLICATED_ENTRY); + NodeLocalConfigPermissioningController.NodesWhitelistResult actualResult = + controller.removeNodes(Lists.newArrayList(enode1, enode1)); assertThat(actualResult).isEqualToComparingOnlyGivenFields(expected, "result"); } @Test public void whenRemoveNodesInputHasEmptyListOfNodesShouldReturnErrorEmptyEntry() { - NodesWhitelistResult expected = - new NodesWhitelistResult(WhitelistOperationResult.ERROR_EMPTY_ENTRY); - NodesWhitelistResult actualResult = controller.removeNodes(new ArrayList<>()); + NodeLocalConfigPermissioningController.NodesWhitelistResult expected = + new NodeLocalConfigPermissioningController.NodesWhitelistResult( + WhitelistOperationResult.ERROR_EMPTY_ENTRY); + NodeLocalConfigPermissioningController.NodesWhitelistResult actualResult = + controller.removeNodes(new ArrayList<>()); assertThat(actualResult).isEqualToComparingOnlyGivenFields(expected, "result"); } @Test public void whenRemoveNodesInputHasNullListOfNodesShouldReturnErrorEmptyEntry() { - NodesWhitelistResult expected = - new NodesWhitelistResult(WhitelistOperationResult.ERROR_EMPTY_ENTRY); - NodesWhitelistResult actualResult = controller.removeNodes(null); + NodeLocalConfigPermissioningController.NodesWhitelistResult expected = + new NodeLocalConfigPermissioningController.NodesWhitelistResult( + WhitelistOperationResult.ERROR_EMPTY_ENTRY); + NodeLocalConfigPermissioningController.NodesWhitelistResult actualResult = + controller.removeNodes(null); assertThat(actualResult).isEqualToComparingOnlyGivenFields(expected, "result"); } @@ -431,12 +449,14 @@ public class NodeLocalConfigPermissioningControllerTest { @Test public void whenRemovingBootnodeShouldReturnRemoveBootnodeError() { - NodesWhitelistResult expected = - new NodesWhitelistResult(WhitelistOperationResult.ERROR_FIXED_NODE_CANNOT_BE_REMOVED); + NodeLocalConfigPermissioningController.NodesWhitelistResult expected = + new NodeLocalConfigPermissioningController.NodesWhitelistResult( + WhitelistOperationResult.ERROR_FIXED_NODE_CANNOT_BE_REMOVED); bootnodesList.add(EnodeURL.fromString(enode1)); controller.addNodes(Lists.newArrayList(enode1, enode2)); - NodesWhitelistResult actualResult = controller.removeNodes(Lists.newArrayList(enode1)); + NodeLocalConfigPermissioningController.NodesWhitelistResult actualResult = + controller.removeNodes(Lists.newArrayList(enode1)); assertThat(actualResult).isEqualToComparingOnlyGivenFields(expected, "result"); assertThat(controller.getNodesWhitelist()).containsExactly(enode1, enode2); diff --git a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/NodeSmartContractPermissioningControllerTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractPermissioningControllerTest.java similarity index 90% rename from ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/NodeSmartContractPermissioningControllerTest.java rename to ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractPermissioningControllerTest.java index 1889e5b68d..259bf02868 100644 --- a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/NodeSmartContractPermissioningControllerTest.java +++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractPermissioningControllerTest.java @@ -10,30 +10,30 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; - -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.config.JsonUtil; -import tech.pegasys.pantheon.ethereum.chain.GenesisState; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulator; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; + +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.config.JsonUtil; +import org.hyperledger.besu.ethereum.chain.GenesisState; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; import java.io.IOException; @@ -72,19 +72,19 @@ public class NodeSmartContractPermissioningControllerTest { final Address contractAddress = Address.fromHexString(contractAddressString); when(metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "node_smart_contract_check_count", "Number of times the node smart contract permissioning provider has been checked")) .thenReturn(checkCounter); when(metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "node_smart_contract_check_count_permitted", "Number of times the node smart contract permissioning provider has been checked and returned permitted")) .thenReturn(checkPermittedCounter); when(metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "node_smart_contract_check_count_unpermitted", "Number of times the node smart contract permissioning provider has been checked and returned unpermitted")) .thenReturn(checkUnpermittedCounter); diff --git a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/TransactionSmartContractPermissioningControllerTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/TransactionSmartContractPermissioningControllerTest.java similarity index 83% rename from ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/TransactionSmartContractPermissioningControllerTest.java rename to ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/TransactionSmartContractPermissioningControllerTest.java index 5b8f3104cd..ed68c3ead0 100644 --- a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/TransactionSmartContractPermissioningControllerTest.java +++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/TransactionSmartContractPermissioningControllerTest.java @@ -10,32 +10,32 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; +import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain; -import static tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive; - -import tech.pegasys.pantheon.config.GenesisConfigFile; -import tech.pegasys.pantheon.crypto.SECP256K1.Signature; -import tech.pegasys.pantheon.ethereum.chain.GenesisState; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulator; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.util.bytes.BytesValue; + +import org.hyperledger.besu.config.GenesisConfigFile; +import org.hyperledger.besu.crypto.SECP256K1.Signature; +import org.hyperledger.besu.ethereum.chain.GenesisState; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.math.BigInteger; @@ -72,19 +72,19 @@ public class TransactionSmartContractPermissioningControllerTest { final Address contractAddress = Address.fromHexString(contractAddressString); when(metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "transaction_smart_contract_check_count", "Number of times the transaction smart contract permissioning provider has been checked")) .thenReturn(checkCounter); when(metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "transaction_smart_contract_check_count_permitted", "Number of times the transaction smart contract permissioning provider has been checked and returned permitted")) .thenReturn(checkPermittedCounter); when(metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "transaction_smart_contract_check_count_unpermitted", "Number of times the transaction smart contract permissioning provider has been checked and returned unpermitted")) .thenReturn(checkUnpermittedCounter); diff --git a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/WhitelistPersistorTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/WhitelistPersistorTest.java similarity index 97% rename from ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/WhitelistPersistorTest.java rename to ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/WhitelistPersistorTest.java index 9c948b8f3c..fb03698cf6 100644 --- a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/WhitelistPersistorTest.java +++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/WhitelistPersistorTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning; +package org.hyperledger.besu.ethereum.permissioning; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.permissioning.WhitelistPersistor.WHITELIST_TYPE; +import org.hyperledger.besu.ethereum.permissioning.WhitelistPersistor.WHITELIST_TYPE; import java.io.File; import java.io.IOException; diff --git a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/account/AccountPermissioningControllerFactoryTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerFactoryTest.java similarity index 89% rename from ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/account/AccountPermissioningControllerFactoryTest.java rename to ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerFactoryTest.java index 81aa03e3cb..be534c62a6 100644 --- a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/account/AccountPermissioningControllerFactoryTest.java +++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerFactoryTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.account; +package org.hyperledger.besu.ethereum.permissioning.account; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.fail; @@ -18,19 +18,20 @@ import static org.assertj.core.api.ThrowableAssert.catchThrowable; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.permissioning.LocalPermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.SmartContractPermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulator; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.Optional; +import org.assertj.core.api.Assertions; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -48,7 +49,7 @@ public class AccountPermissioningControllerFactoryTest { Optional controller = AccountPermissioningControllerFactory.create(null, transactionSimulator, metricsSystem); - assertThat(controller).isEmpty(); + Assertions.assertThat(controller).isEmpty(); } @Test @@ -63,7 +64,7 @@ public class AccountPermissioningControllerFactoryTest { AccountPermissioningControllerFactory.create( permissioningConfiguration, transactionSimulator, metricsSystem); - assertThat(controller).isEmpty(); + Assertions.assertThat(controller).isEmpty(); } @Test @@ -78,7 +79,7 @@ public class AccountPermissioningControllerFactoryTest { AccountPermissioningControllerFactory.create( permissioningConfiguration, transactionSimulator, metricsSystem); - assertThat(controller).isNotEmpty(); + Assertions.assertThat(controller).isNotEmpty(); assertThat(controller.get().getAccountLocalConfigPermissioningController()).isNotEmpty(); assertThat(controller.get().getTransactionSmartContractPermissioningController()).isEmpty(); } @@ -96,7 +97,7 @@ public class AccountPermissioningControllerFactoryTest { AccountPermissioningControllerFactory.create( permissioningConfiguration, transactionSimulator, metricsSystem); - assertThat(controller).isEmpty(); + Assertions.assertThat(controller).isEmpty(); } @Test @@ -111,7 +112,7 @@ public class AccountPermissioningControllerFactoryTest { AccountPermissioningControllerFactory.create( permissioningConfiguration, transactionSimulator, metricsSystem); - assertThat(controller).isNotEmpty(); + Assertions.assertThat(controller).isNotEmpty(); assertThat(controller.get().getAccountLocalConfigPermissioningController()).isEmpty(); assertThat(controller.get().getTransactionSmartContractPermissioningController()).isNotEmpty(); } @@ -152,7 +153,7 @@ public class AccountPermissioningControllerFactoryTest { AccountPermissioningControllerFactory.create( permissioningConfiguration, transactionSimulator, metricsSystem); - assertThat(controller).isNotEmpty(); + Assertions.assertThat(controller).isNotEmpty(); assertThat(controller.get().getAccountLocalConfigPermissioningController()).isNotEmpty(); assertThat(controller.get().getTransactionSmartContractPermissioningController()).isNotEmpty(); } diff --git a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/account/AccountPermissioningControllerTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerTest.java similarity index 90% rename from ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/account/AccountPermissioningControllerTest.java rename to ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerTest.java index 83948c4e79..876443f59a 100644 --- a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/account/AccountPermissioningControllerTest.java +++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.account; +package org.hyperledger.besu.ethereum.permissioning.account; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -19,9 +19,9 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.core.Transaction; -import tech.pegasys.pantheon.ethereum.permissioning.AccountLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.TransactionSmartContractPermissioningController; +import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.TransactionSmartContractPermissioningController; import java.util.Optional; diff --git a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/node/InsufficientPeersPermissioningProviderTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/InsufficientPeersPermissioningProviderTest.java similarity index 96% rename from ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/node/InsufficientPeersPermissioningProviderTest.java rename to ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/InsufficientPeersPermissioningProviderTest.java index cd7e6e1cb4..6cbfccdfa2 100644 --- a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/node/InsufficientPeersPermissioningProviderTest.java +++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/InsufficientPeersPermissioningProviderTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.node; +package org.hyperledger.besu.ethereum.permissioning.node; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -18,11 +18,11 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.p2p.network.P2PNetwork; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.ConnectCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.DisconnectCallback; -import tech.pegasys.pantheon.ethereum.p2p.rlpx.connections.PeerConnection; +import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.rlpx.ConnectCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.DisconnectCallback; +import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection; import java.util.Arrays; import java.util.Collection; diff --git a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/node/NodePermissioningControllerFactoryTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningControllerFactoryTest.java similarity index 90% rename from ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/node/NodePermissioningControllerFactoryTest.java rename to ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningControllerFactoryTest.java index 20e804d57a..3c152f6068 100644 --- a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/node/NodePermissioningControllerFactoryTest.java +++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningControllerFactoryTest.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.node; +package org.hyperledger.besu.ethereum.permissioning.node; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.permissioning.LocalPermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.NodePermissioningControllerFactory; -import tech.pegasys.pantheon.ethereum.permissioning.NodeSmartContractPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.permissioning.SmartContractPermissioningConfiguration; -import tech.pegasys.pantheon.ethereum.transaction.TransactionSimulator; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.NodePermissioningControllerFactory; +import org.hyperledger.besu.ethereum.permissioning.NodeSmartContractPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration; +import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration; +import org.hyperledger.besu.ethereum.transaction.TransactionSimulator; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.util.Collection; import java.util.Collections; diff --git a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/node/NodePermissioningControllerTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningControllerTest.java similarity index 96% rename from ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/node/NodePermissioningControllerTest.java rename to ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningControllerTest.java index f922f8fce8..5b88feef00 100644 --- a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/node/NodePermissioningControllerTest.java +++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningControllerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.node; +package org.hyperledger.besu.ethereum.permissioning.node; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -21,9 +21,9 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.permissioning.NodeLocalConfigPermissioningController; -import tech.pegasys.pantheon.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController; +import org.hyperledger.besu.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/node/PeerPermissionsAdapterTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/PeerPermissionsAdapterTest.java similarity index 95% rename from ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/node/PeerPermissionsAdapterTest.java rename to ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/PeerPermissionsAdapterTest.java index 307058dc68..efdeb47236 100644 --- a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/node/PeerPermissionsAdapterTest.java +++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/PeerPermissionsAdapterTest.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.node; +package org.hyperledger.besu.ethereum.permissioning.node; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockDataGenerator; -import tech.pegasys.pantheon.ethereum.core.InMemoryStorageProvider; -import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; -import tech.pegasys.pantheon.ethereum.p2p.permissions.PeerPermissions.Action; -import tech.pegasys.pantheon.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockDataGenerator; +import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider; +import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.ethereum.p2p.peers.Peer; +import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions.Action; +import org.hyperledger.besu.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProviderTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProviderTest.java similarity index 92% rename from ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProviderTest.java rename to ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProviderTest.java index 3fdbaa69da..b689f5759d 100644 --- a/ethereum/permissioning/src/test/java/tech/pegasys/pantheon/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProviderTest.java +++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProviderTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.permissioning.node.provider; +package org.hyperledger.besu.ethereum.permissioning.node.provider; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -19,13 +19,13 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.ethereum.core.SyncStatus; -import tech.pegasys.pantheon.ethereum.core.Synchronizer; -import tech.pegasys.pantheon.ethereum.p2p.peers.EnodeURL; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.PantheonEvents.SyncStatusListener; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; +import org.hyperledger.besu.ethereum.core.SyncStatus; +import org.hyperledger.besu.ethereum.core.Synchronizer; +import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.BesuEvents.SyncStatusListener; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; import java.util.ArrayList; import java.util.Collection; @@ -75,17 +75,17 @@ public class SyncStatusNodePermissioningProviderTest { ArgumentCaptor.forClass(IntSupplier.class); when(metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "sync_status_node_check_count", "Number of times the sync status permissioning provider has been checked")) .thenReturn(checkCounter); when(metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "sync_status_node_check_count_permitted", "Number of times the sync status permissioning provider has been checked and returned permitted")) .thenReturn(checkPermittedCounter); when(metricsSystem.createCounter( - PantheonMetricCategory.PERMISSIONING, + BesuMetricCategory.PERMISSIONING, "sync_status_node_check_count_unpermitted", "Number of times the sync status permissioning provider has been checked and returned unpermitted")) .thenReturn(checkUnpermittedCounter); @@ -93,7 +93,7 @@ public class SyncStatusNodePermissioningProviderTest { this.syncStatusListener = captor.getValue(); verify(metricsSystem) .createIntegerGauge( - eq(PantheonMetricCategory.PERMISSIONING), + eq(BesuMetricCategory.PERMISSIONING), eq("sync_status_node_sync_reached"), eq("Whether the sync status permissioning provider has realised sync yet"), syncGaugeCallbackCaptor.capture()); diff --git a/ethereum/retesteth/build.gradle b/ethereum/retesteth/build.gradle index 245960bb81..b549464f94 100644 --- a/ethereum/retesteth/build.gradle +++ b/ethereum/retesteth/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-retesteth' + baseName 'besu-retesteth' manifest { attributes( 'Specification-Title': baseName, diff --git a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/NoRewardProtocolScheduleWrapper.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/NoRewardProtocolScheduleWrapper.java similarity index 80% rename from ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/NoRewardProtocolScheduleWrapper.java rename to ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/NoRewardProtocolScheduleWrapper.java index e77f406bc9..4878ce815b 100644 --- a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/NoRewardProtocolScheduleWrapper.java +++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/NoRewardProtocolScheduleWrapper.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.retesteth; +package org.hyperledger.besu.ethereum.retesteth; -import tech.pegasys.pantheon.ethereum.BlockValidator; -import tech.pegasys.pantheon.ethereum.MainnetBlockValidator; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.core.TransactionFilter; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.BlockProcessor; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockImporter; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockProcessor; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.BlockValidator; +import org.hyperledger.besu.ethereum.MainnetBlockValidator; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.core.TransactionFilter; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.mainnet.BlockProcessor; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockImporter; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockProcessor; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; import java.math.BigInteger; import java.util.Optional; diff --git a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/RetestethClock.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethClock.java similarity index 97% rename from ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/RetestethClock.java rename to ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethClock.java index aaecdd0300..4044dab870 100644 --- a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/RetestethClock.java +++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethClock.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.retesteth; +package org.hyperledger.besu.ethereum.retesteth; import java.time.Clock; import java.time.Instant; diff --git a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/RetestethConfiguration.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethConfiguration.java similarity index 94% rename from ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/RetestethConfiguration.java rename to ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethConfiguration.java index 37e9cc9409..84b3512c52 100644 --- a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/RetestethConfiguration.java +++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethConfiguration.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.retesteth; +package org.hyperledger.besu.ethereum.retesteth; import java.nio.file.Path; diff --git a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/RetestethContext.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethContext.java similarity index 72% rename from ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/RetestethContext.java rename to ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethContext.java index bd0f3d005a..5f7ffe1665 100644 --- a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/RetestethContext.java +++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethContext.java @@ -10,48 +10,48 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.retesteth; - -import static tech.pegasys.pantheon.config.JsonUtil.normalizeKeys; - -import tech.pegasys.pantheon.config.JsonGenesisConfigOptions; -import tech.pegasys.pantheon.config.JsonUtil; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.processor.BlockReplay; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; -import tech.pegasys.pantheon.ethereum.blockcreation.IncrementingNonceGenerator; -import tech.pegasys.pantheon.ethereum.chain.DefaultBlockchain; -import tech.pegasys.pantheon.ethereum.chain.GenesisState; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Address; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.core.BlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.core.MutableWorldState; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; -import tech.pegasys.pantheon.ethereum.eth.manager.EthMessages; -import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; -import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler; -import tech.pegasys.pantheon.ethereum.eth.sync.state.SyncState; -import tech.pegasys.pantheon.ethereum.eth.transactions.PendingTransactions; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPool; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolConfiguration; -import tech.pegasys.pantheon.ethereum.eth.transactions.TransactionPoolFactory; -import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolver; -import tech.pegasys.pantheon.ethereum.mainnet.EthHasher; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderFunctions; -import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStateKeyValueStorage; -import tech.pegasys.pantheon.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage; -import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +package org.hyperledger.besu.ethereum.retesteth; + +import static org.hyperledger.besu.config.JsonUtil.normalizeKeys; + +import org.hyperledger.besu.config.JsonGenesisConfigOptions; +import org.hyperledger.besu.config.JsonUtil; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockReplay; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.BlockchainQueries; +import org.hyperledger.besu.ethereum.blockcreation.IncrementingNonceGenerator; +import org.hyperledger.besu.ethereum.chain.DefaultBlockchain; +import org.hyperledger.besu.ethereum.chain.GenesisState; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Address; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; +import org.hyperledger.besu.ethereum.core.MutableWorldState; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.eth.manager.EthContext; +import org.hyperledger.besu.ethereum.eth.manager.EthMessages; +import org.hyperledger.besu.ethereum.eth.manager.EthPeers; +import org.hyperledger.besu.ethereum.eth.manager.EthScheduler; +import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; +import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; +import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolFactory; +import org.hyperledger.besu.ethereum.mainnet.EthHashSolver; +import org.hyperledger.besu.ethereum.mainnet.EthHasher; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; +import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage; +import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage; +import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; import java.util.Optional; import java.util.concurrent.locks.ReentrantLock; diff --git a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/RetestethService.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethService.java similarity index 61% rename from ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/RetestethService.java rename to ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethService.java index 22ec25c6e2..6ddd8514a3 100644 --- a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/RetestethService.java +++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethService.java @@ -10,32 +10,32 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.retesteth; +package org.hyperledger.besu.ethereum.retesteth; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcConfiguration; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcHttpService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.JsonRpcMethodsFactory; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.HealthService; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.health.LivenessCheck; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.DebugAccountRange; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.DebugStorageRangeAt; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthBlockNumber; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetBalance; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetBlockByNumber; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetCode; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthGetTransactionCount; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.EthSendRawTransaction; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.Web3ClientVersion; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.results.BlockResultFactory; -import tech.pegasys.pantheon.ethereum.retesteth.methods.TestGetLogHash; -import tech.pegasys.pantheon.ethereum.retesteth.methods.TestImportRawBlock; -import tech.pegasys.pantheon.ethereum.retesteth.methods.TestMineBlocks; -import tech.pegasys.pantheon.ethereum.retesteth.methods.TestModifyTimestamp; -import tech.pegasys.pantheon.ethereum.retesteth.methods.TestRewindToBlock; -import tech.pegasys.pantheon.ethereum.retesteth.methods.TestSetChainParams; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcHttpService; +import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcMethodsFactory; +import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService; +import org.hyperledger.besu.ethereum.api.jsonrpc.health.LivenessCheck; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugAccountRange; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugStorageRangeAt; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthBlockNumber; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetBalance; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetBlockByNumber; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetCode; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetTransactionCount; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthSendRawTransaction; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.Web3ClientVersion; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory; +import org.hyperledger.besu.ethereum.retesteth.methods.TestGetLogHash; +import org.hyperledger.besu.ethereum.retesteth.methods.TestImportRawBlock; +import org.hyperledger.besu.ethereum.retesteth.methods.TestMineBlocks; +import org.hyperledger.besu.ethereum.retesteth.methods.TestModifyTimestamp; +import org.hyperledger.besu.ethereum.retesteth.methods.TestRewindToBlock; +import org.hyperledger.besu.ethereum.retesteth.methods.TestSetChainParams; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; import java.util.HashMap; import java.util.Map; diff --git a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestGetLogHash.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestGetLogHash.java similarity index 68% rename from ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestGetLogHash.java rename to ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestGetLogHash.java index a379051e25..da82fb60d2 100644 --- a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestGetLogHash.java +++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestGetLogHash.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.retesteth.methods; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.queries.TransactionReceiptWithMetadata; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Hash; -import tech.pegasys.pantheon.ethereum.core.LogSeries; -import tech.pegasys.pantheon.ethereum.retesteth.RetestethContext; -import tech.pegasys.pantheon.ethereum.rlp.RLP; +package org.hyperledger.besu.ethereum.retesteth.methods; + +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.queries.TransactionReceiptWithMetadata; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Hash; +import org.hyperledger.besu.ethereum.core.LogSeries; +import org.hyperledger.besu.ethereum.retesteth.RetestethContext; +import org.hyperledger.besu.ethereum.rlp.RLP; import java.util.Optional; diff --git a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestImportRawBlock.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestImportRawBlock.java similarity index 71% rename from ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestImportRawBlock.java rename to ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestImportRawBlock.java index 6bfc431668..f844cf29bb 100644 --- a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestImportRawBlock.java +++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestImportRawBlock.java @@ -10,21 +10,21 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.retesteth.methods; +package org.hyperledger.besu.ethereum.retesteth.methods; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; -import tech.pegasys.pantheon.ethereum.retesteth.RetestethContext; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; +import org.hyperledger.besu.ethereum.retesteth.RetestethContext; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.util.bytes.BytesValue; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestMineBlocks.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestMineBlocks.java similarity index 70% rename from ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestMineBlocks.java rename to ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestMineBlocks.java index 570942f0b0..8f10db2a95 100644 --- a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestMineBlocks.java +++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestMineBlocks.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.retesteth.methods; +package org.hyperledger.besu.ethereum.retesteth.methods; -import tech.pegasys.pantheon.ethereum.ProtocolContext; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.blockcreation.EthHashBlockCreator; -import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; -import tech.pegasys.pantheon.ethereum.core.Block; -import tech.pegasys.pantheon.ethereum.core.BlockImporter; -import tech.pegasys.pantheon.ethereum.core.Wei; -import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; -import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; -import tech.pegasys.pantheon.ethereum.retesteth.RetestethClock; -import tech.pegasys.pantheon.ethereum.retesteth.RetestethContext; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.ProtocolContext; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.blockcreation.EthHashBlockCreator; +import org.hyperledger.besu.ethereum.chain.MutableBlockchain; +import org.hyperledger.besu.ethereum.core.Block; +import org.hyperledger.besu.ethereum.core.BlockImporter; +import org.hyperledger.besu.ethereum.core.Wei; +import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode; +import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; +import org.hyperledger.besu.ethereum.retesteth.RetestethClock; +import org.hyperledger.besu.ethereum.retesteth.RetestethContext; +import org.hyperledger.besu.util.bytes.BytesValue; import com.google.common.base.Functions; diff --git a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestModifyTimestamp.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestModifyTimestamp.java similarity index 69% rename from ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestModifyTimestamp.java rename to ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestModifyTimestamp.java index 9aae13324f..40c1af47c9 100644 --- a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestModifyTimestamp.java +++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestModifyTimestamp.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.retesteth.methods; +package org.hyperledger.besu.ethereum.retesteth.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.retesteth.RetestethContext; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.retesteth.RetestethContext; public class TestModifyTimestamp implements JsonRpcMethod { diff --git a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestRewindToBlock.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestRewindToBlock.java similarity index 69% rename from ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestRewindToBlock.java rename to ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestRewindToBlock.java index b5994d1914..f51c2a3e71 100644 --- a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestRewindToBlock.java +++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestRewindToBlock.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.retesteth.methods; +package org.hyperledger.besu.ethereum.retesteth.methods; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.retesteth.RetestethContext; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.retesteth.RetestethContext; public class TestRewindToBlock implements JsonRpcMethod { private final RetestethContext context; diff --git a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestSetChainParams.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParams.java similarity index 89% rename from ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestSetChainParams.java rename to ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParams.java index dc1563c2a9..dca6980c6c 100644 --- a/ethereum/retesteth/src/main/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestSetChainParams.java +++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParams.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.retesteth.methods; - -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcError; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.retesteth.RetestethContext; +package org.hyperledger.besu.ethereum.retesteth.methods; + +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.retesteth.RetestethContext; import java.util.Iterator; import java.util.Map; diff --git a/ethereum/retesteth/src/test/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestSetChainParamsTest.java b/ethereum/retesteth/src/test/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParamsTest.java similarity index 91% rename from ethereum/retesteth/src/test/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestSetChainParamsTest.java rename to ethereum/retesteth/src/test/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParamsTest.java index 92177ec1e3..c5efeb3c9a 100644 --- a/ethereum/retesteth/src/test/java/tech/pegasys/pantheon/ethereum/retesteth/methods/TestSetChainParamsTest.java +++ b/ethereum/retesteth/src/test/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParamsTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.retesteth.methods; +package org.hyperledger.besu.ethereum.retesteth.methods; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.JsonRpcRequest; -import tech.pegasys.pantheon.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import tech.pegasys.pantheon.ethereum.core.BlockHeader; -import tech.pegasys.pantheon.ethereum.retesteth.RetestethContext; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; +import org.hyperledger.besu.ethereum.core.BlockHeader; +import org.hyperledger.besu.ethereum.retesteth.RetestethContext; import java.io.IOException; diff --git a/ethereum/retesteth/src/test/resources/tech/pegasys/pantheon/ethereum/retesteth/methods/multimpleBalanceInstructionChainParams.json b/ethereum/retesteth/src/test/resources/org/hyperledger/besu/ethereum/retesteth/methods/multimpleBalanceInstructionChainParams.json similarity index 100% rename from ethereum/retesteth/src/test/resources/tech/pegasys/pantheon/ethereum/retesteth/methods/multimpleBalanceInstructionChainParams.json rename to ethereum/retesteth/src/test/resources/org/hyperledger/besu/ethereum/retesteth/methods/multimpleBalanceInstructionChainParams.json diff --git a/ethereum/rlp/build.gradle b/ethereum/rlp/build.gradle index 08c67356ef..e71e21fb10 100644 --- a/ethereum/rlp/build.gradle +++ b/ethereum/rlp/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-ethereum-rlp' + baseName 'besu-ethereum-rlp' manifest { attributes( 'Specification-Title': baseName, @@ -45,8 +45,8 @@ dependencies { } test { - exclude 'tech/pegasys/pantheon/ethereum/rlp/InvalidRLPRefTest.class' - exclude 'tech/pegasys/pantheon/ethereum/rlp/RLPRefTest.class' + exclude 'org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTest.class' + exclude 'org/hyperledger/besu/ethereum/rlp/RLPRefTest.class' } task referenceTests(type: Test, dependsOn: ['compileTestJava']) { @@ -55,6 +55,6 @@ task referenceTests(type: Test, dependsOn: ['compileTestJava']) { throw new GradleException("ethereum/referencetests/src/test/resources/README.md missing: please clone submodules (git submodule update --init --recursive)") } } - include 'tech/pegasys/pantheon/ethereum/rlp/InvalidRLPRefTest.class' - include 'tech/pegasys/pantheon/ethereum/rlp/RLPRefTest.class' + include 'org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTest.class' + include 'org/hyperledger/besu/ethereum/rlp/RLPRefTest.class' } diff --git a/ethereum/rlp/src/jmh/java/tech/pegasys/pantheon/ethereum/rlp/RLPBench.java b/ethereum/rlp/src/jmh/java/org/hyperledger/besu/ethereum/rlp/RLPBench.java similarity index 93% rename from ethereum/rlp/src/jmh/java/tech/pegasys/pantheon/ethereum/rlp/RLPBench.java rename to ethereum/rlp/src/jmh/java/org/hyperledger/besu/ethereum/rlp/RLPBench.java index 65f6e97c7f..c10672f24d 100644 --- a/ethereum/rlp/src/jmh/java/tech/pegasys/pantheon/ethereum/rlp/RLPBench.java +++ b/ethereum/rlp/src/jmh/java/org/hyperledger/besu/ethereum/rlp/RLPBench.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; -import tech.pegasys.pantheon.ethereum.rlp.util.RLPTestUtil; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.rlp.util.RLPTestUtil; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/AbstractRLPInput.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/AbstractRLPInput.java similarity index 96% rename from ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/AbstractRLPInput.java rename to ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/AbstractRLPInput.java index c053660a8e..ee05c7d69d 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/AbstractRLPInput.java +++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/AbstractRLPInput.java @@ -10,17 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; import static com.google.common.base.Preconditions.checkState; -import tech.pegasys.pantheon.ethereum.rlp.RLPDecodingHelpers.Kind; -import tech.pegasys.pantheon.ethereum.rlp.RLPDecodingHelpers.RLPElementMetadata; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytes32; -import tech.pegasys.pantheon.util.uint.UInt256; -import tech.pegasys.pantheon.util.uint.UInt256Value; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytes32; +import org.hyperledger.besu.util.uint.UInt256; +import org.hyperledger.besu.util.uint.UInt256Value; import java.math.BigInteger; import java.net.InetAddress; @@ -37,7 +35,7 @@ abstract class AbstractRLPInput implements RLPInput { // Information on the item the input currently is at (next thing to read). protected long currentItem; // Offset in value to the beginning of the item (or value.size() if done) - private Kind currentKind; // Kind of the item. + private RLPDecodingHelpers.Kind currentKind; // Kind of the item. private long currentPayloadOffset; // Offset to the beginning of the current item payload. private int currentPayloadSize; // Size of the current item payload. @@ -129,7 +127,7 @@ abstract class AbstractRLPInput implements RLPInput { // Sets the kind of the item, the offset at which his payload starts and the size of this // payload. try { - RLPElementMetadata elementMetadata = + RLPDecodingHelpers.RLPElementMetadata elementMetadata = RLPDecodingHelpers.rlpElementMetadata(this::inputByte, size, currentItem); currentKind = elementMetadata.kind; currentPayloadOffset = elementMetadata.payloadStart; @@ -143,7 +141,7 @@ abstract class AbstractRLPInput implements RLPInput { } private void validateCurrentItem() { - if (currentKind == Kind.SHORT_ELEMENT) { + if (currentKind == RLPDecodingHelpers.Kind.SHORT_ELEMENT) { // Validate that a single byte SHORT_ELEMENT payload is not <= 0x7F. If it is, is should have // been written as a BYTE_ELEMENT. if (currentPayloadSize == 1 @@ -516,7 +514,7 @@ abstract class AbstractRLPInput implements RLPInput { @Override public boolean nextIsNull() { - return currentKind == Kind.SHORT_ELEMENT && currentPayloadSize == 0; + return currentKind == RLPDecodingHelpers.Kind.SHORT_ELEMENT && currentPayloadSize == 0; } @Override diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/AbstractRLPOutput.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/AbstractRLPOutput.java similarity index 90% rename from ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/AbstractRLPOutput.java rename to ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/AbstractRLPOutput.java index dfd85fe42e..c67cb91c84 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/AbstractRLPOutput.java +++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/AbstractRLPOutput.java @@ -10,16 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; import static com.google.common.base.Preconditions.checkState; -import static tech.pegasys.pantheon.ethereum.rlp.RLPEncodingHelpers.elementSize; -import static tech.pegasys.pantheon.ethereum.rlp.RLPEncodingHelpers.listSize; -import static tech.pegasys.pantheon.ethereum.rlp.RLPEncodingHelpers.writeElement; -import static tech.pegasys.pantheon.ethereum.rlp.RLPEncodingHelpers.writeListHeader; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytesValue; import java.util.ArrayList; import java.util.Arrays; @@ -84,7 +80,7 @@ abstract class AbstractRLPOutput implements RLPOutput { checkState( stackSize > 1 || values.isEmpty(), "Terminated RLP output, cannot add more elements"); values.add(v); - payloadSizes[currentList()] += elementSize(v); + payloadSizes[currentList()] += RLPEncodingHelpers.elementSize(v); } @Override @@ -121,7 +117,7 @@ abstract class AbstractRLPOutput implements RLPOutput { checkState(stackSize > 1, "LeaveList() called with no prior matching startList()"); final int current = currentList(); - final int finishedListSize = listSize(payloadSizes[current]); + final int finishedListSize = RLPEncodingHelpers.listSize(payloadSizes[current]); --stackSize; // We just finished an item of our parent list, add it to that parent list size now. @@ -159,7 +155,7 @@ abstract class AbstractRLPOutput implements RLPOutput { value.copyTo(mutableBytesValue, 0); finalOffset = value.size(); } else { - finalOffset = writeElement(value, mutableBytesValue, 0); + finalOffset = RLPEncodingHelpers.writeElement(value, mutableBytesValue, 0); } checkState( finalOffset == mutableBytesValue.size(), @@ -175,12 +171,12 @@ abstract class AbstractRLPOutput implements RLPOutput { final BytesValue value = values.get(i); if (value == LIST_MARKER) { final int payloadSize = payloadSizes[++listIdx]; - offset = writeListHeader(payloadSize, mutableBytesValue, offset); + offset = RLPEncodingHelpers.writeListHeader(payloadSize, mutableBytesValue, offset); } else if (rlpEncoded.get(i)) { value.copyTo(mutableBytesValue, offset); offset += value.size(); } else { - offset = writeElement(value, mutableBytesValue, offset); + offset = RLPEncodingHelpers.writeElement(value, mutableBytesValue, offset); } } diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPInput.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPInput.java similarity index 91% rename from ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPInput.java rename to ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPInput.java index 9c65ff4eaa..8fd61f6671 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPInput.java +++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPInput.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.math.BigInteger; diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPOutput.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPOutput.java similarity index 87% rename from ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPOutput.java rename to ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPOutput.java index 2964f009ae..83232265f2 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPOutput.java +++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPOutput.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytesValue; /** An {@link RLPOutput} that writes RLP encoded data to a {@link BytesValue}. */ public class BytesValueRLPOutput extends AbstractRLPOutput { diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/CorruptedRLPInputException.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/CorruptedRLPInputException.java similarity index 94% rename from ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/CorruptedRLPInputException.java rename to ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/CorruptedRLPInputException.java index 880b471f18..c9a796a395 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/CorruptedRLPInputException.java +++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/CorruptedRLPInputException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; /** Exception thrown if an RLP input is corrupted and cannot be decoded properly. */ public class CorruptedRLPInputException extends RLPException { diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/MalformedRLPInputException.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/MalformedRLPInputException.java similarity index 95% rename from ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/MalformedRLPInputException.java rename to ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/MalformedRLPInputException.java index c653cb953b..dcc4d8f113 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/MalformedRLPInputException.java +++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/MalformedRLPInputException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; /** * Exception thrown if an RLP input is strictly malformed, but in such a way that can be processed diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLP.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLP.java similarity index 89% rename from ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLP.java rename to ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLP.java index af0015458d..3b21f1ee1d 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLP.java +++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLP.java @@ -10,17 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; import static java.lang.String.format; -import static tech.pegasys.pantheon.ethereum.rlp.RLPDecodingHelpers.extractSize; -import static tech.pegasys.pantheon.ethereum.rlp.RLPEncodingHelpers.elementSize; -import static tech.pegasys.pantheon.ethereum.rlp.RLPEncodingHelpers.isSingleRLPByte; -import static tech.pegasys.pantheon.ethereum.rlp.RLPEncodingHelpers.writeElement; -import tech.pegasys.pantheon.ethereum.rlp.RLPDecodingHelpers.Kind; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytesValue; import java.util.function.Consumer; @@ -127,10 +122,10 @@ public abstract class RLP { * @return The RLP encoding containing only {@code value}. */ public static BytesValue encodeOne(final BytesValue value) { - if (isSingleRLPByte(value)) return value; + if (RLPEncodingHelpers.isSingleRLPByte(value)) return value; - final MutableBytesValue res = MutableBytesValue.create(elementSize(value)); - writeElement(value, res, 0); + final MutableBytesValue res = MutableBytesValue.create(RLPEncodingHelpers.elementSize(value)); + RLPEncodingHelpers.writeElement(value, res, 0); return res; } @@ -156,18 +151,18 @@ public abstract class RLP { } final int prefix = encodedValue.get(0) & 0xFF; - final Kind kind = Kind.of(prefix); + final RLPDecodingHelpers.Kind kind = RLPDecodingHelpers.Kind.of(prefix); if (kind.isList()) { throw new RLPException(format("Invalid input: value %s is an RLP list", encodedValue)); } - if (kind == Kind.BYTE_ELEMENT) { + if (kind == RLPDecodingHelpers.Kind.BYTE_ELEMENT) { return encodedValue; } final int offset; final int size; - if (kind == Kind.SHORT_ELEMENT) { + if (kind == RLPDecodingHelpers.Kind.SHORT_ELEMENT) { offset = 1; size = prefix - 0x80; } else { @@ -180,7 +175,7 @@ public abstract class RLP { encodedValue, sizeLength + 1, encodedValue.size())); } offset = 1 + sizeLength; - size = extractSize(encodedValue::get, 1, sizeLength); + size = RLPDecodingHelpers.extractSize(encodedValue::get, 1, sizeLength); } if (offset + size != encodedValue.size()) { throw new RLPException( diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPDecodingHelpers.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPDecodingHelpers.java similarity index 99% rename from ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPDecodingHelpers.java rename to ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPDecodingHelpers.java index d016caaf27..0b264ae196 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPDecodingHelpers.java +++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPDecodingHelpers.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; import java.util.function.IntUnaryOperator; import java.util.function.LongUnaryOperator; diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPEncodingHelpers.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPEncodingHelpers.java similarity index 95% rename from ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPEncodingHelpers.java rename to ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPEncodingHelpers.java index f1369b3997..da79d2204e 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPEncodingHelpers.java +++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPEncodingHelpers.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytesValue; /** * Helper static methods to facilitate RLP encoding within this package. Neither this class diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPException.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPException.java similarity index 94% rename from ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPException.java rename to ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPException.java index 27f1c4dc64..207e6fe35a 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPException.java +++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; public class RLPException extends RuntimeException { public RLPException(final String message) { diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPInput.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPInput.java similarity index 98% rename from ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPInput.java rename to ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPInput.java index d7a123cd4a..4173859119 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPInput.java +++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPInput.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; -import tech.pegasys.pantheon.util.uint.UInt256Value; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; +import org.hyperledger.besu.util.uint.UInt256Value; import java.math.BigInteger; import java.net.InetAddress; diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPOutput.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPOutput.java similarity index 97% rename from ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPOutput.java rename to ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPOutput.java index 2400ecbfdd..3946a6082e 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPOutput.java +++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPOutput.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; -import tech.pegasys.pantheon.util.uint.UInt256Value; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.besu.util.bytes.MutableBytesValue; +import org.hyperledger.besu.util.uint.UInt256Value; import java.math.BigInteger; import java.net.InetAddress; diff --git a/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/package-info.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/package-info.java new file mode 100644 index 0000000000..bd417ecedc --- /dev/null +++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/package-info.java @@ -0,0 +1,12 @@ +/** + * Recursive Length Prefix (RLP) encoding and decoding. + * + *

This package provides encoding and decoding of data with the RLP encoding scheme. Encoding is + * done through writing data to a {@link org.hyperledger.besu.ethereum.rlp.RLPOutput} (for instance + * {@link org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput}, which then exposes the encoded + * output as a {@link org.hyperledger.besu.util.bytes.BytesValue} through {@link + * org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput#encoded()}). Decoding is done by wrapping + * encoded data in a {@link org.hyperledger.besu.ethereum.rlp.RLPInput} (using, for instance, {@link + * org.hyperledger.besu.ethereum.rlp.RLP#input}) and reading from it. + */ +package org.hyperledger.besu.ethereum.rlp; diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/package-info.java b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/package-info.java deleted file mode 100644 index 170a4cebca..0000000000 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/package-info.java +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Recursive Length Prefix (RLP) encoding and decoding. - * - *

This package provides encoding and decoding of data with the RLP encoding scheme. Encoding is - * done through writing data to a {@link tech.pegasys.pantheon.ethereum.rlp.RLPOutput} (for instance - * {@link tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput}, which then exposes the encoded - * output as a {@link tech.pegasys.pantheon.util.bytes.BytesValue} through {@link - * tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput#encoded()}). Decoding is done by wrapping - * encoded data in a {@link tech.pegasys.pantheon.ethereum.rlp.RLPInput} (using, for instance, - * {@link tech.pegasys.pantheon.ethereum.rlp.RLP#input}) and reading from it. - */ -package tech.pegasys.pantheon.ethereum.rlp; diff --git a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPInputTest.java b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPInputTest.java similarity index 99% rename from ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPInputTest.java rename to ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPInputTest.java index d4214030ea..ef18b0be39 100644 --- a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPInputTest.java +++ b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPInputTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.util.Arrays; import java.util.List; diff --git a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPOutputTest.java b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPOutputTest.java similarity index 99% rename from ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPOutputTest.java rename to ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPOutputTest.java index ce6e9209fe..e5469d0564 100644 --- a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPOutputTest.java +++ b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPOutputTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import org.junit.Test; diff --git a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/InvalidRLPRefTest.java b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTest.java similarity index 86% rename from ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/InvalidRLPRefTest.java rename to ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTest.java index 0b0ef2a9ca..62c949ecaf 100644 --- a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/InvalidRLPRefTest.java +++ b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; import static org.junit.Assume.assumeTrue; -import tech.pegasys.pantheon.ethereum.rlp.util.RLPTestUtil; -import tech.pegasys.pantheon.testutil.JsonTestParameters; +import org.hyperledger.besu.ethereum.rlp.util.RLPTestUtil; +import org.hyperledger.besu.testutil.JsonTestParameters; import java.util.Collection; @@ -30,7 +30,7 @@ public class InvalidRLPRefTest { private static final String[] TEST_CONFIG_FILES = { // TODO: upstream these additional tests to the ethereum tests repo - "tech/pegasys/pantheon/ethereum/rlp/invalidRLPTest.json", "RLPTests/invalidRLPTest.json" + "org/hyperledger/besu/ethereum/rlp/invalidRLPTest.json", "RLPTests/invalidRLPTest.json" }; private final InvalidRLPRefTestCaseSpec spec; diff --git a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/InvalidRLPRefTestCaseSpec.java b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTestCaseSpec.java similarity index 91% rename from ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/InvalidRLPRefTestCaseSpec.java rename to ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTestCaseSpec.java index 00be9ffef9..fe8af3c743 100644 --- a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/InvalidRLPRefTestCaseSpec.java +++ b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTestCaseSpec.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/RLPRefTest.java b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTest.java similarity index 91% rename from ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/RLPRefTest.java rename to ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTest.java index 5fb9033a2e..5d5be4e55a 100644 --- a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/RLPRefTest.java +++ b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assume.assumeTrue; -import tech.pegasys.pantheon.ethereum.rlp.util.RLPTestUtil; -import tech.pegasys.pantheon.testutil.JsonTestParameters; +import org.hyperledger.besu.ethereum.rlp.util.RLPTestUtil; +import org.hyperledger.besu.testutil.JsonTestParameters; import java.util.Collection; diff --git a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/RLPRefTestCaseSpec.java b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTestCaseSpec.java similarity index 94% rename from ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/RLPRefTestCaseSpec.java rename to ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTestCaseSpec.java index 468e4fde1d..02f0b9ac55 100644 --- a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/RLPRefTestCaseSpec.java +++ b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTestCaseSpec.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; import static java.nio.charset.StandardCharsets.UTF_8; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.math.BigInteger; import java.util.Arrays; diff --git a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/RLPTest.java b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/RLPTest.java similarity index 97% rename from ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/RLPTest.java rename to ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/RLPTest.java index fafb36e07e..d5cc8971d6 100644 --- a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/RLPTest.java +++ b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/RLPTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp; +package org.hyperledger.besu.ethereum.rlp; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; -import tech.pegasys.pantheon.ethereum.rlp.util.RLPTestUtil; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.rlp.util.RLPTestUtil; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Random; diff --git a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/util/RLPTestUtil.java b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/util/RLPTestUtil.java similarity index 93% rename from ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/util/RLPTestUtil.java rename to ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/util/RLPTestUtil.java index 87355aea5f..c666fa6fb0 100644 --- a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/util/RLPTestUtil.java +++ b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/util/RLPTestUtil.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.rlp.util; +package org.hyperledger.besu.ethereum.rlp.util; import static java.lang.String.format; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.ethereum.rlp.RLPOutput; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/rlp/src/test/resources/tech/pegasys/pantheon/ethereum/rlp/invalidRLPTest.json b/ethereum/rlp/src/test/resources/org/hyperledger/besu/ethereum/rlp/invalidRLPTest.json similarity index 100% rename from ethereum/rlp/src/test/resources/tech/pegasys/pantheon/ethereum/rlp/invalidRLPTest.json rename to ethereum/rlp/src/test/resources/org/hyperledger/besu/ethereum/rlp/invalidRLPTest.json diff --git a/ethereum/trie/build.gradle b/ethereum/trie/build.gradle index f1d418a716..3cb10d14fe 100644 --- a/ethereum/trie/build.gradle +++ b/ethereum/trie/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-trie' + baseName 'besu-trie' manifest { attributes( 'Specification-Title': baseName, @@ -42,7 +42,7 @@ dependencies { testImplementation 'org.mockito:mockito-core' } -test { exclude 'tech/pegasys/pantheon/ethereum/trie/TrieRefTest.class' } +test { exclude 'org/hyperledger/besu/ethereum/trie/TrieRefTest.class' } task referenceTests(type: Test, dependsOn: ['compileTestJava']) { doFirst { @@ -50,5 +50,5 @@ task referenceTests(type: Test, dependsOn: ['compileTestJava']) { throw new GradleException("ethereum/referencetests/src/test/resources/README.md missing: please clone submodules (git submodule update --init --recursive)") } } - include 'tech/pegasys/pantheon/ethereum/trie/TrieRefTest.class' + include 'org/hyperledger/besu/ethereum/trie/TrieRefTest.class' } diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/AllNodesVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/AllNodesVisitor.java similarity index 96% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/AllNodesVisitor.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/AllNodesVisitor.java index 057e4840ee..3cb6b718f2 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/AllNodesVisitor.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/AllNodesVisitor.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; import java.util.function.Consumer; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/BranchNode.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/BranchNode.java similarity index 94% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/BranchNode.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/BranchNode.java index 371941f697..1eed9f80b3 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/BranchNode.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/BranchNode.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import static tech.pegasys.pantheon.crypto.Hash.keccak256; +import static org.hyperledger.besu.crypto.Hash.keccak256; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytesValue; import java.lang.ref.SoftReference; import java.lang.ref.WeakReference; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/CommitVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/CommitVisitor.java similarity index 94% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/CommitVisitor.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/CommitVisitor.java index 6a39c95046..9334e814a4 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/CommitVisitor.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/CommitVisitor.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; class CommitVisitor implements NodeVisitor { diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/CompactEncoding.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/CompactEncoding.java similarity index 96% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/CompactEncoding.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/CompactEncoding.java index 786da36b5f..5be240c83b 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/CompactEncoding.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/CompactEncoding.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.MutableBytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.MutableBytesValue; abstract class CompactEncoding { private CompactEncoding() {} diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/DefaultNodeFactory.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/DefaultNodeFactory.java similarity index 96% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/DefaultNodeFactory.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/DefaultNodeFactory.java index a817efc24d..32a3bde710 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/DefaultNodeFactory.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/DefaultNodeFactory.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/ExtensionNode.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/ExtensionNode.java similarity index 91% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/ExtensionNode.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/ExtensionNode.java index 32566cb473..5bda31a21e 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/ExtensionNode.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/ExtensionNode.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import static tech.pegasys.pantheon.crypto.Hash.keccak256; +import static org.hyperledger.besu.crypto.Hash.keccak256; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.lang.ref.SoftReference; import java.lang.ref.WeakReference; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/GetVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/GetVisitor.java similarity index 95% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/GetVisitor.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/GetVisitor.java index 0f799c47d8..dbe1458ce1 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/GetVisitor.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/GetVisitor.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; class GetVisitor implements PathNodeVisitor { private final Node NULL_NODE_RESULT = NullNode.instance(); diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/KeyValueMerkleStorage.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/KeyValueMerkleStorage.java similarity index 86% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/KeyValueMerkleStorage.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/KeyValueMerkleStorage.java index 1a3514aa5a..2d66bd8362 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/KeyValueMerkleStorage.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/KeyValueMerkleStorage.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageTransaction; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.HashMap; import java.util.Map; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/LeafNode.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/LeafNode.java similarity index 91% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/LeafNode.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/LeafNode.java index c91a21ac04..6638e94d0f 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/LeafNode.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/LeafNode.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import static tech.pegasys.pantheon.crypto.Hash.keccak256; +import static org.hyperledger.besu.crypto.Hash.keccak256; -import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.lang.ref.SoftReference; import java.lang.ref.WeakReference; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerklePatriciaTrie.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerklePatriciaTrie.java similarity index 91% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerklePatriciaTrie.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerklePatriciaTrie.java index f72e04b1c7..1b505254f0 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerklePatriciaTrie.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerklePatriciaTrie.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import static tech.pegasys.pantheon.crypto.Hash.keccak256; +import static org.hyperledger.besu.crypto.Hash.keccak256; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Map; import java.util.Optional; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerkleStorage.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleStorage.java similarity index 91% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerkleStorage.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleStorage.java index 92f9018008..6ac98021cd 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerkleStorage.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleStorage.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerkleTrieException.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleTrieException.java similarity index 95% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerkleTrieException.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleTrieException.java index b00a1f60b2..15aa80b3b5 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerkleTrieException.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleTrieException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; /** * This exception is thrown when there is an issue retrieving or decoding values from {@link diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/Node.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/Node.java similarity index 91% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/Node.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/Node.java index 47741f298a..e2b9662fde 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/Node.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/Node.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeFactory.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeFactory.java similarity index 90% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeFactory.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeFactory.java index efb234d857..fd2abdfcf2 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeFactory.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeFactory.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Optional; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeLoader.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeLoader.java similarity index 82% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeLoader.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeLoader.java index ba1abb4ece..9c1a1414cc 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeLoader.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeLoader.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeUpdater.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeUpdater.java similarity index 81% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeUpdater.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeUpdater.java index 47126c6b1b..ff707d62f3 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeUpdater.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeUpdater.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; public interface NodeUpdater { void store(Bytes32 hash, BytesValue value); diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeVisitor.java similarity index 94% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeVisitor.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeVisitor.java index 1cd5755750..c5e4d175ba 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeVisitor.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeVisitor.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; interface NodeVisitor { diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NullNode.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NullNode.java similarity index 93% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NullNode.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NullNode.java index 15f388d16d..e70c1aafe0 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NullNode.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NullNode.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collections; import java.util.List; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/PathNodeVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PathNodeVisitor.java similarity index 89% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/PathNodeVisitor.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PathNodeVisitor.java index 13ff8ea09d..d403e46b9d 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/PathNodeVisitor.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PathNodeVisitor.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; interface PathNodeVisitor { diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/Proof.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/Proof.java similarity index 91% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/Proof.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/Proof.java index 3f88b0472e..3d6447bc96 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/Proof.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/Proof.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/ProofVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/ProofVisitor.java similarity index 94% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/ProofVisitor.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/ProofVisitor.java index 4b8d721c3c..c0b9160123 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/ProofVisitor.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/ProofVisitor.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/PutVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PutVisitor.java similarity index 97% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/PutVisitor.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PutVisitor.java index 0816e0306e..81fd32677b 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/PutVisitor.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PutVisitor.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; class PutVisitor implements PathNodeVisitor { private final NodeFactory nodeFactory; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/RemoveVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RemoveVisitor.java similarity index 95% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/RemoveVisitor.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RemoveVisitor.java index 0a8698bdcf..99cd140341 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/RemoveVisitor.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RemoveVisitor.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; class RemoveVisitor implements PathNodeVisitor { private final Node NULL_NODE_RESULT = NullNode.instance(); diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/SimpleMerklePatriciaTrie.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/SimpleMerklePatriciaTrie.java similarity index 93% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/SimpleMerklePatriciaTrie.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/SimpleMerklePatriciaTrie.java index bc2e034eb0..31bb0a731c 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/SimpleMerklePatriciaTrie.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/SimpleMerklePatriciaTrie.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; import static com.google.common.base.Preconditions.checkNotNull; -import static tech.pegasys.pantheon.ethereum.trie.CompactEncoding.bytesToPath; +import static org.hyperledger.besu.ethereum.trie.CompactEncoding.bytesToPath; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Map; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StorageEntriesCollector.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StorageEntriesCollector.java similarity index 85% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StorageEntriesCollector.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StorageEntriesCollector.java index 06da55bf6c..c35198df49 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StorageEntriesCollector.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StorageEntriesCollector.java @@ -10,10 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.ethereum.trie.TrieIterator.State; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.Bytes32; import java.util.Map; import java.util.TreeMap; @@ -43,11 +42,11 @@ public class StorageEntriesCollector implements TrieIterator.LeafHandler { } @Override - public State onLeaf(final Bytes32 keyHash, final Node node) { + public TrieIterator.State onLeaf(final Bytes32 keyHash, final Node node) { if (keyHash.compareTo(startKeyHash) >= 0) { node.getValue().ifPresent(value -> values.put(keyHash, value)); } - return limitReached() ? State.STOP : State.CONTINUE; + return limitReached() ? TrieIterator.State.STOP : TrieIterator.State.CONTINUE; } public Map getValues() { diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredMerklePatriciaTrie.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredMerklePatriciaTrie.java similarity index 90% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredMerklePatriciaTrie.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredMerklePatriciaTrie.java index 42fe68a1d9..8e4d1086f7 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredMerklePatriciaTrie.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredMerklePatriciaTrie.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; import static com.google.common.base.Preconditions.checkNotNull; -import static tech.pegasys.pantheon.ethereum.trie.CompactEncoding.bytesToPath; +import static org.hyperledger.besu.ethereum.trie.CompactEncoding.bytesToPath; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Map; @@ -48,7 +48,7 @@ public class StoredMerklePatriciaTrie implements Merkle final NodeLoader nodeLoader, final Function valueSerializer, final Function valueDeserializer) { - this(nodeLoader, MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH, valueSerializer, valueDeserializer); + this(nodeLoader, EMPTY_TRIE_NODE_HASH, valueSerializer, valueDeserializer); } /** @@ -67,7 +67,7 @@ public class StoredMerklePatriciaTrie implements Merkle final Function valueDeserializer) { this.nodeFactory = new StoredNodeFactory<>(nodeLoader, valueSerializer, valueDeserializer); this.root = - rootHash.equals(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH) + rootHash.equals(EMPTY_TRIE_NODE_HASH) ? NullNode.instance() : new StoredNode<>(nodeFactory, rootHash); } @@ -112,7 +112,7 @@ public class StoredMerklePatriciaTrie implements Merkle // Reset root so dirty nodes can be garbage collected final Bytes32 rootHash = root.getHash(); this.root = - rootHash.equals(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH) + rootHash.equals(EMPTY_TRIE_NODE_HASH) ? NullNode.instance() : new StoredNode<>(nodeFactory, rootHash); } diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredNode.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNode.java similarity index 93% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredNode.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNode.java index 09c512418c..421349ef14 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredNode.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNode.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredNodeFactory.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNodeFactory.java similarity index 96% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredNodeFactory.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNodeFactory.java index 41dca7855e..58168d4913 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredNodeFactory.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNodeFactory.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; import static java.lang.String.format; -import tech.pegasys.pantheon.ethereum.rlp.RLP; -import tech.pegasys.pantheon.ethereum.rlp.RLPException; -import tech.pegasys.pantheon.ethereum.rlp.RLPInput; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.ethereum.rlp.RLP; +import org.hyperledger.besu.ethereum.rlp.RLPException; +import org.hyperledger.besu.ethereum.rlp.RLPInput; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/TrieIterator.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/TrieIterator.java similarity index 95% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/TrieIterator.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/TrieIterator.java index 47f5455303..8029a31bc5 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/TrieIterator.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/TrieIterator.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayDeque; import java.util.Deque; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/TrieNodeDecoder.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/TrieNodeDecoder.java similarity index 97% rename from ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/TrieNodeDecoder.java rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/TrieNodeDecoder.java index 5212e90df0..2dc21f16ad 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/TrieNodeDecoder.java +++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/TrieNodeDecoder.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Iterator; diff --git a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/AbstractMerklePatriciaTrieTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/AbstractMerklePatriciaTrieTest.java similarity index 97% rename from ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/AbstractMerklePatriciaTrieTest.java rename to ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/AbstractMerklePatriciaTrieTest.java index cbbab9bb46..fd8095e489 100644 --- a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/AbstractMerklePatriciaTrieTest.java +++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/AbstractMerklePatriciaTrieTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; import static java.nio.charset.StandardCharsets.UTF_8; import static junit.framework.TestCase.assertFalse; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/AllNodesVisitorTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/AllNodesVisitorTest.java similarity index 97% rename from ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/AllNodesVisitorTest.java rename to ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/AllNodesVisitorTest.java index b650b46f50..94d5c258f9 100644 --- a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/AllNodesVisitorTest.java +++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/AllNodesVisitorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/CompactEncodingTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/CompactEncodingTest.java similarity index 91% rename from ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/CompactEncodingTest.java rename to ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/CompactEncodingTest.java index 9df84117cf..2af3a23ac1 100644 --- a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/CompactEncodingTest.java +++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/CompactEncodingTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.crypto.Hash; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.util.Random; diff --git a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/SimpleMerklePatriciaTrieTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/SimpleMerklePatriciaTrieTest.java similarity index 90% rename from ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/SimpleMerklePatriciaTrieTest.java rename to ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/SimpleMerklePatriciaTrieTest.java index 797f92a881..b8c8d80247 100644 --- a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/SimpleMerklePatriciaTrieTest.java +++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/SimpleMerklePatriciaTrieTest.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.nio.charset.Charset; diff --git a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/StoredMerklePatriciaTrieTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/StoredMerklePatriciaTrieTest.java similarity index 94% rename from ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/StoredMerklePatriciaTrieTest.java rename to ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/StoredMerklePatriciaTrieTest.java index a2fe937f2a..f6b1fee17d 100644 --- a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/StoredMerklePatriciaTrieTest.java +++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/StoredMerklePatriciaTrieTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.nio.charset.StandardCharsets; import java.util.Optional; diff --git a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieIteratorTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieIteratorTest.java similarity index 92% rename from ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieIteratorTest.java rename to ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieIteratorTest.java index 2ce54e6818..7a7cc296ae 100644 --- a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieIteratorTest.java +++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieIteratorTest.java @@ -10,8 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; +import static org.hyperledger.besu.ethereum.trie.CompactEncoding.bytesToPath; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.inOrder; @@ -20,14 +21,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.ethereum.trie.CompactEncoding.bytesToPath; - -import tech.pegasys.pantheon.crypto.Hash; -import tech.pegasys.pantheon.ethereum.trie.TrieIterator.LeafHandler; -import tech.pegasys.pantheon.ethereum.trie.TrieIterator.State; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.uint.UInt256; + +import org.hyperledger.besu.crypto.Hash; +import org.hyperledger.besu.ethereum.trie.TrieIterator.LeafHandler; +import org.hyperledger.besu.ethereum.trie.TrieIterator.State; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.uint.UInt256; import java.nio.charset.StandardCharsets; import java.util.NavigableSet; diff --git a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieNodeDecoderTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieNodeDecoderTest.java similarity index 96% rename from ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieNodeDecoderTest.java rename to ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieNodeDecoderTest.java index b18c37123f..f67f4fdaae 100644 --- a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieNodeDecoderTest.java +++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieNodeDecoderTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageTransaction; -import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction; +import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.List; import java.util.Objects; diff --git a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieRefTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieRefTest.java similarity index 92% rename from ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieRefTest.java rename to ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieRefTest.java index 24b1573ad0..28e9056c57 100644 --- a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieRefTest.java +++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieRefTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assume.assumeTrue; -import tech.pegasys.pantheon.testutil.JsonTestParameters; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.testutil.JsonTestParameters; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.Collection; import java.util.function.Function; diff --git a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieRefTestCaseSpec.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieRefTestCaseSpec.java similarity index 96% rename from ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieRefTestCaseSpec.java rename to ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieRefTestCaseSpec.java index 254b1ce0b1..3d68d1dfd6 100644 --- a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieRefTestCaseSpec.java +++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieRefTestCaseSpec.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.ethereum.trie; +package org.hyperledger.besu.ethereum.trie; import static java.nio.charset.StandardCharsets.UTF_8; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; diff --git a/gradle/check-licenses.gradle b/gradle/check-licenses.gradle index 67a1b0ffba..89466ef8bb 100644 --- a/gradle/check-licenses.gradle +++ b/gradle/check-licenses.gradle @@ -126,13 +126,13 @@ downloadLicenses { ] licenses = [ - (group('pantheon')) : apache, - (group('pantheon.ethereum.api')) : apache, - (group('pantheon.consensus')) : apache, - (group('pantheon.ethereum')) : apache, - (group('pantheon.metrics')) : apache, - (group('pantheon.plugins')) : apache, - (group('pantheon.services')) : apache, + (group('besu')) : apache, + (group('besu.ethereum.api')) : apache, + (group('besu.consensus')) : apache, + (group('besu.ethereum')) : apache, + (group('besu.metrics')) : apache, + (group('besu.plugins')) : apache, + (group('besu.services')) : apache, // https://checkerframework.org/manual/#license // The more permissive MIT License applies to code that you might want diff --git a/metrics/core/build.gradle b/metrics/core/build.gradle index 660384b27d..5765a9671e 100644 --- a/metrics/core/build.gradle +++ b/metrics/core/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-metrics-core' + baseName 'besu-metrics-core' manifest { attributes( 'Specification-Title': baseName, diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/PantheonMetricCategory.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/BesuMetricCategory.java similarity index 72% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/PantheonMetricCategory.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/BesuMetricCategory.java index e57dc77214..ccc6b22021 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/PantheonMetricCategory.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/BesuMetricCategory.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.metrics; +package org.hyperledger.besu.metrics; -import tech.pegasys.pantheon.plugin.services.metrics.MetricCategory; +import org.hyperledger.besu.plugin.services.metrics.MetricCategory; import java.util.EnumSet; import java.util.Optional; @@ -20,7 +20,7 @@ import java.util.Set; import com.google.common.collect.ImmutableSet; -public enum PantheonMetricCategory implements MetricCategory { +public enum BesuMetricCategory implements MetricCategory { BLOCKCHAIN("blockchain"), ETHEREUM("ethereum", false), EXECUTORS("executors"), @@ -34,31 +34,31 @@ public enum PantheonMetricCategory implements MetricCategory { SYNCHRONIZER("synchronizer"), TRANSACTION_POOL("transaction_pool"); - private static final Optional PANTHEON_PREFIX = Optional.of("pantheon_"); + private static final Optional BESU_PREFIX = Optional.of("besu_"); public static final Set DEFAULT_METRIC_CATEGORIES; static { // Why not ROCKSDB and KVSTORE_ROCKSDB_STATS? They hurt performance under load. - final EnumSet pantheonCategories = + final EnumSet besuCategories = EnumSet.complementOf(EnumSet.of(KVSTORE_ROCKSDB, KVSTORE_ROCKSDB_STATS)); DEFAULT_METRIC_CATEGORIES = ImmutableSet.builder() - .addAll(pantheonCategories) + .addAll(besuCategories) .addAll(EnumSet.allOf(StandardMetricCategory.class)) .build(); } private final String name; - private final boolean pantheonSpecific; + private final boolean besuSpecific; - PantheonMetricCategory(final String name) { + BesuMetricCategory(final String name) { this(name, true); } - PantheonMetricCategory(final String name, final boolean pantheonSpecific) { + BesuMetricCategory(final String name, final boolean besuSpecific) { this.name = name; - this.pantheonSpecific = pantheonSpecific; + this.besuSpecific = besuSpecific; } @Override @@ -68,6 +68,6 @@ public enum PantheonMetricCategory implements MetricCategory { @Override public Optional getApplicationPrefix() { - return pantheonSpecific ? PANTHEON_PREFIX : Optional.empty(); + return besuSpecific ? BESU_PREFIX : Optional.empty(); } } diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/ObservableMetricsSystem.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/ObservableMetricsSystem.java similarity index 82% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/ObservableMetricsSystem.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/ObservableMetricsSystem.java index 002d9f88e7..4151d9eafe 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/ObservableMetricsSystem.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/ObservableMetricsSystem.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.metrics; +package org.hyperledger.besu.metrics; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.MetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.MetricCategory; import java.util.stream.Stream; diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/Observation.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/Observation.java similarity index 95% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/Observation.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/Observation.java index c7c6c422ca..d5c30066b1 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/Observation.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/Observation.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.metrics; +package org.hyperledger.besu.metrics; -import tech.pegasys.pantheon.plugin.services.metrics.MetricCategory; +import org.hyperledger.besu.plugin.services.metrics.MetricCategory; import java.util.List; import java.util.Objects; diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/RunnableCounter.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/RunnableCounter.java similarity index 94% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/RunnableCounter.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/RunnableCounter.java index 548de622d0..e75ef29868 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/RunnableCounter.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/RunnableCounter.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.metrics; +package org.hyperledger.besu.metrics; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.Counter; import java.util.concurrent.atomic.AtomicLong; diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/StandardMetricCategory.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/StandardMetricCategory.java similarity index 90% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/StandardMetricCategory.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/StandardMetricCategory.java index a45239e6c6..1417dfdbb7 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/StandardMetricCategory.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/StandardMetricCategory.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.metrics; +package org.hyperledger.besu.metrics; -import tech.pegasys.pantheon.plugin.services.metrics.MetricCategory; +import org.hyperledger.besu.plugin.services.metrics.MetricCategory; import java.util.Optional; diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/noop/NoOpCounter.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpCounter.java similarity index 87% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/noop/NoOpCounter.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpCounter.java index 96e50beb52..1d4e68d504 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/noop/NoOpCounter.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpCounter.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.metrics.noop; +package org.hyperledger.besu.metrics.noop; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.Counter; class NoOpCounter implements Counter { diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/noop/NoOpMetricsSystem.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystem.java similarity index 89% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/noop/NoOpMetricsSystem.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystem.java index faa2807b19..e6d01b175d 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/noop/NoOpMetricsSystem.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystem.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.metrics.noop; - -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; -import tech.pegasys.pantheon.metrics.Observation; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.plugin.services.metrics.MetricCategory; -import tech.pegasys.pantheon.plugin.services.metrics.OperationTimer; +package org.hyperledger.besu.metrics.noop; + +import org.hyperledger.besu.metrics.ObservableMetricsSystem; +import org.hyperledger.besu.metrics.Observation; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.plugin.services.metrics.MetricCategory; +import org.hyperledger.besu.plugin.services.metrics.OperationTimer; import java.util.function.DoubleSupplier; import java.util.stream.Stream; diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/CurrentValueCollector.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/CurrentValueCollector.java similarity index 96% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/CurrentValueCollector.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/CurrentValueCollector.java index 5cffb0f7cd..5d2a0be87f 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/CurrentValueCollector.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/CurrentValueCollector.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.metrics.prometheus; +package org.hyperledger.besu.metrics.prometheus; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/MetricsConfiguration.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsConfiguration.java similarity index 96% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/MetricsConfiguration.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsConfiguration.java index 265635d361..ef8b281025 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/MetricsConfiguration.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsConfiguration.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.metrics.prometheus; +package org.hyperledger.besu.metrics.prometheus; -import static tech.pegasys.pantheon.metrics.PantheonMetricCategory.DEFAULT_METRIC_CATEGORIES; +import static org.hyperledger.besu.metrics.BesuMetricCategory.DEFAULT_METRIC_CATEGORIES; -import tech.pegasys.pantheon.plugin.services.metrics.MetricCategory; +import org.hyperledger.besu.plugin.services.metrics.MetricCategory; import java.util.Arrays; import java.util.Collection; @@ -188,7 +188,7 @@ public class MetricsConfiguration { private int pushPort = DEFAULT_METRICS_PUSH_PORT; private String pushHost = DEFAULT_METRICS_PUSH_HOST; private int pushInterval = 15; - private String prometheusJob = "pantheon-client"; + private String prometheusJob = "besu-client"; private List hostsWhitelist = Arrays.asList("localhost", "127.0.0.1"); private boolean timersEnabled = DEFAULT_TIMERS_ENABLED; diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/MetricsHttpService.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsHttpService.java similarity index 98% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/MetricsHttpService.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsHttpService.java index 085683d968..15cda45bb6 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/MetricsHttpService.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsHttpService.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.metrics.prometheus; +package org.hyperledger.besu.metrics.prometheus; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Streams.stream; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/MetricsPushGatewayService.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsPushGatewayService.java similarity index 97% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/MetricsPushGatewayService.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsPushGatewayService.java index 4f6ed16cc2..dd31b3829c 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/MetricsPushGatewayService.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsPushGatewayService.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.metrics.prometheus; +package org.hyperledger.besu.metrics.prometheus; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.io.IOException; import java.util.Optional; diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/MetricsService.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsService.java similarity index 93% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/MetricsService.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsService.java index fee0c6beb6..13e0b76652 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/MetricsService.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsService.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.metrics.prometheus; +package org.hyperledger.besu.metrics.prometheus; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; import java.util.Optional; import java.util.concurrent.CompletableFuture; diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/PrometheusCounter.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusCounter.java similarity index 88% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/PrometheusCounter.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusCounter.java index e62a00d0a9..c64f114c7f 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/PrometheusCounter.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusCounter.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.metrics.prometheus; +package org.hyperledger.besu.metrics.prometheus; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; class PrometheusCounter implements LabelledMetric { diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/PrometheusMetricsSystem.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystem.java similarity index 91% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/PrometheusMetricsSystem.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystem.java index 60f5a30945..5e2f2dc3e0 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/PrometheusMetricsSystem.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystem.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.metrics.prometheus; +package org.hyperledger.besu.metrics.prometheus; import static java.util.Arrays.asList; import static java.util.Collections.singleton; -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; -import tech.pegasys.pantheon.metrics.Observation; -import tech.pegasys.pantheon.metrics.StandardMetricCategory; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.plugin.services.metrics.MetricCategory; -import tech.pegasys.pantheon.plugin.services.metrics.OperationTimer; +import org.hyperledger.besu.metrics.ObservableMetricsSystem; +import org.hyperledger.besu.metrics.Observation; +import org.hyperledger.besu.metrics.StandardMetricCategory; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.plugin.services.metrics.MetricCategory; +import org.hyperledger.besu.plugin.services.metrics.OperationTimer; import java.util.ArrayList; import java.util.Collection; @@ -52,7 +52,7 @@ public class PrometheusMetricsSystem implements ObservableMetricsSystem { private final Map> collectors = new ConcurrentHashMap<>(); private final CollectorRegistry registry = new CollectorRegistry(true); - private final Map> + private final Map> cachedCounters = new ConcurrentHashMap<>(); private final Map> cachedTimers = new ConcurrentHashMap<>(); @@ -92,12 +92,11 @@ public class PrometheusMetricsSystem implements ObservableMetricsSystem { } @Override - public LabelledMetric - createLabelledCounter( - final MetricCategory category, - final String name, - final String help, - final String... labelNames) { + public LabelledMetric createLabelledCounter( + final MetricCategory category, + final String name, + final String help, + final String... labelNames) { final String metricName = convertToPrometheusName(category, name); return cachedCounters.computeIfAbsent( metricName, diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/PrometheusTimer.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusTimer.java similarity index 84% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/PrometheusTimer.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusTimer.java index c450ed3ee9..266e702007 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/prometheus/PrometheusTimer.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusTimer.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.metrics.prometheus; +package org.hyperledger.besu.metrics.prometheus; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.plugin.services.metrics.OperationTimer; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.plugin.services.metrics.OperationTimer; import io.prometheus.client.Summary; diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/vertx/PoolMetricsAdapter.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/PoolMetricsAdapter.java similarity index 85% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/vertx/PoolMetricsAdapter.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/PoolMetricsAdapter.java index ac698d9af6..207da75e54 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/vertx/PoolMetricsAdapter.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/PoolMetricsAdapter.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.metrics.vertx; +package org.hyperledger.besu.metrics.vertx; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; import io.vertx.core.spi.metrics.PoolMetrics; @@ -29,7 +29,7 @@ final class PoolMetricsAdapter implements PoolMetrics { submittedCounter = metricsSystem .createLabelledCounter( - PantheonMetricCategory.NETWORK, + BesuMetricCategory.NETWORK, "vertx_worker_pool_submitted_total", "Total number of tasks submitted to the Vertx worker pool", "poolType", @@ -39,7 +39,7 @@ final class PoolMetricsAdapter implements PoolMetrics { completedCounter = metricsSystem .createLabelledCounter( - PantheonMetricCategory.NETWORK, + BesuMetricCategory.NETWORK, "vertx_worker_pool_completed_total", "Total number of tasks completed by the Vertx worker pool", "poolType", @@ -49,7 +49,7 @@ final class PoolMetricsAdapter implements PoolMetrics { rejectedCounter = metricsSystem .createLabelledCounter( - PantheonMetricCategory.NETWORK, + BesuMetricCategory.NETWORK, "vertx_worker_pool_rejected_total", "Total number of tasks rejected by the Vertx worker pool", "poolType", diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/vertx/VertxMetricsAdapter.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/VertxMetricsAdapter.java similarity index 91% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/vertx/VertxMetricsAdapter.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/VertxMetricsAdapter.java index d413149c0b..92f552a992 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/vertx/VertxMetricsAdapter.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/VertxMetricsAdapter.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.metrics.vertx; +package org.hyperledger.besu.metrics.vertx; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; import io.vertx.core.spi.metrics.PoolMetrics; import io.vertx.core.spi.metrics.VertxMetrics; diff --git a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/vertx/VertxMetricsAdapterFactory.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/VertxMetricsAdapterFactory.java similarity index 91% rename from metrics/core/src/main/java/tech/pegasys/pantheon/metrics/vertx/VertxMetricsAdapterFactory.java rename to metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/VertxMetricsAdapterFactory.java index 1f27b0b1a6..a409cae42e 100644 --- a/metrics/core/src/main/java/tech/pegasys/pantheon/metrics/vertx/VertxMetricsAdapterFactory.java +++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/VertxMetricsAdapterFactory.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.metrics.vertx; +package org.hyperledger.besu.metrics.vertx; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; import io.vertx.core.VertxOptions; import io.vertx.core.spi.VertxMetricsFactory; diff --git a/metrics/core/src/test-support/java/tech/pegasys/pantheon/metrics/StubMetricsSystem.java b/metrics/core/src/test-support/java/org/hyperledger/besu/metrics/StubMetricsSystem.java similarity index 90% rename from metrics/core/src/test-support/java/tech/pegasys/pantheon/metrics/StubMetricsSystem.java rename to metrics/core/src/test-support/java/org/hyperledger/besu/metrics/StubMetricsSystem.java index b113d51cbf..1fe26d22f3 100644 --- a/metrics/core/src/test-support/java/tech/pegasys/pantheon/metrics/StubMetricsSystem.java +++ b/metrics/core/src/test-support/java/org/hyperledger/besu/metrics/StubMetricsSystem.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.metrics; +package org.hyperledger.besu.metrics; import static java.util.Arrays.asList; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.plugin.services.metrics.MetricCategory; -import tech.pegasys.pantheon.plugin.services.metrics.OperationTimer; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.plugin.services.metrics.MetricCategory; +import org.hyperledger.besu.plugin.services.metrics.OperationTimer; import java.util.HashMap; import java.util.List; diff --git a/metrics/core/src/test/java/tech/pegasys/pantheon/metrics/noop/NoOpMetricsSystemTest.java b/metrics/core/src/test/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystemTest.java similarity index 88% rename from metrics/core/src/test/java/tech/pegasys/pantheon/metrics/noop/NoOpMetricsSystemTest.java rename to metrics/core/src/test/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystemTest.java index 92cb8c82f5..e56616016c 100644 --- a/metrics/core/src/test/java/tech/pegasys/pantheon/metrics/noop/NoOpMetricsSystemTest.java +++ b/metrics/core/src/test/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystemTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.metrics.noop; +package org.hyperledger.besu.metrics.noop; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import tech.pegasys.pantheon.metrics.StandardMetricCategory; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.plugin.services.metrics.OperationTimer; +import org.hyperledger.besu.metrics.StandardMetricCategory; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.plugin.services.metrics.OperationTimer; import org.junit.Test; diff --git a/metrics/core/src/test/java/tech/pegasys/pantheon/metrics/prometheus/MetricsHttpServiceTest.java b/metrics/core/src/test/java/org/hyperledger/besu/metrics/prometheus/MetricsHttpServiceTest.java similarity index 98% rename from metrics/core/src/test/java/tech/pegasys/pantheon/metrics/prometheus/MetricsHttpServiceTest.java rename to metrics/core/src/test/java/org/hyperledger/besu/metrics/prometheus/MetricsHttpServiceTest.java index 3d0218fe0c..a2f395aad6 100644 --- a/metrics/core/src/test/java/tech/pegasys/pantheon/metrics/prometheus/MetricsHttpServiceTest.java +++ b/metrics/core/src/test/java/org/hyperledger/besu/metrics/prometheus/MetricsHttpServiceTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.metrics.prometheus; +package org.hyperledger.besu.metrics.prometheus; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.util.NetworkUtility.urlForSocketAddress; +import static org.hyperledger.besu.util.NetworkUtility.urlForSocketAddress; import java.net.InetSocketAddress; import java.util.Properties; diff --git a/metrics/core/src/test/java/tech/pegasys/pantheon/metrics/prometheus/PrometheusMetricsSystemTest.java b/metrics/core/src/test/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystemTest.java similarity index 90% rename from metrics/core/src/test/java/tech/pegasys/pantheon/metrics/prometheus/PrometheusMetricsSystemTest.java rename to metrics/core/src/test/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystemTest.java index a594bee1db..041f088fb7 100644 --- a/metrics/core/src/test/java/tech/pegasys/pantheon/metrics/prometheus/PrometheusMetricsSystemTest.java +++ b/metrics/core/src/test/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystemTest.java @@ -10,27 +10,27 @@ * 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. */ -package tech.pegasys.pantheon.metrics.prometheus; +package org.hyperledger.besu.metrics.prometheus; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static tech.pegasys.pantheon.metrics.PantheonMetricCategory.DEFAULT_METRIC_CATEGORIES; -import static tech.pegasys.pantheon.metrics.PantheonMetricCategory.NETWORK; -import static tech.pegasys.pantheon.metrics.PantheonMetricCategory.PEERS; -import static tech.pegasys.pantheon.metrics.PantheonMetricCategory.RPC; -import static tech.pegasys.pantheon.metrics.StandardMetricCategory.JVM; - -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; -import tech.pegasys.pantheon.metrics.Observation; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.plugin.services.metrics.OperationTimer; +import static org.hyperledger.besu.metrics.BesuMetricCategory.DEFAULT_METRIC_CATEGORIES; +import static org.hyperledger.besu.metrics.BesuMetricCategory.NETWORK; +import static org.hyperledger.besu.metrics.BesuMetricCategory.PEERS; +import static org.hyperledger.besu.metrics.BesuMetricCategory.RPC; +import static org.hyperledger.besu.metrics.StandardMetricCategory.JVM; + +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.metrics.ObservableMetricsSystem; +import org.hyperledger.besu.metrics.Observation; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.plugin.services.metrics.OperationTimer; import java.util.Comparator; @@ -190,7 +190,7 @@ public class PrometheusMetricsSystemTest { public void shouldOnlyObserveEnabledMetrics() { final MetricsConfiguration metricsConfiguration = MetricsConfiguration.builder() - .metricCategories(ImmutableSet.of(PantheonMetricCategory.RPC)) + .metricCategories(ImmutableSet.of(BesuMetricCategory.RPC)) .enabled(true) .build(); final ObservableMetricsSystem localMetricSystem = diff --git a/metrics/rocksdb/build.gradle b/metrics/rocksdb/build.gradle index c4419d5a1d..3496921b2e 100644 --- a/metrics/rocksdb/build.gradle +++ b/metrics/rocksdb/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-metrics-rocksdb' + baseName 'besu-metrics-rocksdb' manifest { attributes( 'Specification-Title': baseName, diff --git a/metrics/rocksdb/src/main/java/tech/pegasys/pantheon/metrics/rocksdb/RocksDBStats.java b/metrics/rocksdb/src/main/java/org/hyperledger/besu/metrics/rocksdb/RocksDBStats.java similarity index 97% rename from metrics/rocksdb/src/main/java/tech/pegasys/pantheon/metrics/rocksdb/RocksDBStats.java rename to metrics/rocksdb/src/main/java/org/hyperledger/besu/metrics/rocksdb/RocksDBStats.java index cd363ebb5a..2cc36f2389 100644 --- a/metrics/rocksdb/src/main/java/tech/pegasys/pantheon/metrics/rocksdb/RocksDBStats.java +++ b/metrics/rocksdb/src/main/java/org/hyperledger/besu/metrics/rocksdb/RocksDBStats.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.metrics.rocksdb; +package org.hyperledger.besu.metrics.rocksdb; -import static tech.pegasys.pantheon.metrics.PantheonMetricCategory.KVSTORE_ROCKSDB_STATS; +import static org.hyperledger.besu.metrics.BesuMetricCategory.KVSTORE_ROCKSDB_STATS; -import tech.pegasys.pantheon.metrics.prometheus.PrometheusMetricsSystem; +import org.hyperledger.besu.metrics.prometheus.PrometheusMetricsSystem; import java.util.Arrays; import java.util.Collections; diff --git a/nat/build.gradle b/nat/build.gradle index 99e1d01699..3122ebd6c6 100644 --- a/nat/build.gradle +++ b/nat/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-nat' + baseName 'besu-nat' manifest { attributes( 'Specification-Title': baseName, diff --git a/nat/src/main/java/tech/pegasys/pantheon/nat/NatMethod.java b/nat/src/main/java/org/hyperledger/besu/nat/NatMethod.java similarity index 96% rename from nat/src/main/java/tech/pegasys/pantheon/nat/NatMethod.java rename to nat/src/main/java/org/hyperledger/besu/nat/NatMethod.java index 3c2b1cabae..7d86f336a8 100644 --- a/nat/src/main/java/tech/pegasys/pantheon/nat/NatMethod.java +++ b/nat/src/main/java/org/hyperledger/besu/nat/NatMethod.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.nat; +package org.hyperledger.besu.nat; public enum NatMethod { UPNP, diff --git a/nat/src/main/java/tech/pegasys/pantheon/nat/upnp/PantheonUpnpRegistryListener.java b/nat/src/main/java/org/hyperledger/besu/nat/upnp/BesuUpnpRegistryListener.java similarity index 93% rename from nat/src/main/java/tech/pegasys/pantheon/nat/upnp/PantheonUpnpRegistryListener.java rename to nat/src/main/java/org/hyperledger/besu/nat/upnp/BesuUpnpRegistryListener.java index a007f7d0c9..47556bfe1c 100644 --- a/nat/src/main/java/tech/pegasys/pantheon/nat/upnp/PantheonUpnpRegistryListener.java +++ b/nat/src/main/java/org/hyperledger/besu/nat/upnp/BesuUpnpRegistryListener.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.nat.upnp; +package org.hyperledger.besu.nat.upnp; import org.jupnp.model.meta.LocalDevice; import org.jupnp.model.meta.RemoteDevice; import org.jupnp.registry.Registry; import org.jupnp.registry.RegistryListener; -class PantheonUpnpRegistryListener implements RegistryListener { +class BesuUpnpRegistryListener implements RegistryListener { @Override public void remoteDeviceDiscoveryStarted(final Registry registry, final RemoteDevice device) {} diff --git a/nat/src/main/java/tech/pegasys/pantheon/nat/upnp/PantheonUpnpServiceConfiguration.java b/nat/src/main/java/org/hyperledger/besu/nat/upnp/BesuUpnpServiceConfiguration.java similarity index 97% rename from nat/src/main/java/tech/pegasys/pantheon/nat/upnp/PantheonUpnpServiceConfiguration.java rename to nat/src/main/java/org/hyperledger/besu/nat/upnp/BesuUpnpServiceConfiguration.java index caeb91e64f..191933d814 100644 --- a/nat/src/main/java/tech/pegasys/pantheon/nat/upnp/PantheonUpnpServiceConfiguration.java +++ b/nat/src/main/java/org/hyperledger/besu/nat/upnp/BesuUpnpServiceConfiguration.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.nat.upnp; +package org.hyperledger.besu.nat.upnp; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.Executor; @@ -47,7 +47,7 @@ import org.jupnp.transport.spi.SOAPActionProcessor; import org.jupnp.transport.spi.StreamClient; import org.jupnp.transport.spi.StreamServer; -class PantheonUpnpServiceConfiguration implements UpnpServiceConfiguration { +class BesuUpnpServiceConfiguration implements UpnpServiceConfiguration { private final ThreadPoolExecutor executorService; private final DeviceDescriptorBinder deviceDescriptorBinderUDA10; @@ -56,13 +56,13 @@ class PantheonUpnpServiceConfiguration implements UpnpServiceConfiguration { private final int multicastResponsePort; private final Namespace namespace; - PantheonUpnpServiceConfiguration() { + BesuUpnpServiceConfiguration() { this( NetworkAddressFactoryImpl.DEFAULT_TCP_HTTP_LISTEN_PORT, NetworkAddressFactoryImpl.DEFAULT_MULTICAST_RESPONSE_LISTEN_PORT); } - private PantheonUpnpServiceConfiguration( + private BesuUpnpServiceConfiguration( final int streamListenPort, final int multicastResponsePort) { executorService = new ThreadPoolExecutor( diff --git a/nat/src/main/java/tech/pegasys/pantheon/nat/upnp/OkHttpStreamClient.java b/nat/src/main/java/org/hyperledger/besu/nat/upnp/OkHttpStreamClient.java similarity index 98% rename from nat/src/main/java/tech/pegasys/pantheon/nat/upnp/OkHttpStreamClient.java rename to nat/src/main/java/org/hyperledger/besu/nat/upnp/OkHttpStreamClient.java index 64aaaa09f6..a367ce0913 100644 --- a/nat/src/main/java/tech/pegasys/pantheon/nat/upnp/OkHttpStreamClient.java +++ b/nat/src/main/java/org/hyperledger/besu/nat/upnp/OkHttpStreamClient.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.nat.upnp; +package org.hyperledger.besu.nat.upnp; import java.util.concurrent.Callable; diff --git a/nat/src/main/java/tech/pegasys/pantheon/nat/upnp/UpnpNatManager.java b/nat/src/main/java/org/hyperledger/besu/nat/upnp/UpnpNatManager.java similarity index 99% rename from nat/src/main/java/tech/pegasys/pantheon/nat/upnp/UpnpNatManager.java rename to nat/src/main/java/org/hyperledger/besu/nat/upnp/UpnpNatManager.java index 09fbac527b..fb90b25e35 100644 --- a/nat/src/main/java/tech/pegasys/pantheon/nat/upnp/UpnpNatManager.java +++ b/nat/src/main/java/org/hyperledger/besu/nat/upnp/UpnpNatManager.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.nat.upnp; +package org.hyperledger.besu.nat.upnp; import java.util.ArrayList; import java.util.HashMap; @@ -78,7 +78,7 @@ public class UpnpNatManager { // https://github.com/jupnp/jupnp/pull/117 // However, this fix has not made it into any releases yet. // TODO: once a new release is available, remove this @Override - this(new UpnpServiceImpl(new PantheonUpnpServiceConfiguration())); + this(new UpnpServiceImpl(new BesuUpnpServiceConfiguration())); } /** @@ -94,7 +94,7 @@ public class UpnpNatManager { // registry listener to observe new devices and look for specific services registryListener = - new PantheonUpnpRegistryListener() { + new BesuUpnpRegistryListener() { @Override public void remoteDeviceAdded(final Registry registry, final RemoteDevice device) { LOG.debug("UPnP Device discovered: " + device.getDetails().getFriendlyName()); diff --git a/nat/src/test/java/tech/pegasys/pantheon/nat/upnp/UpnpNatManagerTest.java b/nat/src/test/java/org/hyperledger/besu/nat/upnp/UpnpNatManagerTest.java similarity index 99% rename from nat/src/test/java/tech/pegasys/pantheon/nat/upnp/UpnpNatManagerTest.java rename to nat/src/test/java/org/hyperledger/besu/nat/upnp/UpnpNatManagerTest.java index 6ecf35a360..bec558927a 100644 --- a/nat/src/test/java/tech/pegasys/pantheon/nat/upnp/UpnpNatManagerTest.java +++ b/nat/src/test/java/org/hyperledger/besu/nat/upnp/UpnpNatManagerTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.nat.upnp; +package org.hyperledger.besu.nat.upnp; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/plugin-api/build.gradle b/plugin-api/build.gradle index ba1f8d8cc1..d8640b0a36 100644 --- a/plugin-api/build.gradle +++ b/plugin-api/build.gradle @@ -56,17 +56,17 @@ Calculated : ${currentHash} tasks.register('checkAPIChanges', FileStateChecker) { description = "Checks that the API for the Plugin-API project does not change without deliberate thought" files = sourceSets.main.allJava.files - knownHash = 'FzYuZLAwab2uzCEqdVvkpUL5lih3M4MUKT+qXgGmB7I=' + knownHash = 'Qnc8VXZ1+kdpAlp2m+f5Kuxb1rwoxD74iBOGFpdDQ8Y=' } check.dependsOn('checkAPIChanges') publishing { publications { mavenJava(MavenPublication) { - groupId 'tech.pegasys.pantheon' + groupId 'org.hyperledger.besu' pom { - name = 'Pantheon Plugins Library' - description = 'Core Plugins Libraries for Pantheon' + name = 'Besu Plugins Library' + description = 'Core Plugins Libraries for Besu' } } } diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/PantheonContext.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/BesuContext.java similarity index 86% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/PantheonContext.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/BesuContext.java index eb2e6b1d18..c8c85f2d12 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/PantheonContext.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/BesuContext.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.plugin; +package org.hyperledger.besu.plugin; import java.util.Optional; -/** Allows plugins to access Pantheon services. */ -public interface PantheonContext { +/** Allows plugins to access Besu services. */ +public interface BesuContext { /** * Get the requested service, if it is available. There are a number of reasons that a service may @@ -23,8 +23,8 @@ public interface PantheonContext { * *
    *
  • The service may not have started yet. Most services are not available before the {@link - * PantheonPlugin#start()} method is called - *
  • The service is not supported by this version of Pantheon + * BesuPlugin#start()} method is called + *
  • The service is not supported by this version of Besu *
  • The service may not be applicable to the current configuration. For example some services * may only be available when a proof of authority network is in use *
diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/PantheonPlugin.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/BesuPlugin.java similarity index 58% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/PantheonPlugin.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/BesuPlugin.java index 6ff5e32125..9a25ca7ed2 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/PantheonPlugin.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/BesuPlugin.java @@ -10,41 +10,41 @@ * 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. */ -package tech.pegasys.pantheon.plugin; +package org.hyperledger.besu.plugin; /** - * Base interface for Pantheon plugins. + * Base interface for Besu plugins. * *

Plugins are discovered and loaded using {@link java.util.ServiceLoader} from jar files within - * Pantheon's plugin directory. See the {@link java.util.ServiceLoader} documentation for how to + * Besu's plugin directory. See the {@link java.util.ServiceLoader} documentation for how to * register plugins. */ -public interface PantheonPlugin { +public interface BesuPlugin { /** - * Called when the plugin is first registered with Pantheon. Plugins are registered very early in - * the Pantheon life-cycle and should use this callback to register any command line options - * required via the PicoCLIOptions service. + * Called when the plugin is first registered with Besu. Plugins are registered very early in the + * Besu life-cycle and should use this callback to register any command line options required via + * the PicoCLIOptions service. * *

The context parameter should be stored in a field in the plugin. This is the - * only time it will be provided to the plugin and is how the plugin will interact with Pantheon. + * only time it will be provided to the plugin and is how the plugin will interact with Besu. * *

Typically the plugin will not begin operation until the {@link #start()} method is called. * - * @param context the context that provides access to Pantheon services. + * @param context the context that provides access to Besu services. */ - void register(PantheonContext context); + void register(BesuContext context); /** - * Called once Pantheon has loaded configuration and is starting up. The plugin should begin - * operation, including registering any event listener with Pantheon services and starting any + * Called once Besu has loaded configuration and is starting up. The plugin should begin + * operation, including registering any event listener with Besu services and starting any * background threads the plugin requires. */ void start(); /** - * Called when the plugin is being stopped. This method will be called as part of Pantheon - * shutting down but may also be called at other times to disable the plugin. + * Called when the plugin is being stopped. This method will be called as part of Besu shutting + * down but may also be called at other times to disable the plugin. * *

The plugin should remove any registered listeners and stop any background threads it * started. diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/Unstable.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/Unstable.java similarity index 96% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/Unstable.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/Unstable.java index 511c71c61c..4d7cf4c300 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/Unstable.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/Unstable.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.plugin; +package org.hyperledger.besu.plugin; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Address.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Address.java similarity index 89% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Address.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Address.java index 3f99319551..915941d57f 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/Address.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Address.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.plugin.data; +package org.hyperledger.besu.plugin.data; -import tech.pegasys.pantheon.plugin.Unstable; +import org.hyperledger.besu.plugin.Unstable; /** An interface for {@link BinaryData} that also represents an Ethereum account address. */ @Unstable diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/BinaryData.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BinaryData.java similarity index 94% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/BinaryData.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BinaryData.java index 3cc243f863..b249a74fdf 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/BinaryData.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BinaryData.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.plugin.data; +package org.hyperledger.besu.plugin.data; -import tech.pegasys.pantheon.plugin.Unstable; +import org.hyperledger.besu.plugin.Unstable; /** Super class for all types that are ultimately represented by binary data. */ @Unstable diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/BlockHeader.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BlockHeader.java similarity index 98% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/BlockHeader.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BlockHeader.java index 1cf2e71167..be7a8a8ee3 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/data/BlockHeader.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BlockHeader.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.plugin.data; +package org.hyperledger.besu.plugin.data; -import tech.pegasys.pantheon.plugin.Unstable; +import org.hyperledger.besu.plugin.Unstable; /** * The minimum set of data for a BlockHeader, as defined in the getEnclaveUrl(); } diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonEvents.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuEvents.java similarity index 89% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonEvents.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuEvents.java index 228401179b..dc19463c69 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PantheonEvents.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuEvents.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services; +package org.hyperledger.besu.plugin.services; -import tech.pegasys.pantheon.plugin.Unstable; -import tech.pegasys.pantheon.plugin.data.BlockHeader; -import tech.pegasys.pantheon.plugin.data.SyncStatus; -import tech.pegasys.pantheon.plugin.data.Transaction; +import org.hyperledger.besu.plugin.Unstable; +import org.hyperledger.besu.plugin.data.BlockHeader; +import org.hyperledger.besu.plugin.data.SyncStatus; +import org.hyperledger.besu.plugin.data.Transaction; /** - * This service allows plugins to attach to various events during the normal operation of Pantheon. + * This service allows plugins to attach to various events during the normal operation of Besu. * *

Currently supported events * @@ -33,7 +33,7 @@ import tech.pegasys.pantheon.plugin.data.Transaction; * */ @Unstable -public interface PantheonEvents { +public interface BesuEvents { /** * Add a listener watching new blocks propagated. @@ -44,7 +44,7 @@ public interface PantheonEvents { long addBlockPropagatedListener(BlockPropagatedListener blockPropagatedListener); /** - * Remove the blockAdded listener from pantheon notifications. + * Remove the blockAdded listener from besu notifications. * * @param listenerIdentifier The instance that was returned from addBlockAddedListener; */ @@ -60,7 +60,7 @@ public interface PantheonEvents { long addTransactionAddedListener(TransactionAddedListener transactionAddedListener); /** - * Remove the blockAdded listener from pantheon notifications. + * Remove the blockAdded listener from besu notifications. * * @param listenerIdentifier The instance that was returned from addTransactionAddedListener; */ @@ -76,7 +76,7 @@ public interface PantheonEvents { long addTransactionDroppedListener(TransactionDroppedListener transactionDroppedListener); /** - * Remove the transactionDropped listener from pantheon notifications. + * Remove the transactionDropped listener from besu notifications. * * @param listenerIdentifier The instance that was returned from addTransactionDroppedListener; */ @@ -91,7 +91,7 @@ public interface PantheonEvents { long addSyncStatusListener(SyncStatusListener syncStatusListener); /** - * Remove the logs listener from pantheon notifications. + * Remove the logs listener from besu notifications. * * @param listenerIdentifier The instance that was returned from addTransactionDroppedListener; */ diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/MetricsSystem.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/MetricsSystem.java similarity index 93% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/MetricsSystem.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/services/MetricsSystem.java index bb1cef4843..3ce2ed8ebb 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/MetricsSystem.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/MetricsSystem.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services; +package org.hyperledger.besu.plugin.services; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.plugin.services.metrics.MetricCategory; -import tech.pegasys.pantheon.plugin.services.metrics.OperationTimer; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.plugin.services.metrics.MetricCategory; +import org.hyperledger.besu.plugin.services.metrics.OperationTimer; import java.util.function.DoubleSupplier; import java.util.function.IntSupplier; diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PicoCLIOptions.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PicoCLIOptions.java similarity index 81% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PicoCLIOptions.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PicoCLIOptions.java index f6814ddc5b..7b8cc2004f 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/PicoCLIOptions.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PicoCLIOptions.java @@ -10,24 +10,24 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services; +package org.hyperledger.besu.plugin.services; /** - * A service that plugins can use to add CLI options and commands to the PantheonCommand. The - * PicoCLI library annotations will be inspected and the object will be passed into a + * A service that plugins can use to add CLI options and commands to the BesuCommand. The PicoCLI + * library annotations will be inspected and the object will be passed into a * picocli.CommandLine.addMixin call. * *

This service will be available during the registration callbacks. * *

CLI arguments should conform to the CLI-STYLE-GUIDE.md + * href="https://github.com/hyperledger/besu/blob/master/CLI-STYLE-GUIDE.md">CLI-STYLE-GUIDE.md * conventions. */ public interface PicoCLIOptions { /** * During the registration callback plugins can register CLI options that should be added to - * Pantheon's CLI startup. + * Besu's CLI startup. * * @param namespace A namespace prefix. All registered options must start with this prefix * @param optionObject The instance of the object to be inspected. PicoCLI will reflect the fields diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/StorageService.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/StorageService.java similarity index 86% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/StorageService.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/services/StorageService.java index 9a1efde870..acc7f6f377 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/StorageService.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/StorageService.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services; +package org.hyperledger.besu.plugin.services; -import tech.pegasys.pantheon.plugin.Unstable; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageFactory; -import tech.pegasys.pantheon.plugin.services.storage.SegmentIdentifier; +import org.hyperledger.besu.plugin.Unstable; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageFactory; +import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier; import java.util.List; import java.util.Optional; diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/exception/StorageException.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/exception/StorageException.java similarity index 96% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/exception/StorageException.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/services/exception/StorageException.java index 745f6528b9..8a29a5c6d9 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/exception/StorageException.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/exception/StorageException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.exception; +package org.hyperledger.besu.plugin.services.exception; /** Base exception class for problems encountered in the domain for storage. */ public class StorageException extends RuntimeException { diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/Counter.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/Counter.java similarity index 94% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/Counter.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/Counter.java index 59be762e8f..b668bae331 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/Counter.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/Counter.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.metrics; +package org.hyperledger.besu.plugin.services.metrics; /** * A counter is a metric to track counts of events or running totals etc. The value of the counter diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/LabelledMetric.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/LabelledMetric.java similarity index 95% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/LabelledMetric.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/LabelledMetric.java index 239aa7510c..90f61e394c 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/LabelledMetric.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/LabelledMetric.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.metrics; +package org.hyperledger.besu.plugin.services.metrics; /** * A metric with labels associated. Values for the associated labels can be provided to access the diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/MetricCategory.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/MetricCategory.java similarity index 96% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/MetricCategory.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/MetricCategory.java index d7ed37c74a..f490f6a064 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/MetricCategory.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/MetricCategory.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.metrics; +package org.hyperledger.besu.plugin.services.metrics; import java.util.Optional; diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/MetricCategoryRegistry.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/MetricCategoryRegistry.java similarity index 95% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/MetricCategoryRegistry.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/MetricCategoryRegistry.java index bc4e3e2e84..093e5ed60e 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/MetricCategoryRegistry.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/MetricCategoryRegistry.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.metrics; +package org.hyperledger.besu.plugin.services.metrics; /** * Allow registration of {@link MetricCategory} instances so they are recognised by the metrics diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/OperationTimer.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/OperationTimer.java similarity index 95% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/OperationTimer.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/OperationTimer.java index 1a9eaee5b8..2e89ff0805 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/metrics/OperationTimer.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/OperationTimer.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.metrics; +package org.hyperledger.besu.plugin.services.metrics; import java.io.Closeable; diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorage.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorage.java similarity index 94% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorage.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorage.java index 44208522fc..50c78f44b4 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorage.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorage.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage; +package org.hyperledger.besu.plugin.services.storage; -import tech.pegasys.pantheon.plugin.Unstable; -import tech.pegasys.pantheon.plugin.services.exception.StorageException; +import org.hyperledger.besu.plugin.Unstable; +import org.hyperledger.besu.plugin.services.exception.StorageException; import java.io.Closeable; import java.util.Optional; diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorageFactory.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorageFactory.java similarity index 85% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorageFactory.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorageFactory.java index cf93c5c45c..c454f114a1 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorageFactory.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorageFactory.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage; +package org.hyperledger.besu.plugin.services.storage; -import tech.pegasys.pantheon.plugin.Unstable; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.PantheonConfiguration; -import tech.pegasys.pantheon.plugin.services.exception.StorageException; +import org.hyperledger.besu.plugin.Unstable; +import org.hyperledger.besu.plugin.services.BesuConfiguration; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.exception.StorageException; /** Factory for creating key-value storage instances. */ @Unstable @@ -46,7 +46,7 @@ public interface KeyValueStorageFactory { * @exception StorageException problem encountered when creating storage for the segment. */ KeyValueStorage create( - SegmentIdentifier segment, PantheonConfiguration configuration, MetricsSystem metricsSystem) + SegmentIdentifier segment, BesuConfiguration configuration, MetricsSystem metricsSystem) throws StorageException; /** diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorageTransaction.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorageTransaction.java similarity index 90% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorageTransaction.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorageTransaction.java index bda917e64c..bf2115496b 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/KeyValueStorageTransaction.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorageTransaction.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage; +package org.hyperledger.besu.plugin.services.storage; -import tech.pegasys.pantheon.plugin.Unstable; -import tech.pegasys.pantheon.plugin.services.exception.StorageException; +import org.hyperledger.besu.plugin.Unstable; +import org.hyperledger.besu.plugin.services.exception.StorageException; /** A transaction that can atomically commit a sequence of operations to a key-value store. */ @Unstable diff --git a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/SegmentIdentifier.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/SegmentIdentifier.java similarity index 91% rename from plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/SegmentIdentifier.java rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/SegmentIdentifier.java index 87f8decf24..6b370c78f5 100644 --- a/plugin-api/src/main/java/tech/pegasys/pantheon/plugin/services/storage/SegmentIdentifier.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/SegmentIdentifier.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage; +package org.hyperledger.besu.plugin.services.storage; -import tech.pegasys.pantheon.plugin.Unstable; +import org.hyperledger.besu.plugin.Unstable; /** * A namespace identifier for the storage instance segment, a grouping of data that should be kept diff --git a/plugins/rocksdb/build.gradle b/plugins/rocksdb/build.gradle index 02e1ab27d6..5d42dc4bed 100644 --- a/plugins/rocksdb/build.gradle +++ b/plugins/rocksdb/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-plugin-rocksdb' + baseName 'besu-plugin-rocksdb' manifest { attributes( 'Specification-Title': baseName, diff --git a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBKeyValuePrivacyStorageFactory.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValuePrivacyStorageFactory.java similarity index 75% rename from plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBKeyValuePrivacyStorageFactory.java rename to plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValuePrivacyStorageFactory.java index 3d42273338..c911c9b657 100644 --- a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBKeyValuePrivacyStorageFactory.java +++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValuePrivacyStorageFactory.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb; +package org.hyperledger.besu.plugin.services.storage.rocksdb; -import tech.pegasys.pantheon.plugin.services.PantheonConfiguration; -import tech.pegasys.pantheon.plugin.services.storage.SegmentIdentifier; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; +import org.hyperledger.besu.plugin.services.BesuConfiguration; +import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; import java.nio.file.Path; import java.util.List; @@ -38,7 +38,7 @@ public class RocksDBKeyValuePrivacyStorageFactory extends RocksDBKeyValueStorage } @Override - protected Path storagePath(final PantheonConfiguration commonConfiguration) { + protected Path storagePath(final BesuConfiguration commonConfiguration) { return super.storagePath(commonConfiguration).resolve(PRIVATE_DATABASE_PATH); } } diff --git a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactory.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactory.java similarity index 73% rename from plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactory.java rename to plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactory.java index bfd04d6cd6..f838fea63b 100644 --- a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactory.java +++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactory.java @@ -10,22 +10,22 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb; - -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.PantheonConfiguration; -import tech.pegasys.pantheon.plugin.services.exception.StorageException; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageFactory; -import tech.pegasys.pantheon.plugin.services.storage.SegmentIdentifier; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.DatabaseMetadata; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBConfigurationBuilder; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.segmented.RocksDBColumnarKeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.unsegmented.RocksDBKeyValueStorage; -import tech.pegasys.pantheon.services.kvstore.SegmentedKeyValueStorage; -import tech.pegasys.pantheon.services.kvstore.SegmentedKeyValueStorageAdapter; +package org.hyperledger.besu.plugin.services.storage.rocksdb; + +import org.hyperledger.besu.plugin.services.BesuConfiguration; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.exception.StorageException; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageFactory; +import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.DatabaseMetadata; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfigurationBuilder; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; +import org.hyperledger.besu.plugin.services.storage.rocksdb.segmented.RocksDBColumnarKeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.rocksdb.unsegmented.RocksDBKeyValueStorage; +import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorage; +import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorageAdapter; import java.io.IOException; import java.nio.file.Files; @@ -66,7 +66,7 @@ public class RocksDBKeyValueStorageFactory implements KeyValueStorageFactory { @Override public KeyValueStorage create( final SegmentIdentifier segment, - final PantheonConfiguration commonConfiguration, + final BesuConfiguration commonConfiguration, final MetricsSystem metricsSystem) throws StorageException { @@ -93,7 +93,7 @@ public class RocksDBKeyValueStorageFactory implements KeyValueStorageFactory { } } - protected Path storagePath(final PantheonConfiguration commonConfiguration) { + protected Path storagePath(final BesuConfiguration commonConfiguration) { return commonConfiguration.getStoragePath(); } @@ -102,7 +102,7 @@ public class RocksDBKeyValueStorageFactory implements KeyValueStorageFactory { } private void init( - final PantheonConfiguration commonConfiguration, final MetricsSystem metricsSystem) { + final BesuConfiguration commonConfiguration, final MetricsSystem metricsSystem) { try { this.isSegmentIsolationSupported = databaseVersion(commonConfiguration) == DEFAULT_VERSION; } catch (final IOException e) { @@ -125,7 +125,7 @@ public class RocksDBKeyValueStorageFactory implements KeyValueStorageFactory { } } - private int databaseVersion(final PantheonConfiguration commonConfiguration) throws IOException { + private int databaseVersion(final BesuConfiguration commonConfiguration) throws IOException { final Path databaseDir = storagePath(commonConfiguration); final boolean databaseExists = databaseDir.resolve("IDENTITY").toFile().exists(); final int databaseVersion; diff --git a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBMetrics.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetrics.java similarity index 83% rename from plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBMetrics.java rename to plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetrics.java index 81ff4823ba..4e025ca5f1 100644 --- a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBMetrics.java +++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetrics.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb; +package org.hyperledger.besu.plugin.services.storage.rocksdb; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.metrics.prometheus.PrometheusMetricsSystem; -import tech.pegasys.pantheon.metrics.rocksdb.RocksDBStats; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.OperationTimer; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.metrics.prometheus.PrometheusMetricsSystem; +import org.hyperledger.besu.metrics.rocksdb.RocksDBStats; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.OperationTimer; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -57,7 +57,7 @@ public class RocksDBMetrics { final OperationTimer readLatency = metricsSystem .createLabelledTimer( - PantheonMetricCategory.KVSTORE_ROCKSDB, + BesuMetricCategory.KVSTORE_ROCKSDB, "read_latency_seconds", "Latency for read from RocksDB.", "database") @@ -65,7 +65,7 @@ public class RocksDBMetrics { final OperationTimer removeLatency = metricsSystem .createLabelledTimer( - PantheonMetricCategory.KVSTORE_ROCKSDB, + BesuMetricCategory.KVSTORE_ROCKSDB, "remove_latency_seconds", "Latency of remove requests from RocksDB.", "database") @@ -73,7 +73,7 @@ public class RocksDBMetrics { final OperationTimer writeLatency = metricsSystem .createLabelledTimer( - PantheonMetricCategory.KVSTORE_ROCKSDB, + BesuMetricCategory.KVSTORE_ROCKSDB, "write_latency_seconds", "Latency for write to RocksDB.", "database") @@ -81,7 +81,7 @@ public class RocksDBMetrics { final OperationTimer commitLatency = metricsSystem .createLabelledTimer( - PantheonMetricCategory.KVSTORE_ROCKSDB, + BesuMetricCategory.KVSTORE_ROCKSDB, "commit_latency_seconds", "Latency for commits to RocksDB.", "database") @@ -92,7 +92,7 @@ public class RocksDBMetrics { } metricsSystem.createLongGauge( - PantheonMetricCategory.KVSTORE_ROCKSDB, + BesuMetricCategory.KVSTORE_ROCKSDB, "rocks_db_table_readers_memory_bytes", "Estimated memory used for RocksDB index and filter blocks in bytes", () -> { @@ -105,7 +105,7 @@ public class RocksDBMetrics { }); metricsSystem.createLongGauge( - PantheonMetricCategory.KVSTORE_ROCKSDB, + BesuMetricCategory.KVSTORE_ROCKSDB, "rocks_db_files_size_bytes", "Estimated database size in bytes", () -> { @@ -120,7 +120,7 @@ public class RocksDBMetrics { final Counter rollbackCount = metricsSystem .createLabelledCounter( - PantheonMetricCategory.KVSTORE_ROCKSDB, + BesuMetricCategory.KVSTORE_ROCKSDB, "rollback_count", "Number of RocksDB transactions rolled back.", "database") diff --git a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBPlugin.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBPlugin.java similarity index 82% rename from plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBPlugin.java rename to plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBPlugin.java index 0f8c267d2f..70fecd6184 100644 --- a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBPlugin.java +++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBPlugin.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb; +package org.hyperledger.besu.plugin.services.storage.rocksdb; -import tech.pegasys.pantheon.plugin.PantheonContext; -import tech.pegasys.pantheon.plugin.PantheonPlugin; -import tech.pegasys.pantheon.plugin.services.PicoCLIOptions; -import tech.pegasys.pantheon.plugin.services.StorageService; -import tech.pegasys.pantheon.plugin.services.storage.SegmentIdentifier; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; +import org.hyperledger.besu.plugin.BesuContext; +import org.hyperledger.besu.plugin.BesuPlugin; +import org.hyperledger.besu.plugin.services.PicoCLIOptions; +import org.hyperledger.besu.plugin.services.StorageService; +import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; import java.io.IOException; import java.util.List; @@ -29,13 +29,13 @@ import com.google.common.base.Suppliers; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -public class RocksDBPlugin implements PantheonPlugin { +public class RocksDBPlugin implements BesuPlugin { private static final Logger LOG = LogManager.getLogger(); private static final String NAME = "rocksdb"; private final RocksDBCLIOptions options; - private PantheonContext context; + private BesuContext context; private RocksDBKeyValueStorageFactory factory; private RocksDBKeyValuePrivacyStorageFactory privacyFactory; @@ -44,7 +44,7 @@ public class RocksDBPlugin implements PantheonPlugin { } @Override - public void register(final PantheonContext context) { + public void register(final BesuContext context) { LOG.info("Registering plugin"); this.context = context; diff --git a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDbUtil.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDbUtil.java similarity index 90% rename from plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDbUtil.java rename to plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDbUtil.java index 62e5debba9..e9de5bbc82 100644 --- a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDbUtil.java +++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDbUtil.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb; +package org.hyperledger.besu.plugin.services.storage.rocksdb; -import tech.pegasys.pantheon.util.InvalidConfigurationException; +import org.hyperledger.besu.util.InvalidConfigurationException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/configuration/DatabaseMetadata.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/DatabaseMetadata.java similarity index 96% rename from plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/configuration/DatabaseMetadata.java rename to plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/DatabaseMetadata.java index 2eca6d9bba..ed795e9385 100644 --- a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/configuration/DatabaseMetadata.java +++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/DatabaseMetadata.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration; +package org.hyperledger.besu.plugin.services.storage.rocksdb.configuration; import java.io.File; import java.io.FileNotFoundException; diff --git a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/configuration/RocksDBCLIOptions.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBCLIOptions.java similarity index 97% rename from plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/configuration/RocksDBCLIOptions.java rename to plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBCLIOptions.java index 3f2bcdf686..a95fb5c2c3 100644 --- a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/configuration/RocksDBCLIOptions.java +++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBCLIOptions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration; +package org.hyperledger.besu.plugin.services.storage.rocksdb.configuration; import com.google.common.base.MoreObjects; import picocli.CommandLine; diff --git a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/configuration/RocksDBConfiguration.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBConfiguration.java similarity index 95% rename from plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/configuration/RocksDBConfiguration.java rename to plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBConfiguration.java index ad054516ce..332b4dc025 100644 --- a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/configuration/RocksDBConfiguration.java +++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBConfiguration.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration; +package org.hyperledger.besu.plugin.services.storage.rocksdb.configuration; import java.nio.file.Path; diff --git a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/configuration/RocksDBConfigurationBuilder.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBConfigurationBuilder.java similarity index 80% rename from plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/configuration/RocksDBConfigurationBuilder.java rename to plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBConfigurationBuilder.java index 45447de6f1..059c8bfdce 100644 --- a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/configuration/RocksDBConfigurationBuilder.java +++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBConfigurationBuilder.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration; +package org.hyperledger.besu.plugin.services.storage.rocksdb.configuration; -import static tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_BACKGROUND_THREAD_COUNT; -import static tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_CACHE_CAPACITY; -import static tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_BACKGROUND_COMPACTIONS; -import static tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_OPEN_FILES; +import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_BACKGROUND_THREAD_COUNT; +import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_CACHE_CAPACITY; +import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_BACKGROUND_COMPACTIONS; +import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_OPEN_FILES; import java.nio.file.Path; diff --git a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/configuration/RocksDBFactoryConfiguration.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBFactoryConfiguration.java similarity index 95% rename from plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/configuration/RocksDBFactoryConfiguration.java rename to plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBFactoryConfiguration.java index a51ffb11da..8a82b9b685 100644 --- a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/configuration/RocksDBFactoryConfiguration.java +++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBFactoryConfiguration.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration; +package org.hyperledger.besu.plugin.services.storage.rocksdb.configuration; public class RocksDBFactoryConfiguration { diff --git a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueStorage.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueStorage.java similarity index 91% rename from plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueStorage.java rename to plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueStorage.java index 89756e43c0..197f4b0b9f 100644 --- a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueStorage.java +++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueStorage.java @@ -10,20 +10,20 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb.segmented; +package org.hyperledger.besu.plugin.services.storage.rocksdb.segmented; import static java.util.Objects.requireNonNullElse; -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.exception.StorageException; -import tech.pegasys.pantheon.plugin.services.metrics.OperationTimer; -import tech.pegasys.pantheon.plugin.services.storage.SegmentIdentifier; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.RocksDBMetrics; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.RocksDbUtil; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration; -import tech.pegasys.pantheon.services.kvstore.SegmentedKeyValueStorage; -import tech.pegasys.pantheon.services.kvstore.SegmentedKeyValueStorageTransactionTransitionValidatorDecorator; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.exception.StorageException; +import org.hyperledger.besu.plugin.services.metrics.OperationTimer; +import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier; +import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetrics; +import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDbUtil; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration; +import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorage; +import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorageTransactionTransitionValidatorDecorator; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.Closeable; import java.nio.charset.StandardCharsets; diff --git a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/unsegmented/RocksDBKeyValueStorage.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBKeyValueStorage.java similarity index 86% rename from plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/unsegmented/RocksDBKeyValueStorage.java rename to plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBKeyValueStorage.java index 3313162b6f..1d857c1259 100644 --- a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/unsegmented/RocksDBKeyValueStorage.java +++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBKeyValueStorage.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb.unsegmented; - -import tech.pegasys.pantheon.plugin.services.MetricsSystem; -import tech.pegasys.pantheon.plugin.services.exception.StorageException; -import tech.pegasys.pantheon.plugin.services.metrics.OperationTimer; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageTransaction; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.RocksDBMetrics; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.RocksDbUtil; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration; -import tech.pegasys.pantheon.services.kvstore.KeyValueStorageTransactionTransitionValidatorDecorator; +package org.hyperledger.besu.plugin.services.storage.rocksdb.unsegmented; + +import org.hyperledger.besu.plugin.services.MetricsSystem; +import org.hyperledger.besu.plugin.services.exception.StorageException; +import org.hyperledger.besu.plugin.services.metrics.OperationTimer; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction; +import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetrics; +import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDbUtil; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration; +import org.hyperledger.besu.services.kvstore.KeyValueStorageTransactionTransitionValidatorDecorator; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/unsegmented/RocksDBTransaction.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBTransaction.java similarity index 85% rename from plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/unsegmented/RocksDBTransaction.java rename to plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBTransaction.java index c5dfc5387e..7f9cbc961d 100644 --- a/plugins/rocksdb/src/main/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/unsegmented/RocksDBTransaction.java +++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBTransaction.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb.unsegmented; +package org.hyperledger.besu.plugin.services.storage.rocksdb.unsegmented; -import tech.pegasys.pantheon.plugin.services.exception.StorageException; -import tech.pegasys.pantheon.plugin.services.metrics.OperationTimer; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageTransaction; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.RocksDBMetrics; +import org.hyperledger.besu.plugin.services.exception.StorageException; +import org.hyperledger.besu.plugin.services.metrics.OperationTimer; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction; +import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetrics; import org.rocksdb.RocksDBException; import org.rocksdb.Transaction; diff --git a/plugins/rocksdb/src/test/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBCLIOptionsTest.java b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBCLIOptionsTest.java similarity index 86% rename from plugins/rocksdb/src/test/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBCLIOptionsTest.java rename to plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBCLIOptionsTest.java index ecb2888c05..32d2d51945 100644 --- a/plugins/rocksdb/src/test/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBCLIOptionsTest.java +++ b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBCLIOptionsTest.java @@ -10,16 +10,16 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb; +package org.hyperledger.besu.plugin.services.storage.rocksdb; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_BACKGROUND_THREAD_COUNT; -import static tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_CACHE_CAPACITY; -import static tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_BACKGROUND_COMPACTIONS; -import static tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_OPEN_FILES; +import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_BACKGROUND_THREAD_COUNT; +import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_CACHE_CAPACITY; +import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_BACKGROUND_COMPACTIONS; +import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_OPEN_FILES; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; import org.junit.Test; import picocli.CommandLine; diff --git a/plugins/rocksdb/src/test/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactoryTest.java b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactoryTest.java similarity index 89% rename from plugins/rocksdb/src/test/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactoryTest.java rename to plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactoryTest.java index 04524704f8..7a6f398c1b 100644 --- a/plugins/rocksdb/src/test/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactoryTest.java +++ b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactoryTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb; +package org.hyperledger.besu.plugin.services.storage.rocksdb; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.PantheonConfiguration; -import tech.pegasys.pantheon.plugin.services.exception.StorageException; -import tech.pegasys.pantheon.plugin.services.storage.SegmentIdentifier; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.DatabaseMetadata; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; +import org.hyperledger.besu.metrics.ObservableMetricsSystem; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.BesuConfiguration; +import org.hyperledger.besu.plugin.services.exception.StorageException; +import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.DatabaseMetadata; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration; import java.nio.charset.Charset; import java.nio.file.Files; @@ -43,7 +43,7 @@ public class RocksDBKeyValueStorageFactoryTest { private static final int DEFAULT_VERSION = 1; @Mock private RocksDBFactoryConfiguration rocksDbConfiguration; - @Mock private PantheonConfiguration commonConfiguration; + @Mock private BesuConfiguration commonConfiguration; @Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder(); private final ObservableMetricsSystem metricsSystem = new NoOpMetricsSystem(); private final List segments = List.of(); diff --git a/plugins/rocksdb/src/test/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBMetricsTest.java b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetricsTest.java similarity index 83% rename from plugins/rocksdb/src/test/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBMetricsTest.java rename to plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetricsTest.java index 0467cb2d48..aeec968206 100644 --- a/plugins/rocksdb/src/test/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/RocksDBMetricsTest.java +++ b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetricsTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb; +package org.hyperledger.besu.plugin.services.storage.rocksdb; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -20,13 +20,13 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.plugin.services.metrics.OperationTimer; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBConfigurationBuilder; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.metrics.ObservableMetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.plugin.services.metrics.OperationTimer; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfigurationBuilder; import java.util.function.LongSupplier; @@ -57,10 +57,10 @@ public class RocksDBMetricsTest { // Prepare mocks when(labelledMetricOperationTimerMock.labels(any())).thenReturn(operationTimerMock); when(metricsSystemMock.createLabelledTimer( - eq(PantheonMetricCategory.KVSTORE_ROCKSDB), anyString(), anyString(), any())) + eq(BesuMetricCategory.KVSTORE_ROCKSDB), anyString(), anyString(), any())) .thenReturn(labelledMetricOperationTimerMock); when(metricsSystemMock.createLabelledCounter( - eq(PantheonMetricCategory.KVSTORE_ROCKSDB), anyString(), anyString(), any())) + eq(BesuMetricCategory.KVSTORE_ROCKSDB), anyString(), anyString(), any())) .thenReturn(labelledMetricCounterMock); // Prepare argument captors final ArgumentCaptor labelledTimersMetricsNameArgs = @@ -76,7 +76,7 @@ public class RocksDBMetricsTest { verify(metricsSystemMock, times(4)) .createLabelledTimer( - eq(PantheonMetricCategory.KVSTORE_ROCKSDB), + eq(BesuMetricCategory.KVSTORE_ROCKSDB), labelledTimersMetricsNameArgs.capture(), labelledTimersHelpArgs.capture(), any()); @@ -95,7 +95,7 @@ public class RocksDBMetricsTest { verify(metricsSystemMock, times(2)) .createLongGauge( - eq(PantheonMetricCategory.KVSTORE_ROCKSDB), + eq(BesuMetricCategory.KVSTORE_ROCKSDB), longGaugesMetricsNameArgs.capture(), longGaugesHelpArgs.capture(), any(LongSupplier.class)); @@ -108,7 +108,7 @@ public class RocksDBMetricsTest { verify(metricsSystemMock) .createLabelledCounter( - eq(PantheonMetricCategory.KVSTORE_ROCKSDB), + eq(BesuMetricCategory.KVSTORE_ROCKSDB), labelledCountersMetricsNameArgs.capture(), labelledCountersHelpArgs.capture(), any()); diff --git a/plugins/rocksdb/src/test/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/segmented/RocksDBKeyValueStorageTest.java b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBKeyValueStorageTest.java similarity index 79% rename from plugins/rocksdb/src/test/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/segmented/RocksDBKeyValueStorageTest.java rename to plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBKeyValueStorageTest.java index cf2a157e91..716e81e258 100644 --- a/plugins/rocksdb/src/test/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/segmented/RocksDBKeyValueStorageTest.java +++ b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBKeyValueStorageTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb.segmented; +package org.hyperledger.besu.plugin.services.storage.rocksdb.segmented; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -20,17 +20,17 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import tech.pegasys.pantheon.kvstore.AbstractKeyValueStorageTest; -import tech.pegasys.pantheon.metrics.ObservableMetricsSystem; -import tech.pegasys.pantheon.metrics.PantheonMetricCategory; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; -import tech.pegasys.pantheon.plugin.services.metrics.OperationTimer; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBConfigurationBuilder; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.unsegmented.RocksDBKeyValueStorage; +import org.hyperledger.besu.kvstore.AbstractKeyValueStorageTest; +import org.hyperledger.besu.metrics.BesuMetricCategory; +import org.hyperledger.besu.metrics.ObservableMetricsSystem; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.plugin.services.metrics.OperationTimer; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfigurationBuilder; +import org.hyperledger.besu.plugin.services.storage.rocksdb.unsegmented.RocksDBKeyValueStorage; import java.util.function.LongSupplier; @@ -61,10 +61,10 @@ public class RocksDBKeyValueStorageTest extends AbstractKeyValueStorageTest { // Prepare mocks when(labelledMetricOperationTimerMock.labels(any())).thenReturn(operationTimerMock); when(metricsSystemMock.createLabelledTimer( - eq(PantheonMetricCategory.KVSTORE_ROCKSDB), anyString(), anyString(), any())) + eq(BesuMetricCategory.KVSTORE_ROCKSDB), anyString(), anyString(), any())) .thenReturn(labelledMetricOperationTimerMock); when(metricsSystemMock.createLabelledCounter( - eq(PantheonMetricCategory.KVSTORE_ROCKSDB), anyString(), anyString(), any())) + eq(BesuMetricCategory.KVSTORE_ROCKSDB), anyString(), anyString(), any())) .thenReturn(labelledMetricCounterMock); // Prepare argument captors final ArgumentCaptor labelledTimersMetricsNameArgs = @@ -83,7 +83,7 @@ public class RocksDBKeyValueStorageTest extends AbstractKeyValueStorageTest { assertThat(keyValueStorage).isNotNull(); verify(metricsSystemMock, times(4)) .createLabelledTimer( - eq(PantheonMetricCategory.KVSTORE_ROCKSDB), + eq(BesuMetricCategory.KVSTORE_ROCKSDB), labelledTimersMetricsNameArgs.capture(), labelledTimersHelpArgs.capture(), any()); @@ -102,7 +102,7 @@ public class RocksDBKeyValueStorageTest extends AbstractKeyValueStorageTest { verify(metricsSystemMock, times(2)) .createLongGauge( - eq(PantheonMetricCategory.KVSTORE_ROCKSDB), + eq(BesuMetricCategory.KVSTORE_ROCKSDB), longGaugesMetricsNameArgs.capture(), longGaugesHelpArgs.capture(), any(LongSupplier.class)); @@ -115,7 +115,7 @@ public class RocksDBKeyValueStorageTest extends AbstractKeyValueStorageTest { verify(metricsSystemMock) .createLabelledCounter( - eq(PantheonMetricCategory.KVSTORE_ROCKSDB), + eq(BesuMetricCategory.KVSTORE_ROCKSDB), labelledCountersMetricsNameArgs.capture(), labelledCountersHelpArgs.capture(), any()); diff --git a/plugins/rocksdb/src/test/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/unsegmented/RocksDBColumnarKeyValueStorageTest.java b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBColumnarKeyValueStorageTest.java similarity index 83% rename from plugins/rocksdb/src/test/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/unsegmented/RocksDBColumnarKeyValueStorageTest.java rename to plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBColumnarKeyValueStorageTest.java index df312c8ea2..bde304a49d 100644 --- a/plugins/rocksdb/src/test/java/tech/pegasys/pantheon/plugin/services/storage/rocksdb/unsegmented/RocksDBColumnarKeyValueStorageTest.java +++ b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBColumnarKeyValueStorageTest.java @@ -10,19 +10,19 @@ * 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. */ -package tech.pegasys.pantheon.plugin.services.storage.rocksdb.unsegmented; +package org.hyperledger.besu.plugin.services.storage.rocksdb.unsegmented; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.kvstore.AbstractKeyValueStorageTest; -import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.SegmentIdentifier; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.configuration.RocksDBConfigurationBuilder; -import tech.pegasys.pantheon.plugin.services.storage.rocksdb.segmented.RocksDBColumnarKeyValueStorage; -import tech.pegasys.pantheon.services.kvstore.SegmentedKeyValueStorage; -import tech.pegasys.pantheon.services.kvstore.SegmentedKeyValueStorage.Transaction; -import tech.pegasys.pantheon.services.kvstore.SegmentedKeyValueStorageAdapter; +import org.hyperledger.besu.kvstore.AbstractKeyValueStorageTest; +import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier; +import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfigurationBuilder; +import org.hyperledger.besu.plugin.services.storage.rocksdb.segmented.RocksDBColumnarKeyValueStorage; +import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorage; +import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorage.Transaction; +import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorageAdapter; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/services/kvstore/build.gradle b/services/kvstore/build.gradle index 14d8c2236f..6a695c61ec 100644 --- a/services/kvstore/build.gradle +++ b/services/kvstore/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-kvstore' + baseName 'besu-kvstore' manifest { attributes( 'Specification-Title': baseName, diff --git a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/InMemoryKeyValueStorage.java b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/InMemoryKeyValueStorage.java similarity index 91% rename from services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/InMemoryKeyValueStorage.java rename to services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/InMemoryKeyValueStorage.java index e6c513024c..a67b6c1d9c 100644 --- a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/InMemoryKeyValueStorage.java +++ b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/InMemoryKeyValueStorage.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.services.kvstore; +package org.hyperledger.besu.services.kvstore; -import tech.pegasys.pantheon.plugin.services.exception.StorageException; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageTransaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.plugin.services.exception.StorageException; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.HashMap; import java.util.HashSet; diff --git a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/KeyValueStorageTransactionTransitionValidatorDecorator.java b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/KeyValueStorageTransactionTransitionValidatorDecorator.java similarity index 89% rename from services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/KeyValueStorageTransactionTransitionValidatorDecorator.java rename to services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/KeyValueStorageTransactionTransitionValidatorDecorator.java index 5690d41b09..d0b81cd454 100644 --- a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/KeyValueStorageTransactionTransitionValidatorDecorator.java +++ b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/KeyValueStorageTransactionTransitionValidatorDecorator.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.services.kvstore; +package org.hyperledger.besu.services.kvstore; import static com.google.common.base.Preconditions.checkState; -import tech.pegasys.pantheon.plugin.services.exception.StorageException; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageTransaction; +import org.hyperledger.besu.plugin.services.exception.StorageException; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction; public class KeyValueStorageTransactionTransitionValidatorDecorator implements KeyValueStorageTransaction { diff --git a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/LimitedInMemoryKeyValueStorage.java b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/LimitedInMemoryKeyValueStorage.java similarity index 92% rename from services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/LimitedInMemoryKeyValueStorage.java rename to services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/LimitedInMemoryKeyValueStorage.java index efac676c05..27fced9544 100644 --- a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/LimitedInMemoryKeyValueStorage.java +++ b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/LimitedInMemoryKeyValueStorage.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.services.kvstore; +package org.hyperledger.besu.services.kvstore; -import tech.pegasys.pantheon.plugin.services.exception.StorageException; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageTransaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.plugin.services.exception.StorageException; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.HashMap; import java.util.HashSet; diff --git a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/SegmentedKeyValueStorage.java b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorage.java similarity index 91% rename from services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/SegmentedKeyValueStorage.java rename to services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorage.java index cf15cba08c..d8c02a52bb 100644 --- a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/SegmentedKeyValueStorage.java +++ b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorage.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.services.kvstore; +package org.hyperledger.besu.services.kvstore; -import tech.pegasys.pantheon.plugin.services.exception.StorageException; -import tech.pegasys.pantheon.plugin.services.storage.SegmentIdentifier; +import org.hyperledger.besu.plugin.services.exception.StorageException; +import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier; import java.io.Closeable; import java.util.Optional; import java.util.function.Predicate; /** - * Service provided by pantheon to facilitate persistent data storage. + * Service provided by besu to facilitate persistent data storage. * * @param the segment identifier type */ diff --git a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/SegmentedKeyValueStorageAdapter.java b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorageAdapter.java similarity index 87% rename from services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/SegmentedKeyValueStorageAdapter.java rename to services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorageAdapter.java index 05221801c2..d466a7808a 100644 --- a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/SegmentedKeyValueStorageAdapter.java +++ b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorageAdapter.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.services.kvstore; +package org.hyperledger.besu.services.kvstore; -import tech.pegasys.pantheon.plugin.services.exception.StorageException; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageTransaction; -import tech.pegasys.pantheon.plugin.services.storage.SegmentIdentifier; +import org.hyperledger.besu.plugin.services.exception.StorageException; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction; +import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier; import java.io.IOException; import java.util.Optional; diff --git a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/SegmentedKeyValueStorageTransactionTransitionValidatorDecorator.java b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorageTransactionTransitionValidatorDecorator.java similarity index 89% rename from services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/SegmentedKeyValueStorageTransactionTransitionValidatorDecorator.java rename to services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorageTransactionTransitionValidatorDecorator.java index 51810920a8..b0c59d90c1 100644 --- a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/SegmentedKeyValueStorageTransactionTransitionValidatorDecorator.java +++ b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorageTransactionTransitionValidatorDecorator.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.services.kvstore; +package org.hyperledger.besu.services.kvstore; import static com.google.common.base.Preconditions.checkState; -import tech.pegasys.pantheon.plugin.services.exception.StorageException; -import tech.pegasys.pantheon.services.kvstore.SegmentedKeyValueStorage.Transaction; +import org.hyperledger.besu.plugin.services.exception.StorageException; +import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorage.Transaction; public class SegmentedKeyValueStorageTransactionTransitionValidatorDecorator implements Transaction { diff --git a/services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/InMemoryKeyValueStorageTest.java b/services/kvstore/src/test/java/org/hyperledger/besu/services/kvstore/InMemoryKeyValueStorageTest.java similarity index 80% rename from services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/InMemoryKeyValueStorageTest.java rename to services/kvstore/src/test/java/org/hyperledger/besu/services/kvstore/InMemoryKeyValueStorageTest.java index 5d94108df3..10ab5d5785 100644 --- a/services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/InMemoryKeyValueStorageTest.java +++ b/services/kvstore/src/test/java/org/hyperledger/besu/services/kvstore/InMemoryKeyValueStorageTest.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.services.kvstore; +package org.hyperledger.besu.services.kvstore; -import tech.pegasys.pantheon.kvstore.AbstractKeyValueStorageTest; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.kvstore.AbstractKeyValueStorageTest; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; public class InMemoryKeyValueStorageTest extends AbstractKeyValueStorageTest { diff --git a/services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/LimitedInMemoryKeyValueStorageTest.java b/services/kvstore/src/test/java/org/hyperledger/besu/services/kvstore/LimitedInMemoryKeyValueStorageTest.java similarity index 85% rename from services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/LimitedInMemoryKeyValueStorageTest.java rename to services/kvstore/src/test/java/org/hyperledger/besu/services/kvstore/LimitedInMemoryKeyValueStorageTest.java index 6acf09795c..b5b82568dd 100644 --- a/services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/LimitedInMemoryKeyValueStorageTest.java +++ b/services/kvstore/src/test/java/org/hyperledger/besu/services/kvstore/LimitedInMemoryKeyValueStorageTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.services.kvstore; +package org.hyperledger.besu.services.kvstore; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.kvstore.AbstractKeyValueStorageTest; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageTransaction; +import org.hyperledger.besu.kvstore.AbstractKeyValueStorageTest; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction; import org.junit.Test; diff --git a/services/pipeline/build.gradle b/services/pipeline/build.gradle index 91d2cae7e5..ad6f2370a9 100644 --- a/services/pipeline/build.gradle +++ b/services/pipeline/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-pipeline' + baseName 'besu-pipeline' manifest { attributes( 'Specification-Title': baseName, diff --git a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/AsyncOperationProcessor.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/AsyncOperationProcessor.java similarity index 98% rename from services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/AsyncOperationProcessor.java rename to services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/AsyncOperationProcessor.java index bf2c6eaac6..c27f58ed58 100644 --- a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/AsyncOperationProcessor.java +++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/AsyncOperationProcessor.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import static java.util.concurrent.CompletableFuture.completedFuture; diff --git a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/BatchingReadPipe.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/BatchingReadPipe.java similarity index 95% rename from services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/BatchingReadPipe.java rename to services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/BatchingReadPipe.java index 6bb6ead22c..dddf7f9d23 100644 --- a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/BatchingReadPipe.java +++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/BatchingReadPipe.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.Counter; import java.util.ArrayList; import java.util.Collection; diff --git a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/CompleterStage.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/CompleterStage.java similarity index 96% rename from services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/CompleterStage.java rename to services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/CompleterStage.java index 5851e01f87..c58a31bac7 100644 --- a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/CompleterStage.java +++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/CompleterStage.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; diff --git a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/FlatMapProcessor.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/FlatMapProcessor.java similarity index 95% rename from services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/FlatMapProcessor.java rename to services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/FlatMapProcessor.java index a8b5b99dd0..461707b953 100644 --- a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/FlatMapProcessor.java +++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/FlatMapProcessor.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import java.util.function.Function; import java.util.stream.Stream; diff --git a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/IteratorSourceStage.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/IteratorSourceStage.java similarity index 96% rename from services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/IteratorSourceStage.java rename to services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/IteratorSourceStage.java index d3d8be69d2..a3a787610b 100644 --- a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/IteratorSourceStage.java +++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/IteratorSourceStage.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import java.util.Iterator; diff --git a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/MapProcessor.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/MapProcessor.java similarity index 95% rename from services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/MapProcessor.java rename to services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/MapProcessor.java index 720d146473..6c374ede44 100644 --- a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/MapProcessor.java +++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/MapProcessor.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import java.util.function.Function; diff --git a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/Pipe.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Pipe.java similarity index 97% rename from services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/Pipe.java rename to services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Pipe.java index cc7ce1a1a0..8caf727bfd 100644 --- a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/Pipe.java +++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Pipe.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.Counter; import java.util.Collection; import java.util.concurrent.ArrayBlockingQueue; diff --git a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/Pipeline.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Pipeline.java similarity index 98% rename from services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/Pipeline.java rename to services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Pipeline.java index 83f0dd01fd..cbe932d1d0 100644 --- a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/Pipeline.java +++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Pipeline.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import static java.util.stream.Collectors.toList; -import tech.pegasys.pantheon.util.ExceptionUtils; +import org.hyperledger.besu.util.ExceptionUtils; import java.util.Collection; import java.util.List; diff --git a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/PipelineBuilder.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/PipelineBuilder.java similarity index 98% rename from services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/PipelineBuilder.java rename to services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/PipelineBuilder.java index 4187ea91d1..b4ef37d5bb 100644 --- a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/PipelineBuilder.java +++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/PipelineBuilder.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Collections.emptyList; import static java.util.Collections.singleton; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; import java.util.ArrayList; import java.util.Collection; diff --git a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/ProcessingStage.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/ProcessingStage.java similarity index 96% rename from services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/ProcessingStage.java rename to services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/ProcessingStage.java index cc8448bf05..d151a81348 100644 --- a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/ProcessingStage.java +++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/ProcessingStage.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; class ProcessingStage implements Stage { diff --git a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/Processor.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Processor.java similarity index 94% rename from services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/Processor.java rename to services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Processor.java index 3ac74da3f4..982963359c 100644 --- a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/Processor.java +++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Processor.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; interface Processor { void processNextInput(final ReadPipe inputPipe, final WritePipe outputPipe); diff --git a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/ReadPipe.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/ReadPipe.java similarity index 97% rename from services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/ReadPipe.java rename to services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/ReadPipe.java index 7be514d867..cbce3026bb 100644 --- a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/ReadPipe.java +++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/ReadPipe.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import java.util.Collection; diff --git a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/SharedWritePipe.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/SharedWritePipe.java similarity index 97% rename from services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/SharedWritePipe.java rename to services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/SharedWritePipe.java index bdc3b2436f..342974f54c 100644 --- a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/SharedWritePipe.java +++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/SharedWritePipe.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import java.util.concurrent.atomic.AtomicInteger; diff --git a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/Stage.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Stage.java similarity index 92% rename from services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/Stage.java rename to services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Stage.java index cb6d689a27..a2647fc5d5 100644 --- a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/Stage.java +++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Stage.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; public interface Stage extends Runnable { String getName(); diff --git a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/WritePipe.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/WritePipe.java similarity index 97% rename from services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/WritePipe.java rename to services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/WritePipe.java index ea07a3c609..efb179049a 100644 --- a/services/pipeline/src/main/java/tech/pegasys/pantheon/services/pipeline/WritePipe.java +++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/WritePipe.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; /** * The interface used to add items to a pipe. diff --git a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/AsyncOperationProcessorTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/AsyncOperationProcessorTest.java similarity index 99% rename from services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/AsyncOperationProcessorTest.java rename to services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/AsyncOperationProcessorTest.java index ff187787ad..685ead60da 100644 --- a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/AsyncOperationProcessorTest.java +++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/AsyncOperationProcessorTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import static java.util.concurrent.CompletableFuture.completedFuture; import static org.assertj.core.api.Assertions.assertThat; diff --git a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/BatchingReadPipeTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/BatchingReadPipeTest.java similarity index 94% rename from services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/BatchingReadPipeTest.java rename to services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/BatchingReadPipeTest.java index 4166ad63e0..7791af8dda 100644 --- a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/BatchingReadPipeTest.java +++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/BatchingReadPipeTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; -import static tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.Counter; import java.util.ArrayList; import java.util.List; diff --git a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/CompleterStageTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/CompleterStageTest.java similarity index 90% rename from services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/CompleterStageTest.java rename to services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/CompleterStageTest.java index 7dbc6fc2d3..3bd5541704 100644 --- a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/CompleterStageTest.java +++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/CompleterStageTest.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER; +import static org.hyperledger.besu.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER; import java.util.ArrayList; import java.util.List; diff --git a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/FlatMapProcessorTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/FlatMapProcessorTest.java similarity index 93% rename from services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/FlatMapProcessorTest.java rename to services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/FlatMapProcessorTest.java index 4001485dff..ad821e6c23 100644 --- a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/FlatMapProcessorTest.java +++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/FlatMapProcessorTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER; import java.util.function.Function; import java.util.stream.Stream; diff --git a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/IteratorSourceStageTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/IteratorSourceStageTest.java similarity index 92% rename from services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/IteratorSourceStageTest.java rename to services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/IteratorSourceStageTest.java index 6177e2a18f..343d91d487 100644 --- a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/IteratorSourceStageTest.java +++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/IteratorSourceStageTest.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER; +import static org.hyperledger.besu.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER; import com.google.common.collect.Iterators; import org.junit.Test; diff --git a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/MapProcessorTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/MapProcessorTest.java similarity index 93% rename from services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/MapProcessorTest.java rename to services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/MapProcessorTest.java index 1f4ca84abf..bee8042203 100644 --- a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/MapProcessorTest.java +++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/MapProcessorTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER; import java.util.function.Function; diff --git a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/PipeTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/PipeTest.java similarity index 96% rename from services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/PipeTest.java rename to services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/PipeTest.java index 54e36644f0..9eb9d672d1 100644 --- a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/PipeTest.java +++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/PipeTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.Counter; import java.util.ArrayList; import java.util.List; diff --git a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/PipelineBuilderTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/PipelineBuilderTest.java similarity index 98% rename from services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/PipelineBuilderTest.java rename to services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/PipelineBuilderTest.java index 51d55af5ff..2587a00b4d 100644 --- a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/PipelineBuilderTest.java +++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/PipelineBuilderTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import static java.util.Arrays.asList; import static java.util.Collections.synchronizedList; @@ -21,10 +21,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.fail; import static org.awaitility.Awaitility.waitAtMost; -import static tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem.NO_OP_LABELLED_2_COUNTER; +import static org.hyperledger.besu.metrics.noop.NoOpMetricsSystem.NO_OP_LABELLED_2_COUNTER; -import tech.pegasys.pantheon.plugin.services.metrics.Counter; -import tech.pegasys.pantheon.plugin.services.metrics.LabelledMetric; +import org.hyperledger.besu.plugin.services.metrics.Counter; +import org.hyperledger.besu.plugin.services.metrics.LabelledMetric; import java.util.ArrayList; import java.util.Collection; diff --git a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/ProcessingStageTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/ProcessingStageTest.java similarity index 96% rename from services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/ProcessingStageTest.java rename to services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/ProcessingStageTest.java index 1ea0503930..c6be715602 100644 --- a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/ProcessingStageTest.java +++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/ProcessingStageTest.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER; import java.util.Locale; diff --git a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/SharedWritePipeTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/SharedWritePipeTest.java similarity index 96% rename from services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/SharedWritePipeTest.java rename to services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/SharedWritePipeTest.java index eebd1d4756..00ad06eee4 100644 --- a/services/pipeline/src/test/java/tech/pegasys/pantheon/services/pipeline/SharedWritePipeTest.java +++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/SharedWritePipeTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.pipeline; +package org.hyperledger.besu.services.pipeline; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/services/tasks/build.gradle b/services/tasks/build.gradle index 6788cecf88..581eb39dfd 100644 --- a/services/tasks/build.gradle +++ b/services/tasks/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-tasks' + baseName 'besu-tasks' manifest { attributes( 'Specification-Title': baseName, diff --git a/services/tasks/src/main/java/tech/pegasys/pantheon/services/tasks/CachingTaskCollection.java b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/CachingTaskCollection.java similarity index 98% rename from services/tasks/src/main/java/tech/pegasys/pantheon/services/tasks/CachingTaskCollection.java rename to services/tasks/src/main/java/org/hyperledger/besu/services/tasks/CachingTaskCollection.java index ffbbb3ffd4..78edcb21d7 100644 --- a/services/tasks/src/main/java/tech/pegasys/pantheon/services/tasks/CachingTaskCollection.java +++ b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/CachingTaskCollection.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.tasks; +package org.hyperledger.besu.services.tasks; import java.io.IOException; import java.util.ArrayDeque; diff --git a/services/tasks/src/main/java/tech/pegasys/pantheon/services/tasks/FlatFileTaskCollection.java b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/FlatFileTaskCollection.java similarity index 98% rename from services/tasks/src/main/java/tech/pegasys/pantheon/services/tasks/FlatFileTaskCollection.java rename to services/tasks/src/main/java/org/hyperledger/besu/services/tasks/FlatFileTaskCollection.java index 5cb0b12cf3..9ab7675ab9 100644 --- a/services/tasks/src/main/java/tech/pegasys/pantheon/services/tasks/FlatFileTaskCollection.java +++ b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/FlatFileTaskCollection.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.services.tasks; +package org.hyperledger.besu.services.tasks; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.File; import java.io.IOException; diff --git a/services/tasks/src/main/java/tech/pegasys/pantheon/services/tasks/InMemoryTaskQueue.java b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/InMemoryTaskQueue.java similarity index 98% rename from services/tasks/src/main/java/tech/pegasys/pantheon/services/tasks/InMemoryTaskQueue.java rename to services/tasks/src/main/java/org/hyperledger/besu/services/tasks/InMemoryTaskQueue.java index 0097956023..a48eaf5bc5 100644 --- a/services/tasks/src/main/java/tech/pegasys/pantheon/services/tasks/InMemoryTaskQueue.java +++ b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/InMemoryTaskQueue.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.tasks; +package org.hyperledger.besu.services.tasks; import java.util.ArrayDeque; import java.util.HashSet; diff --git a/services/tasks/src/main/java/tech/pegasys/pantheon/services/tasks/Task.java b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/Task.java similarity index 94% rename from services/tasks/src/main/java/tech/pegasys/pantheon/services/tasks/Task.java rename to services/tasks/src/main/java/org/hyperledger/besu/services/tasks/Task.java index 2b3067a47f..c3b9adea05 100644 --- a/services/tasks/src/main/java/tech/pegasys/pantheon/services/tasks/Task.java +++ b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/Task.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.tasks; +package org.hyperledger.besu.services.tasks; public interface Task { T getData(); diff --git a/services/tasks/src/main/java/tech/pegasys/pantheon/services/tasks/TaskCollection.java b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/TaskCollection.java similarity index 96% rename from services/tasks/src/main/java/tech/pegasys/pantheon/services/tasks/TaskCollection.java rename to services/tasks/src/main/java/org/hyperledger/besu/services/tasks/TaskCollection.java index 5468ffb69d..9fb8ba1c9e 100644 --- a/services/tasks/src/main/java/tech/pegasys/pantheon/services/tasks/TaskCollection.java +++ b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/TaskCollection.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.services.tasks; +package org.hyperledger.besu.services.tasks; import java.io.Closeable; diff --git a/services/tasks/src/test/java/tech/pegasys/pantheon/services/tasks/AbstractTaskQueueTest.java b/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/AbstractTaskQueueTest.java similarity index 98% rename from services/tasks/src/test/java/tech/pegasys/pantheon/services/tasks/AbstractTaskQueueTest.java rename to services/tasks/src/test/java/org/hyperledger/besu/services/tasks/AbstractTaskQueueTest.java index 7e6f96a21e..8da9d5a17d 100644 --- a/services/tasks/src/test/java/tech/pegasys/pantheon/services/tasks/AbstractTaskQueueTest.java +++ b/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/AbstractTaskQueueTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.services.tasks; +package org.hyperledger.besu.services.tasks; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/services/tasks/src/test/java/tech/pegasys/pantheon/services/tasks/CachingTaskCollectionTest.java b/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/CachingTaskCollectionTest.java similarity index 98% rename from services/tasks/src/test/java/tech/pegasys/pantheon/services/tasks/CachingTaskCollectionTest.java rename to services/tasks/src/test/java/org/hyperledger/besu/services/tasks/CachingTaskCollectionTest.java index 5e80d05aad..343efa5b93 100644 --- a/services/tasks/src/test/java/tech/pegasys/pantheon/services/tasks/CachingTaskCollectionTest.java +++ b/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/CachingTaskCollectionTest.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.services.tasks; +package org.hyperledger.besu.services.tasks; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.util.ArrayList; diff --git a/services/tasks/src/test/java/tech/pegasys/pantheon/services/tasks/FlatFileTaskCollectionTest.java b/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/FlatFileTaskCollectionTest.java similarity index 96% rename from services/tasks/src/test/java/tech/pegasys/pantheon/services/tasks/FlatFileTaskCollectionTest.java rename to services/tasks/src/test/java/org/hyperledger/besu/services/tasks/FlatFileTaskCollectionTest.java index 9c8e1cfd93..1b4f2f0361 100644 --- a/services/tasks/src/test/java/tech/pegasys/pantheon/services/tasks/FlatFileTaskCollectionTest.java +++ b/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/FlatFileTaskCollectionTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.services.tasks; +package org.hyperledger.besu.services.tasks; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; import java.io.IOException; import java.nio.file.Path; diff --git a/services/tasks/src/test/java/tech/pegasys/pantheon/services/tasks/InMemoryTaskQueueTest.java b/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/InMemoryTaskQueueTest.java similarity index 89% rename from services/tasks/src/test/java/tech/pegasys/pantheon/services/tasks/InMemoryTaskQueueTest.java rename to services/tasks/src/test/java/org/hyperledger/besu/services/tasks/InMemoryTaskQueueTest.java index b552ffdf36..90eb88d9b4 100644 --- a/services/tasks/src/test/java/tech/pegasys/pantheon/services/tasks/InMemoryTaskQueueTest.java +++ b/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/InMemoryTaskQueueTest.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.services.tasks; +package org.hyperledger.besu.services.tasks; -import tech.pegasys.pantheon.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValue; public class InMemoryTaskQueueTest extends AbstractTaskQueueTest> { diff --git a/settings.gradle b/settings.gradle index f38b6b7ce2..7d402b72c9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -rootProject.name='pantheon' +rootProject.name='besu' include 'acceptance-tests' include 'config' include 'consensus:clique' @@ -35,7 +35,7 @@ include 'ethereum:trie' include 'metrics:core' include 'metrics:rocksdb' include 'nat' -include 'pantheon' +include 'besu' include 'plugin-api' include 'plugins:rocksdb' include 'services:kvstore' diff --git a/testutil/build.gradle b/testutil/build.gradle index 78ff0af195..69590ab08b 100644 --- a/testutil/build.gradle +++ b/testutil/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-util-test' + baseName 'besu-util-test' manifest { attributes( 'Specification-Title': baseName, diff --git a/testutil/src/main/java/tech/pegasys/pantheon/kvstore/AbstractKeyValueStorageTest.java b/testutil/src/main/java/org/hyperledger/besu/kvstore/AbstractKeyValueStorageTest.java similarity index 97% rename from testutil/src/main/java/tech/pegasys/pantheon/kvstore/AbstractKeyValueStorageTest.java rename to testutil/src/main/java/org/hyperledger/besu/kvstore/AbstractKeyValueStorageTest.java index 5801d454a0..3656dd51cc 100644 --- a/testutil/src/main/java/tech/pegasys/pantheon/kvstore/AbstractKeyValueStorageTest.java +++ b/testutil/src/main/java/org/hyperledger/besu/kvstore/AbstractKeyValueStorageTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.kvstore; +package org.hyperledger.besu.kvstore; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorage; -import tech.pegasys.pantheon.plugin.services.storage.KeyValueStorageTransaction; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorage; +import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; import java.util.ArrayList; import java.util.Arrays; @@ -384,7 +384,7 @@ public abstract class AbstractKeyValueStorageTest { } /* - * Used to mimic the wrapping with BytesValue performed in Pantheon + * Used to mimic the wrapping with BytesValue performed in Besu */ protected byte[] bytesFromHexString(final String hex) { return BytesValue.fromHexString(hex).getArrayUnsafe(); diff --git a/testutil/src/main/java/tech/pegasys/pantheon/testutil/BlockTestUtil.java b/testutil/src/main/java/org/hyperledger/besu/testutil/BlockTestUtil.java similarity index 98% rename from testutil/src/main/java/tech/pegasys/pantheon/testutil/BlockTestUtil.java rename to testutil/src/main/java/org/hyperledger/besu/testutil/BlockTestUtil.java index 96120e1ba7..567b036a0d 100644 --- a/testutil/src/main/java/tech/pegasys/pantheon/testutil/BlockTestUtil.java +++ b/testutil/src/main/java/org/hyperledger/besu/testutil/BlockTestUtil.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.testutil; +package org.hyperledger.besu.testutil; import java.io.IOException; import java.net.URISyntaxException; @@ -114,7 +114,7 @@ public final class BlockTestUtil { try { Paths.get(resource.toURI()); } catch (final FileSystemNotFoundException e) { - final Path target = Files.createTempFile("pantheon", null); + final Path target = Files.createTempFile("besu", null); target.toFile().deleteOnExit(); Files.copy(resource.openStream(), target, StandardCopyOption.REPLACE_EXISTING); return target.toUri().toURL(); diff --git a/testutil/src/main/java/tech/pegasys/pantheon/testutil/JsonTestParameters.java b/testutil/src/main/java/org/hyperledger/besu/testutil/JsonTestParameters.java similarity index 99% rename from testutil/src/main/java/tech/pegasys/pantheon/testutil/JsonTestParameters.java rename to testutil/src/main/java/org/hyperledger/besu/testutil/JsonTestParameters.java index 5d7d713a79..b82af1d103 100644 --- a/testutil/src/main/java/tech/pegasys/pantheon/testutil/JsonTestParameters.java +++ b/testutil/src/main/java/org/hyperledger/besu/testutil/JsonTestParameters.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.testutil; +package org.hyperledger.besu.testutil; import static com.google.common.base.Preconditions.checkState; diff --git a/testutil/src/main/java/tech/pegasys/pantheon/testutil/MockExecutorService.java b/testutil/src/main/java/org/hyperledger/besu/testutil/MockExecutorService.java similarity index 99% rename from testutil/src/main/java/tech/pegasys/pantheon/testutil/MockExecutorService.java rename to testutil/src/main/java/org/hyperledger/besu/testutil/MockExecutorService.java index f6d0758557..f8be76eb9c 100644 --- a/testutil/src/main/java/tech/pegasys/pantheon/testutil/MockExecutorService.java +++ b/testutil/src/main/java/org/hyperledger/besu/testutil/MockExecutorService.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.testutil; +package org.hyperledger.besu.testutil; import static org.mockito.Mockito.spy; diff --git a/testutil/src/main/java/tech/pegasys/pantheon/testutil/TestClock.java b/testutil/src/main/java/org/hyperledger/besu/testutil/TestClock.java similarity index 97% rename from testutil/src/main/java/tech/pegasys/pantheon/testutil/TestClock.java rename to testutil/src/main/java/org/hyperledger/besu/testutil/TestClock.java index 1ff18a8c82..89e1679088 100644 --- a/testutil/src/main/java/tech/pegasys/pantheon/testutil/TestClock.java +++ b/testutil/src/main/java/org/hyperledger/besu/testutil/TestClock.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.testutil; +package org.hyperledger.besu.testutil; import java.time.Clock; import java.time.Instant; diff --git a/testutil/src/main/java/tech/pegasys/orion/testutil/OrionConfiguration.java b/testutil/src/main/java/org/hyperledger/orion/testutil/OrionConfiguration.java similarity index 97% rename from testutil/src/main/java/tech/pegasys/orion/testutil/OrionConfiguration.java rename to testutil/src/main/java/org/hyperledger/orion/testutil/OrionConfiguration.java index e00952c062..f4cda46a63 100644 --- a/testutil/src/main/java/tech/pegasys/orion/testutil/OrionConfiguration.java +++ b/testutil/src/main/java/org/hyperledger/orion/testutil/OrionConfiguration.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.orion.testutil; +package org.hyperledger.orion.testutil; import java.nio.file.Path; import java.util.ArrayList; diff --git a/testutil/src/main/java/tech/pegasys/orion/testutil/OrionKeyConfiguration.java b/testutil/src/main/java/org/hyperledger/orion/testutil/OrionKeyConfiguration.java similarity index 96% rename from testutil/src/main/java/tech/pegasys/orion/testutil/OrionKeyConfiguration.java rename to testutil/src/main/java/org/hyperledger/orion/testutil/OrionKeyConfiguration.java index 157d5cd0e4..43ad3799d9 100644 --- a/testutil/src/main/java/tech/pegasys/orion/testutil/OrionKeyConfiguration.java +++ b/testutil/src/main/java/org/hyperledger/orion/testutil/OrionKeyConfiguration.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.orion.testutil; +package org.hyperledger.orion.testutil; public class OrionKeyConfiguration { private final String pubKeyPath; diff --git a/testutil/src/main/java/tech/pegasys/orion/testutil/OrionKeyUtils.java b/testutil/src/main/java/org/hyperledger/orion/testutil/OrionKeyUtils.java similarity index 98% rename from testutil/src/main/java/tech/pegasys/orion/testutil/OrionKeyUtils.java rename to testutil/src/main/java/org/hyperledger/orion/testutil/OrionKeyUtils.java index b3c02ac724..ef3b85b73e 100644 --- a/testutil/src/main/java/tech/pegasys/orion/testutil/OrionKeyUtils.java +++ b/testutil/src/main/java/org/hyperledger/orion/testutil/OrionKeyUtils.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.orion.testutil; +package org.hyperledger.orion.testutil; import java.io.BufferedReader; import java.io.IOException; diff --git a/testutil/src/main/java/tech/pegasys/orion/testutil/OrionTestHarness.java b/testutil/src/main/java/org/hyperledger/orion/testutil/OrionTestHarness.java similarity index 99% rename from testutil/src/main/java/tech/pegasys/orion/testutil/OrionTestHarness.java rename to testutil/src/main/java/org/hyperledger/orion/testutil/OrionTestHarness.java index bd2a9e00a3..04f4d71524 100644 --- a/testutil/src/main/java/tech/pegasys/orion/testutil/OrionTestHarness.java +++ b/testutil/src/main/java/org/hyperledger/orion/testutil/OrionTestHarness.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.orion.testutil; +package org.hyperledger.orion.testutil; import static com.google.common.io.Files.readLines; diff --git a/testutil/src/main/java/tech/pegasys/orion/testutil/OrionTestHarnessFactory.java b/testutil/src/main/java/org/hyperledger/orion/testutil/OrionTestHarnessFactory.java similarity index 97% rename from testutil/src/main/java/tech/pegasys/orion/testutil/OrionTestHarnessFactory.java rename to testutil/src/main/java/org/hyperledger/orion/testutil/OrionTestHarnessFactory.java index 7b1a11dfc6..2579627b8e 100644 --- a/testutil/src/main/java/tech/pegasys/orion/testutil/OrionTestHarnessFactory.java +++ b/testutil/src/main/java/org/hyperledger/orion/testutil/OrionTestHarnessFactory.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.orion.testutil; +package org.hyperledger.orion.testutil; import static net.consensys.cava.io.file.Files.copyResource; diff --git a/util/build.gradle b/util/build.gradle index 4cc0d49cd0..2cfd6af97c 100644 --- a/util/build.gradle +++ b/util/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java-library' jar { - baseName 'pantheon-util' + baseName 'besu-util' manifest { attributes( 'Specification-Title': baseName, diff --git a/util/src/main/java/tech/pegasys/pantheon/util/ExceptionUtils.java b/util/src/main/java/org/hyperledger/besu/util/ExceptionUtils.java similarity index 96% rename from util/src/main/java/tech/pegasys/pantheon/util/ExceptionUtils.java rename to util/src/main/java/org/hyperledger/besu/util/ExceptionUtils.java index 5dc3ccb79c..ff9c203e82 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/ExceptionUtils.java +++ b/util/src/main/java/org/hyperledger/besu/util/ExceptionUtils.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; import com.google.common.base.Throwables; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/FutureUtils.java b/util/src/main/java/org/hyperledger/besu/util/FutureUtils.java similarity index 99% rename from util/src/main/java/tech/pegasys/pantheon/util/FutureUtils.java rename to util/src/main/java/org/hyperledger/besu/util/FutureUtils.java index 2b5e08b4bd..dd4ec3a57c 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/FutureUtils.java +++ b/util/src/main/java/org/hyperledger/besu/util/FutureUtils.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; import static java.util.concurrent.CompletableFuture.completedFuture; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/InvalidConfigurationException.java b/util/src/main/java/org/hyperledger/besu/util/InvalidConfigurationException.java similarity index 95% rename from util/src/main/java/tech/pegasys/pantheon/util/InvalidConfigurationException.java rename to util/src/main/java/org/hyperledger/besu/util/InvalidConfigurationException.java index dbe65455ab..d65c8e3f7d 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/InvalidConfigurationException.java +++ b/util/src/main/java/org/hyperledger/besu/util/InvalidConfigurationException.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; public class InvalidConfigurationException extends IllegalArgumentException { public InvalidConfigurationException(final String message) { diff --git a/util/src/main/java/tech/pegasys/pantheon/util/LimitedSet.java b/util/src/main/java/org/hyperledger/besu/util/LimitedSet.java similarity index 98% rename from util/src/main/java/tech/pegasys/pantheon/util/LimitedSet.java rename to util/src/main/java/org/hyperledger/besu/util/LimitedSet.java index 7bb3573089..9d53d73b88 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/LimitedSet.java +++ b/util/src/main/java/org/hyperledger/besu/util/LimitedSet.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/NetworkUtility.java b/util/src/main/java/org/hyperledger/besu/util/NetworkUtility.java similarity index 98% rename from util/src/main/java/tech/pegasys/pantheon/util/NetworkUtility.java rename to util/src/main/java/org/hyperledger/besu/util/NetworkUtility.java index d070ba7a98..8c3e016e1d 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/NetworkUtility.java +++ b/util/src/main/java/org/hyperledger/besu/util/NetworkUtility.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; import java.net.Inet6Address; import java.net.InetAddress; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/Preconditions.java b/util/src/main/java/org/hyperledger/besu/util/Preconditions.java similarity index 96% rename from util/src/main/java/tech/pegasys/pantheon/util/Preconditions.java rename to util/src/main/java/org/hyperledger/besu/util/Preconditions.java index 94cb007474..b5a3ee926a 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/Preconditions.java +++ b/util/src/main/java/org/hyperledger/besu/util/Preconditions.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; import java.util.function.Function; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/Subscribers.java b/util/src/main/java/org/hyperledger/besu/util/Subscribers.java similarity index 99% rename from util/src/main/java/tech/pegasys/pantheon/util/Subscribers.java rename to util/src/main/java/org/hyperledger/besu/util/Subscribers.java index d733f4fde7..175eaffaed 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/Subscribers.java +++ b/util/src/main/java/org/hyperledger/besu/util/Subscribers.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/AbstractBytes32Backed.java b/util/src/main/java/org/hyperledger/besu/util/bytes/AbstractBytes32Backed.java similarity index 95% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/AbstractBytes32Backed.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/AbstractBytes32Backed.java index 8d74246f0f..fbf4a96984 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/AbstractBytes32Backed.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/AbstractBytes32Backed.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; /** Base abstract implementation for {@link Bytes32Backed} implementations. */ public class AbstractBytes32Backed implements Bytes32Backed { diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/AbstractBytesValue.java b/util/src/main/java/org/hyperledger/besu/util/bytes/AbstractBytesValue.java similarity index 99% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/AbstractBytesValue.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/AbstractBytesValue.java index 3c0174a9de..ea879dbb47 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/AbstractBytesValue.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/AbstractBytesValue.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkElementIndex; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/ArrayWrappingBytes32.java b/util/src/main/java/org/hyperledger/besu/util/bytes/ArrayWrappingBytes32.java similarity index 97% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/ArrayWrappingBytes32.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/ArrayWrappingBytes32.java index 9138b47420..03875af00e 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/ArrayWrappingBytes32.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/ArrayWrappingBytes32.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static com.google.common.base.Preconditions.checkArgument; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/ArrayWrappingBytesValue.java b/util/src/main/java/org/hyperledger/besu/util/bytes/ArrayWrappingBytesValue.java similarity index 98% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/ArrayWrappingBytesValue.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/ArrayWrappingBytesValue.java index 47fc520217..2a603f9230 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/ArrayWrappingBytesValue.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/ArrayWrappingBytesValue.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkElementIndex; @@ -77,7 +77,7 @@ class ArrayWrappingBytesValue extends AbstractBytesValue { return this; } if (length == 0) { - return BytesValue.EMPTY; + return EMPTY; } checkElementIndex(index, size()); diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/BaseDelegatingBytesValue.java b/util/src/main/java/org/hyperledger/besu/util/bytes/BaseDelegatingBytesValue.java similarity index 98% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/BaseDelegatingBytesValue.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/BaseDelegatingBytesValue.java index 03d7a33f28..474c7f2529 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/BaseDelegatingBytesValue.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/BaseDelegatingBytesValue.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import java.security.MessageDigest; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/Bytes32.java b/util/src/main/java/org/hyperledger/besu/util/bytes/Bytes32.java similarity index 97% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/Bytes32.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/Bytes32.java index 22f043952e..f8ccb88656 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/Bytes32.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/Bytes32.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.util.uint.Int256; -import tech.pegasys.pantheon.util.uint.UInt256; -import tech.pegasys.pantheon.util.uint.UInt256Bytes; +import org.hyperledger.besu.util.uint.Int256; +import org.hyperledger.besu.util.uint.UInt256; +import org.hyperledger.besu.util.uint.UInt256Bytes; /** * A {@link BytesValue} that is guaranteed to contain exactly 32 bytes. diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/Bytes32Backed.java b/util/src/main/java/org/hyperledger/besu/util/bytes/Bytes32Backed.java similarity index 94% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/Bytes32Backed.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/Bytes32Backed.java index bed627327d..f2c93a8089 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/Bytes32Backed.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/Bytes32Backed.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; /** Base interface for a value whose content is stored with exactly 32 bytes. */ public interface Bytes32Backed extends BytesBacked { diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/Bytes32s.java b/util/src/main/java/org/hyperledger/besu/util/bytes/Bytes32s.java similarity index 98% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/Bytes32s.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/Bytes32s.java index 84b3ccf413..24cb5c3255 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/Bytes32s.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/Bytes32s.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; /** Static utility methods to work with {@link Bytes32}. */ public abstract class Bytes32s { diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesBacked.java b/util/src/main/java/org/hyperledger/besu/util/bytes/BytesBacked.java similarity index 91% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesBacked.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/BytesBacked.java index 67578ed373..0ec0f1fe08 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesBacked.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/BytesBacked.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; -import tech.pegasys.pantheon.plugin.data.BinaryData; +import org.hyperledger.besu.plugin.data.BinaryData; /** Base interface for a value whose content is stored as bytes. */ public interface BytesBacked extends BinaryData { diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesValue.java b/util/src/main/java/org/hyperledger/besu/util/bytes/BytesValue.java similarity index 99% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesValue.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/BytesValue.java index fea82182b8..a8405356a3 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesValue.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/BytesValue.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkElementIndex; -import tech.pegasys.pantheon.plugin.data.UnformattedData; +import org.hyperledger.besu.plugin.data.UnformattedData; import java.nio.ByteBuffer; import java.security.MessageDigest; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesValues.java b/util/src/main/java/org/hyperledger/besu/util/bytes/BytesValues.java similarity index 99% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesValues.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/BytesValues.java index a51c332302..7bf8624eca 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesValues.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/BytesValues.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static com.google.common.base.Preconditions.checkArgument; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/DelegatingBytes32.java b/util/src/main/java/org/hyperledger/besu/util/bytes/DelegatingBytes32.java similarity index 96% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/DelegatingBytes32.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/DelegatingBytes32.java index 626da14581..1013f40529 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/DelegatingBytes32.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/DelegatingBytes32.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; public class DelegatingBytes32 extends BaseDelegatingBytesValue implements Bytes32 { protected DelegatingBytes32(final Bytes32 wrapped) { diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/DelegatingBytesValue.java b/util/src/main/java/org/hyperledger/besu/util/bytes/DelegatingBytesValue.java similarity index 96% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/DelegatingBytesValue.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/DelegatingBytesValue.java index be9a350387..1dc466192f 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/DelegatingBytesValue.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/DelegatingBytesValue.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; public class DelegatingBytesValue extends BaseDelegatingBytesValue implements BytesValue { diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableArrayWrappingBytes32.java b/util/src/main/java/org/hyperledger/besu/util/bytes/MutableArrayWrappingBytes32.java similarity index 96% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableArrayWrappingBytes32.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/MutableArrayWrappingBytes32.java index 96d2342f48..ef027be2bf 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableArrayWrappingBytes32.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/MutableArrayWrappingBytes32.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; /** An implementation of {@link MutableBytes32} backed by a byte array ({@code byte[]}). */ class MutableArrayWrappingBytes32 extends MutableArrayWrappingBytesValue implements MutableBytes32 { diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableArrayWrappingBytesValue.java b/util/src/main/java/org/hyperledger/besu/util/bytes/MutableArrayWrappingBytesValue.java similarity index 98% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableArrayWrappingBytesValue.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/MutableArrayWrappingBytesValue.java index 50b38f5ffe..677ba99534 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableArrayWrappingBytesValue.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/MutableArrayWrappingBytesValue.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkElementIndex; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBufferWrappingBytesValue.java b/util/src/main/java/org/hyperledger/besu/util/bytes/MutableBufferWrappingBytesValue.java similarity index 98% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBufferWrappingBytesValue.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/MutableBufferWrappingBytesValue.java index 30e892dc3a..da25c44a6a 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBufferWrappingBytesValue.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/MutableBufferWrappingBytesValue.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkElementIndex; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableByteBufWrappingBytesValue.java b/util/src/main/java/org/hyperledger/besu/util/bytes/MutableByteBufWrappingBytesValue.java similarity index 98% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableByteBufWrappingBytesValue.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/MutableByteBufWrappingBytesValue.java index 99f51bade8..a7fd7859b3 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableByteBufWrappingBytesValue.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/MutableByteBufWrappingBytesValue.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkElementIndex; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableByteBufferWrappingBytesValue.java b/util/src/main/java/org/hyperledger/besu/util/bytes/MutableByteBufferWrappingBytesValue.java similarity index 98% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableByteBufferWrappingBytesValue.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/MutableByteBufferWrappingBytesValue.java index b5c8895f68..78fb0a304b 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableByteBufferWrappingBytesValue.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/MutableByteBufferWrappingBytesValue.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkElementIndex; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBytes32.java b/util/src/main/java/org/hyperledger/besu/util/bytes/MutableBytes32.java similarity index 97% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBytes32.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/MutableBytes32.java index 3fd8ef937a..a4fb6d1114 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBytes32.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/MutableBytes32.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static com.google.common.base.Preconditions.checkArgument; @@ -93,7 +93,7 @@ public interface MutableBytes32 extends MutableBytesValue, Bytes32 { @Override public MutableBytes32 mutableCopy() { - return MutableBytes32.wrap(value.extractArray()); + return wrap(value.extractArray()); } @Override diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBytesValue.java b/util/src/main/java/org/hyperledger/besu/util/bytes/MutableBytesValue.java similarity index 99% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBytesValue.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/MutableBytesValue.java index b12cfc0c87..44eaeabbe9 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBytesValue.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/MutableBytesValue.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkElementIndex; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/WrappingBytes32.java b/util/src/main/java/org/hyperledger/besu/util/bytes/WrappingBytes32.java similarity index 97% rename from util/src/main/java/tech/pegasys/pantheon/util/bytes/WrappingBytes32.java rename to util/src/main/java/org/hyperledger/besu/util/bytes/WrappingBytes32.java index a44ad9a0d4..0b14ea28cf 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/WrappingBytes32.java +++ b/util/src/main/java/org/hyperledger/besu/util/bytes/WrappingBytes32.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static com.google.common.base.Preconditions.checkArgument; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/number/Fraction.java b/util/src/main/java/org/hyperledger/besu/util/number/Fraction.java similarity index 98% rename from util/src/main/java/tech/pegasys/pantheon/util/number/Fraction.java rename to util/src/main/java/org/hyperledger/besu/util/number/Fraction.java index 12ba050454..250b95f959 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/number/Fraction.java +++ b/util/src/main/java/org/hyperledger/besu/util/number/Fraction.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.number; +package org.hyperledger.besu.util.number; import static com.google.common.base.Preconditions.checkArgument; import static java.lang.Float.parseFloat; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/number/Percentage.java b/util/src/main/java/org/hyperledger/besu/util/number/Percentage.java similarity index 97% rename from util/src/main/java/tech/pegasys/pantheon/util/number/Percentage.java rename to util/src/main/java/org/hyperledger/besu/util/number/Percentage.java index c99c3f7fbb..25952a80c0 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/number/Percentage.java +++ b/util/src/main/java/org/hyperledger/besu/util/number/Percentage.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.number; +package org.hyperledger.besu.util.number; import static com.google.common.base.Preconditions.checkArgument; import static java.lang.Integer.parseInt; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/number/PositiveNumber.java b/util/src/main/java/org/hyperledger/besu/util/number/PositiveNumber.java similarity index 97% rename from util/src/main/java/tech/pegasys/pantheon/util/number/PositiveNumber.java rename to util/src/main/java/org/hyperledger/besu/util/number/PositiveNumber.java index 66a0835695..a5a4089e4c 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/number/PositiveNumber.java +++ b/util/src/main/java/org/hyperledger/besu/util/number/PositiveNumber.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.number; +package org.hyperledger.besu.util.number; import static com.google.common.base.Preconditions.checkArgument; import static java.lang.Integer.parseInt; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/uint/AbstractUInt256Value.java b/util/src/main/java/org/hyperledger/besu/util/uint/AbstractUInt256Value.java similarity index 96% rename from util/src/main/java/tech/pegasys/pantheon/util/uint/AbstractUInt256Value.java rename to util/src/main/java/org/hyperledger/besu/util/uint/AbstractUInt256Value.java index b2f19d2d14..eb485ab80c 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/AbstractUInt256Value.java +++ b/util/src/main/java/org/hyperledger/besu/util/uint/AbstractUInt256Value.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.util.uint; +package org.hyperledger.besu.util.uint; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.util.bytes.AbstractBytes32Backed; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.Bytes32s; +import org.hyperledger.besu.util.bytes.AbstractBytes32Backed; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.Bytes32s; import java.math.BigInteger; import java.util.function.Supplier; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/uint/BaseUInt256Value.java b/util/src/main/java/org/hyperledger/besu/util/uint/BaseUInt256Value.java similarity index 96% rename from util/src/main/java/tech/pegasys/pantheon/util/uint/BaseUInt256Value.java rename to util/src/main/java/org/hyperledger/besu/util/uint/BaseUInt256Value.java index 03579dd712..29157052e0 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/BaseUInt256Value.java +++ b/util/src/main/java/org/hyperledger/besu/util/uint/BaseUInt256Value.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.util.uint; +package org.hyperledger.besu.util.uint; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.Bytes32; import java.math.BigInteger; import java.util.function.Supplier; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/uint/Counter.java b/util/src/main/java/org/hyperledger/besu/util/uint/Counter.java similarity index 94% rename from util/src/main/java/tech/pegasys/pantheon/util/uint/Counter.java rename to util/src/main/java/org/hyperledger/besu/util/uint/Counter.java index 4ed6d638bf..b1ed40f3a0 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/Counter.java +++ b/util/src/main/java/org/hyperledger/besu/util/uint/Counter.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.util.uint; +package org.hyperledger.besu.util.uint; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.MutableBytes32; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.MutableBytes32; import java.util.function.Function; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/uint/DefaultInt256.java b/util/src/main/java/org/hyperledger/besu/util/uint/DefaultInt256.java similarity index 92% rename from util/src/main/java/tech/pegasys/pantheon/util/uint/DefaultInt256.java rename to util/src/main/java/org/hyperledger/besu/util/uint/DefaultInt256.java index 41d567f14a..95f3e98c0a 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/DefaultInt256.java +++ b/util/src/main/java/org/hyperledger/besu/util/uint/DefaultInt256.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.util.uint; +package org.hyperledger.besu.util.uint; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.util.bytes.AbstractBytes32Backed; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.MutableBytes32; +import org.hyperledger.besu.util.bytes.AbstractBytes32Backed; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.MutableBytes32; /** * Default implementation of a {@link Int256}. diff --git a/util/src/main/java/tech/pegasys/pantheon/util/uint/DefaultUInt256.java b/util/src/main/java/org/hyperledger/besu/util/uint/DefaultUInt256.java similarity index 93% rename from util/src/main/java/tech/pegasys/pantheon/util/uint/DefaultUInt256.java rename to util/src/main/java/org/hyperledger/besu/util/uint/DefaultUInt256.java index 29d70e4c7c..db449f6100 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/DefaultUInt256.java +++ b/util/src/main/java/org/hyperledger/besu/util/uint/DefaultUInt256.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.util.uint; +package org.hyperledger.besu.util.uint; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.Bytes32; /** * Default implementation of a {@link UInt256}. diff --git a/util/src/main/java/tech/pegasys/pantheon/util/uint/Int256.java b/util/src/main/java/org/hyperledger/besu/util/uint/Int256.java similarity index 91% rename from util/src/main/java/tech/pegasys/pantheon/util/uint/Int256.java rename to util/src/main/java/org/hyperledger/besu/util/uint/Int256.java index 7e222bb6bf..5ff0ea7ef3 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/Int256.java +++ b/util/src/main/java/org/hyperledger/besu/util/uint/Int256.java @@ -10,10 +10,10 @@ * 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. */ -package tech.pegasys.pantheon.util.uint; +package org.hyperledger.besu.util.uint; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.Bytes32Backed; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.Bytes32Backed; /** A signed 256-bits precision number. */ /* diff --git a/util/src/main/java/tech/pegasys/pantheon/util/uint/Int256Bytes.java b/util/src/main/java/org/hyperledger/besu/util/uint/Int256Bytes.java similarity index 92% rename from util/src/main/java/tech/pegasys/pantheon/util/uint/Int256Bytes.java rename to util/src/main/java/org/hyperledger/besu/util/uint/Int256Bytes.java index 4843687694..3183afa5d5 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/Int256Bytes.java +++ b/util/src/main/java/org/hyperledger/besu/util/uint/Int256Bytes.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.util.uint; +package org.hyperledger.besu.util.uint; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; -import tech.pegasys.pantheon.util.bytes.MutableBytes32; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.besu.util.bytes.MutableBytes32; import java.math.BigInteger; import java.util.function.BinaryOperator; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256.java b/util/src/main/java/org/hyperledger/besu/util/uint/UInt256.java similarity index 95% rename from util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256.java rename to util/src/main/java/org/hyperledger/besu/util/uint/UInt256.java index eb2e70c5dc..7582484328 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256.java +++ b/util/src/main/java/org/hyperledger/besu/util/uint/UInt256.java @@ -10,9 +10,9 @@ * 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. */ -package tech.pegasys.pantheon.util.uint; +package org.hyperledger.besu.util.uint; -import tech.pegasys.pantheon.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.Bytes32; import java.math.BigInteger; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256Bytes.java b/util/src/main/java/org/hyperledger/besu/util/uint/UInt256Bytes.java similarity index 97% rename from util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256Bytes.java rename to util/src/main/java/org/hyperledger/besu/util/uint/UInt256Bytes.java index aba8195dfc..1bbcc0eb8b 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256Bytes.java +++ b/util/src/main/java/org/hyperledger/besu/util/uint/UInt256Bytes.java @@ -10,15 +10,15 @@ * 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. */ -package tech.pegasys.pantheon.util.uint; +package org.hyperledger.besu.util.uint; import static com.google.common.base.Preconditions.checkArgument; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.Bytes32s; -import tech.pegasys.pantheon.util.bytes.BytesValue; -import tech.pegasys.pantheon.util.bytes.BytesValues; -import tech.pegasys.pantheon.util.bytes.MutableBytes32; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.Bytes32s; +import org.hyperledger.besu.util.bytes.BytesValue; +import org.hyperledger.besu.util.bytes.BytesValues; +import org.hyperledger.besu.util.bytes.MutableBytes32; import java.math.BigInteger; import java.util.function.BinaryOperator; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256Value.java b/util/src/main/java/org/hyperledger/besu/util/uint/UInt256Value.java similarity index 97% rename from util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256Value.java rename to util/src/main/java/org/hyperledger/besu/util/uint/UInt256Value.java index d695627c10..8b8be18259 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256Value.java +++ b/util/src/main/java/org/hyperledger/besu/util/uint/UInt256Value.java @@ -10,12 +10,12 @@ * 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. */ -package tech.pegasys.pantheon.util.uint; +package org.hyperledger.besu.util.uint; import static com.google.common.base.Preconditions.checkState; -import tech.pegasys.pantheon.plugin.data.Quantity; -import tech.pegasys.pantheon.util.bytes.Bytes32Backed; +import org.hyperledger.besu.plugin.data.Quantity; +import org.hyperledger.besu.util.bytes.Bytes32Backed; /** * Represents a 256-bits (32 bytes) unsigned integer value. diff --git a/util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256s.java b/util/src/main/java/org/hyperledger/besu/util/uint/UInt256s.java similarity index 97% rename from util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256s.java rename to util/src/main/java/org/hyperledger/besu/util/uint/UInt256s.java index c8f67973b3..cfdc405869 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256s.java +++ b/util/src/main/java/org/hyperledger/besu/util/uint/UInt256s.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.uint; +package org.hyperledger.besu.util.uint; /** Static utility methods on UInt256 values. */ public class UInt256s { diff --git a/util/src/test/java/tech/pegasys/pantheon/util/ExceptionUtilsTest.java b/util/src/test/java/org/hyperledger/besu/util/ExceptionUtilsTest.java similarity index 97% rename from util/src/test/java/tech/pegasys/pantheon/util/ExceptionUtilsTest.java rename to util/src/test/java/org/hyperledger/besu/util/ExceptionUtilsTest.java index 9dbd7a6356..34f396e64c 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/ExceptionUtilsTest.java +++ b/util/src/test/java/org/hyperledger/besu/util/ExceptionUtilsTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; import static org.assertj.core.api.Assertions.assertThat; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/FutureUtilsTest.java b/util/src/test/java/org/hyperledger/besu/util/FutureUtilsTest.java similarity index 96% rename from util/src/test/java/tech/pegasys/pantheon/util/FutureUtilsTest.java rename to util/src/test/java/org/hyperledger/besu/util/FutureUtilsTest.java index 6c60634b3c..33ac4e9e4a 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/FutureUtilsTest.java +++ b/util/src/test/java/org/hyperledger/besu/util/FutureUtilsTest.java @@ -10,17 +10,17 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.hyperledger.besu.util.FutureUtils.exceptionallyCompose; +import static org.hyperledger.besu.util.FutureUtils.propagateCancellation; +import static org.hyperledger.besu.util.FutureUtils.propagateResult; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static tech.pegasys.pantheon.util.FutureUtils.exceptionallyCompose; -import static tech.pegasys.pantheon.util.FutureUtils.propagateCancellation; -import static tech.pegasys.pantheon.util.FutureUtils.propagateResult; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/LimitedSetTest.java b/util/src/test/java/org/hyperledger/besu/util/LimitedSetTest.java similarity index 95% rename from util/src/test/java/tech/pegasys/pantheon/util/LimitedSetTest.java rename to util/src/test/java/org/hyperledger/besu/util/LimitedSetTest.java index 390e6df6ad..0640a4c0b3 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/LimitedSetTest.java +++ b/util/src/test/java/org/hyperledger/besu/util/LimitedSetTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.util.LimitedSet.Mode; +import org.hyperledger.besu.util.LimitedSet.Mode; import java.util.Set; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/NetworkUtilityTest.java b/util/src/test/java/org/hyperledger/besu/util/NetworkUtilityTest.java similarity index 97% rename from util/src/test/java/tech/pegasys/pantheon/util/NetworkUtilityTest.java rename to util/src/test/java/org/hyperledger/besu/util/NetworkUtilityTest.java index 22278d1dff..8c95549f81 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/NetworkUtilityTest.java +++ b/util/src/test/java/org/hyperledger/besu/util/NetworkUtilityTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; import static org.assertj.core.api.Assertions.assertThat; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/SubscribersTest.java b/util/src/test/java/org/hyperledger/besu/util/SubscribersTest.java similarity index 98% rename from util/src/test/java/tech/pegasys/pantheon/util/SubscribersTest.java rename to util/src/test/java/org/hyperledger/besu/util/SubscribersTest.java index 97b48f8b7b..982fedd659 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/SubscribersTest.java +++ b/util/src/test/java/org/hyperledger/besu/util/SubscribersTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util; +package org.hyperledger.besu.util; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/bytes/Bytes32Test.java b/util/src/test/java/org/hyperledger/besu/util/bytes/Bytes32Test.java similarity index 97% rename from util/src/test/java/tech/pegasys/pantheon/util/bytes/Bytes32Test.java rename to util/src/test/java/org/hyperledger/besu/util/bytes/Bytes32Test.java index eda6250b63..b8461d6387 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/bytes/Bytes32Test.java +++ b/util/src/test/java/org/hyperledger/besu/util/bytes/Bytes32Test.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static org.assertj.core.api.Assertions.assertThat; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/bytes/Bytes32sSingleLeftShiftTest.java b/util/src/test/java/org/hyperledger/besu/util/bytes/Bytes32sSingleLeftShiftTest.java similarity index 98% rename from util/src/test/java/tech/pegasys/pantheon/util/bytes/Bytes32sSingleLeftShiftTest.java rename to util/src/test/java/org/hyperledger/besu/util/bytes/Bytes32sSingleLeftShiftTest.java index 1610222d22..544052cce3 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/bytes/Bytes32sSingleLeftShiftTest.java +++ b/util/src/test/java/org/hyperledger/besu/util/bytes/Bytes32sSingleLeftShiftTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static org.assertj.core.api.Assertions.assertThat; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValueImplementationsTest.java b/util/src/test/java/org/hyperledger/besu/util/bytes/BytesValueImplementationsTest.java similarity index 99% rename from util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValueImplementationsTest.java rename to util/src/test/java/org/hyperledger/besu/util/bytes/BytesValueImplementationsTest.java index d3a1b30bd3..e0e9ef28d8 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValueImplementationsTest.java +++ b/util/src/test/java/org/hyperledger/besu/util/bytes/BytesValueImplementationsTest.java @@ -10,11 +10,11 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static tech.pegasys.pantheon.util.bytes.BytesValue.fromHexString; +import static org.hyperledger.besu.util.bytes.BytesValue.fromHexString; import java.math.BigInteger; import java.nio.ByteBuffer; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValueTest.java b/util/src/test/java/org/hyperledger/besu/util/bytes/BytesValueTest.java similarity index 97% rename from util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValueTest.java rename to util/src/test/java/org/hyperledger/besu/util/bytes/BytesValueTest.java index 92155f8700..1ae002bcf5 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValueTest.java +++ b/util/src/test/java/org/hyperledger/besu/util/bytes/BytesValueTest.java @@ -10,13 +10,13 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.util.bytes.BytesValue.fromHexString; -import static tech.pegasys.pantheon.util.bytes.BytesValue.fromHexStringLenient; -import static tech.pegasys.pantheon.util.bytes.BytesValue.wrap; -import static tech.pegasys.pantheon.util.bytes.BytesValue.wrapBuffer; +import static org.hyperledger.besu.util.bytes.BytesValue.fromHexString; +import static org.hyperledger.besu.util.bytes.BytesValue.fromHexStringLenient; +import static org.hyperledger.besu.util.bytes.BytesValue.wrap; +import static org.hyperledger.besu.util.bytes.BytesValue.wrapBuffer; import java.util.Arrays; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValuesTest.java b/util/src/test/java/org/hyperledger/besu/util/bytes/BytesValuesTest.java similarity index 92% rename from util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValuesTest.java rename to util/src/test/java/org/hyperledger/besu/util/bytes/BytesValuesTest.java index d17d94aab8..eec425dddc 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValuesTest.java +++ b/util/src/test/java/org/hyperledger/besu/util/bytes/BytesValuesTest.java @@ -10,18 +10,18 @@ * 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. */ -package tech.pegasys.pantheon.util.bytes; +package org.hyperledger.besu.util.bytes; import static org.assertj.core.api.Assertions.assertThat; -import static tech.pegasys.pantheon.util.bytes.BytesValue.fromHexString; -import static tech.pegasys.pantheon.util.bytes.BytesValues.asSignedBigInteger; -import static tech.pegasys.pantheon.util.bytes.BytesValues.asUnsignedBigInteger; -import static tech.pegasys.pantheon.util.bytes.BytesValues.concatenate; -import static tech.pegasys.pantheon.util.bytes.BytesValues.extractInt; -import static tech.pegasys.pantheon.util.bytes.BytesValues.extractLong; -import static tech.pegasys.pantheon.util.bytes.BytesValues.ofUnsignedShort; -import static tech.pegasys.pantheon.util.bytes.BytesValues.toMinimalBytes; -import static tech.pegasys.pantheon.util.bytes.BytesValues.trimLeadingZeros; +import static org.hyperledger.besu.util.bytes.BytesValue.fromHexString; +import static org.hyperledger.besu.util.bytes.BytesValues.asSignedBigInteger; +import static org.hyperledger.besu.util.bytes.BytesValues.asUnsignedBigInteger; +import static org.hyperledger.besu.util.bytes.BytesValues.concatenate; +import static org.hyperledger.besu.util.bytes.BytesValues.extractInt; +import static org.hyperledger.besu.util.bytes.BytesValues.extractLong; +import static org.hyperledger.besu.util.bytes.BytesValues.ofUnsignedShort; +import static org.hyperledger.besu.util.bytes.BytesValues.toMinimalBytes; +import static org.hyperledger.besu.util.bytes.BytesValues.trimLeadingZeros; import java.math.BigInteger; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/number/FractionTest.java b/util/src/test/java/org/hyperledger/besu/util/number/FractionTest.java similarity index 97% rename from util/src/test/java/tech/pegasys/pantheon/util/number/FractionTest.java rename to util/src/test/java/org/hyperledger/besu/util/number/FractionTest.java index a9adb603c5..aedf4af7df 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/number/FractionTest.java +++ b/util/src/test/java/org/hyperledger/besu/util/number/FractionTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.number; +package org.hyperledger.besu.util.number; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/number/PercentageTest.java b/util/src/test/java/org/hyperledger/besu/util/number/PercentageTest.java similarity index 97% rename from util/src/test/java/tech/pegasys/pantheon/util/number/PercentageTest.java rename to util/src/test/java/org/hyperledger/besu/util/number/PercentageTest.java index 982d476912..616c9df55f 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/number/PercentageTest.java +++ b/util/src/test/java/org/hyperledger/besu/util/number/PercentageTest.java @@ -10,7 +10,7 @@ * 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. */ -package tech.pegasys.pantheon.util.number; +package org.hyperledger.besu.util.number; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/uint/UInt256BytesTest.java b/util/src/test/java/org/hyperledger/besu/util/uint/UInt256BytesTest.java similarity index 97% rename from util/src/test/java/tech/pegasys/pantheon/util/uint/UInt256BytesTest.java rename to util/src/test/java/org/hyperledger/besu/util/uint/UInt256BytesTest.java index df98a60859..a327110ca1 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/uint/UInt256BytesTest.java +++ b/util/src/test/java/org/hyperledger/besu/util/uint/UInt256BytesTest.java @@ -10,14 +10,14 @@ * 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. */ -package tech.pegasys.pantheon.util.uint; +package org.hyperledger.besu.util.uint; import static org.assertj.core.api.Assertions.assertThat; -import tech.pegasys.pantheon.util.bytes.Bytes32; -import tech.pegasys.pantheon.util.bytes.MutableBytes32; -import tech.pegasys.pantheon.util.uint.UInt256Bytes.BinaryLongOp; -import tech.pegasys.pantheon.util.uint.UInt256Bytes.BinaryOp; +import org.hyperledger.besu.util.bytes.Bytes32; +import org.hyperledger.besu.util.bytes.MutableBytes32; +import org.hyperledger.besu.util.uint.UInt256Bytes.BinaryLongOp; +import org.hyperledger.besu.util.uint.UInt256Bytes.BinaryOp; import java.math.BigInteger;