diff --git a/Dockerfile b/Dockerfile index 52e2251839..d458e5ee81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM openjdk:8-jdk # copy application (with libraries inside) ADD build/install/pantheon /opt/pantheon/ -ADD integration-tests/src/test/resources/net/consensys/pantheon/tests/cluster/docker/geth/genesis.json /opt/pantheon/genesis.json +ADD integration-tests/src/test/resources/tech/pegasys/pantheon/tests/cluster/docker/geth/genesis.json /opt/pantheon/genesis.json # List Exposed Ports EXPOSE 8084 8545 30303 30303/udp diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/CreateAccountAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/CreateAccountAcceptanceTest.java index 8e5270bf76..1a45a2d97a 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/CreateAccountAcceptanceTest.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/CreateAccountAcceptanceTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.tests.acceptance; +package tech.pegasys.pantheon.tests.acceptance; -import static net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonMinerNode; -import static net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonNode; import static org.web3j.utils.Convert.Unit.ETHER; +import static tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonMinerNode; +import static tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonNode; -import net.consensys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import net.consensys.pantheon.tests.acceptance.dsl.account.Account; -import net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNode; +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.junit.Before; import org.junit.Test; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/PantheonClusterAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/PantheonClusterAcceptanceTest.java index f9648d303f..3b7e6a95c8 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/PantheonClusterAcceptanceTest.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/PantheonClusterAcceptanceTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.tests.acceptance; +package tech.pegasys.pantheon.tests.acceptance; -import static net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonMinerNode; -import static net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonNode; +import static tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonMinerNode; +import static tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonNode; -import net.consensys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; +import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; import org.junit.Before; import org.junit.Test; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/RpcApisTogglesAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/RpcApisTogglesAcceptanceTest.java index 1df51e3ed6..04afb62816 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/RpcApisTogglesAcceptanceTest.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/RpcApisTogglesAcceptanceTest.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.tests.acceptance; +package tech.pegasys.pantheon.tests.acceptance; -import static net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonNode; -import static net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonRpcDisabledNode; -import static net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.patheonNodeWithRpcApis; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; +import static tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonNode; +import static tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonRpcDisabledNode; +import static tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.patheonNodeWithRpcApis; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; -import net.consensys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; +import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; +import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; import org.junit.Before; import org.junit.Test; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/AcceptanceTestBase.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/AcceptanceTestBase.java index da306ee0a0..d7c46a8b5f 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/AcceptanceTestBase.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/AcceptanceTestBase.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.tests.acceptance.dsl; +package tech.pegasys.pantheon.tests.acceptance.dsl; -import net.consensys.pantheon.tests.acceptance.dsl.account.Accounts; -import net.consensys.pantheon.tests.acceptance.dsl.node.Cluster; +import tech.pegasys.pantheon.tests.acceptance.dsl.account.Accounts; +import tech.pegasys.pantheon.tests.acceptance.dsl.node.Cluster; import org.junit.After; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/JsonRpc.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/JsonRpc.java index 30ee9584ae..a7554a607e 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/JsonRpc.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/JsonRpc.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.tests.acceptance.dsl; +package tech.pegasys.pantheon.tests.acceptance.dsl; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.tests.acceptance.dsl.node.Cluster; -import net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import tech.pegasys.pantheon.tests.acceptance.dsl.node.Cluster; +import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; public class JsonRpc { diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/WaitUtils.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/WaitUtils.java index c1b7a6138d..c35e98a6cf 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/WaitUtils.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/WaitUtils.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.tests.acceptance.dsl; +package tech.pegasys.pantheon.tests.acceptance.dsl; import java.util.concurrent.TimeUnit; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Account.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Account.java index 0d4e9582dc..0efa33266e 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Account.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Account.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.tests.acceptance.dsl.account; +package tech.pegasys.pantheon.tests.acceptance.dsl.account; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.crypto.SECP256K1.PrivateKey; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.util.bytes.Bytes32; +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.util.bytes.Bytes32; import java.math.BigInteger; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Accounts.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Accounts.java index 19a220cbdc..f753cb0575 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Accounts.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Accounts.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.tests.acceptance.dsl.account; +package tech.pegasys.pantheon.tests.acceptance.dsl.account; -import static net.consensys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; import static org.apache.logging.log4j.LogManager.getLogger; import static org.assertj.core.api.Assertions.assertThat; import static org.web3j.utils.Convert.Unit.ETHER; import static org.web3j.utils.Convert.toWei; +import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; import java.util.ArrayList; import java.util.List; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Cluster.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Cluster.java index 33d8173a7e..8e8249ab82 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Cluster.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Cluster.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.tests.acceptance.dsl.node; +package tech.pegasys.pantheon.tests.acceptance.dsl.node; -import static net.consensys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor; 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 net.consensys.pantheon.tests.acceptance.dsl.WaitUtils; -import net.consensys.pantheon.tests.acceptance.dsl.account.Account; +import tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils; +import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; import java.io.IOException; import java.util.ArrayList; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Eth.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Eth.java index ba5f6e60cb..cce12a84e9 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Eth.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Eth.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.tests.acceptance.dsl.node; +package tech.pegasys.pantheon.tests.acceptance.dsl.node; import static org.assertj.core.api.Assertions.assertThat; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNode.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNode.java index 83088e4705..3514ca530e 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNode.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNode.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.tests.acceptance.dsl.node; +package tech.pegasys.pantheon.tests.acceptance.dsl.node; import static org.apache.logging.log4j.LogManager.getLogger; import static org.assertj.core.api.Assertions.assertThat; @@ -6,13 +6,13 @@ import static org.assertj.core.api.Assertions.catchThrowable; import static org.web3j.protocol.core.DefaultBlockParameterName.LATEST; import static org.web3j.utils.Numeric.toHexString; -import net.consensys.pantheon.controller.KeyPairUtil; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.blockcreation.MiningParameters; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.WebSocketConfiguration; -import net.consensys.pantheon.tests.acceptance.dsl.account.Account; +import tech.pegasys.pantheon.controller.KeyPairUtil; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.ethereum.blockcreation.MiningParameters; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.WebSocketConfiguration; +import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; import java.io.File; import java.io.FileInputStream; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNodeConfig.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNodeConfig.java index 65af3ab4b4..e471bc5bde 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNodeConfig.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNodeConfig.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.tests.acceptance.dsl.node; +package tech.pegasys.pantheon.tests.acceptance.dsl.node; -import net.consensys.pantheon.ethereum.blockcreation.MiningParameters; -import net.consensys.pantheon.ethereum.core.MiningParametersTestBuilder; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.WebSocketConfiguration; +import tech.pegasys.pantheon.ethereum.blockcreation.MiningParameters; +import tech.pegasys.pantheon.ethereum.core.MiningParametersTestBuilder; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.WebSocketConfiguration; import java.io.IOException; import java.net.ServerSocket; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNodeRunner.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNodeRunner.java index 4a2be3a82e..4c27b2cc24 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNodeRunner.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNodeRunner.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.tests.acceptance.dsl.node; +package tech.pegasys.pantheon.tests.acceptance.dsl.node; import java.io.File; import java.nio.file.Files; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java index 4150c515b0..04ad640c0c 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.tests.acceptance.dsl.node; +package tech.pegasys.pantheon.tests.acceptance.dsl.node; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; import java.io.File; import java.io.IOException; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java index f8b16f96a9..8651e53a48 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.tests.acceptance.dsl.node; +package tech.pegasys.pantheon.tests.acceptance.dsl.node; -import static net.consensys.pantheon.cli.EthNetworkConfig.mainnet; +import static tech.pegasys.pantheon.cli.EthNetworkConfig.mainnet; -import net.consensys.pantheon.Runner; -import net.consensys.pantheon.RunnerBuilder; -import net.consensys.pantheon.cli.EthNetworkConfig; -import net.consensys.pantheon.cli.PantheonControllerBuilder; -import net.consensys.pantheon.controller.PantheonController; -import net.consensys.pantheon.ethereum.eth.sync.SynchronizerConfiguration.Builder; +import tech.pegasys.pantheon.Runner; +import tech.pegasys.pantheon.RunnerBuilder; +import tech.pegasys.pantheon.cli.EthNetworkConfig; +import tech.pegasys.pantheon.cli.PantheonControllerBuilder; +import tech.pegasys.pantheon.controller.PantheonController; +import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration.Builder; import java.io.IOException; import java.util.HashMap; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Web3.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Web3.java index 9b3e6d67f9..cb3238d0fa 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Web3.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Web3.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.tests.acceptance.dsl.node; +package tech.pegasys.pantheon.tests.acceptance.dsl.node; import static org.assertj.core.api.Assertions.assertThat; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java index 3c79bc6665..f987a64fea 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.tests.acceptance.dsl.pubsub; +package tech.pegasys.pantheon.tests.acceptance.dsl.pubsub; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/Subscription.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/Subscription.java index 92ce3942bc..9db10f5137 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/Subscription.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/Subscription.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.tests.acceptance.dsl.pubsub; +package tech.pegasys.pantheon.tests.acceptance.dsl.pubsub; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.Hash; import java.util.List; import java.util.Map; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/SubscriptionEvent.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/SubscriptionEvent.java index 180d5d0587..2d4adc0baf 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/SubscriptionEvent.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/SubscriptionEvent.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.tests.acceptance.dsl.pubsub; +package tech.pegasys.pantheon.tests.acceptance.dsl.pubsub; import java.util.Map; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocket.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocket.java index c104baf76f..4bda493b39 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocket.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocket.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.tests.acceptance.dsl.pubsub; +package tech.pegasys.pantheon.tests.acceptance.dsl.pubsub; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; import java.util.List; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketConnection.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketConnection.java index a3ce9fddc3..d12ce95150 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketConnection.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketConnection.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.tests.acceptance.dsl.pubsub; +package tech.pegasys.pantheon.tests.acceptance.dsl.pubsub; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.tests.acceptance.dsl.WaitUtils; -import net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils; +import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; import java.util.ArrayList; import java.util.List; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketEvent.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketEvent.java index b69f0306a4..7e8b326ec3 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketEvent.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketEvent.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.tests.acceptance.dsl.pubsub; +package tech.pegasys.pantheon.tests.acceptance.dsl.pubsub; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java index 5577782335..acd22bee25 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.tests.acceptance.jsonrpc; +package tech.pegasys.pantheon.tests.acceptance.jsonrpc; -import static net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonNode; import static org.assertj.core.api.Assertions.assertThat; +import static tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonNode; -import net.consensys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNode; +import tech.pegasys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; +import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode; import java.io.IOException; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/mining/MiningAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/mining/MiningAcceptanceTest.java index 48fbdf0cb7..3473d554e6 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/mining/MiningAcceptanceTest.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/mining/MiningAcceptanceTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.tests.acceptance.mining; +package tech.pegasys.pantheon.tests.acceptance.mining; -import static net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonMinerNode; import static org.web3j.utils.Convert.Unit.ETHER; +import static tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonMinerNode; -import net.consensys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import net.consensys.pantheon.tests.acceptance.dsl.account.Account; -import net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNode; +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.junit.Before; import org.junit.Test; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java index 5d50780901..fc95b6bf89 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.tests.acceptance.pubsub; +package tech.pegasys.pantheon.tests.acceptance.pubsub; -import static net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonMinerNode; -import static net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonNode; import static org.assertj.core.api.Assertions.assertThat; - -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import net.consensys.pantheon.tests.acceptance.dsl.account.Account; -import net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import net.consensys.pantheon.tests.acceptance.dsl.pubsub.Subscription; -import net.consensys.pantheon.tests.acceptance.dsl.pubsub.WebSocket; +import static tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonMinerNode; +import static tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonNode; + +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 java.math.BigInteger; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/EventEmitter.sol b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/EventEmitter.sol index b1f3c456fd..fb917ea17a 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/EventEmitter.sol +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/EventEmitter.sol @@ -2,7 +2,7 @@ pragma solidity ^0.4.0; // compile with: // solc EventEmitter.sol --bin --abi --optimize --overwrite -o . // then create web3j wrappers with: -// web3j solidity generate ./generated/EventEmitter.bin ./generated/EventEmitter.abi -o ../../../../../ -p net.consensys.pantheon.tests.web3j.generated +// web3j solidity generate ./generated/EventEmitter.bin ./generated/EventEmitter.abi -o ../../../../../ -p tech.pegasys.pantheon.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/tech/pegasys/pantheon/tests/web3j/EventEmitterAcceptanceTest.java index 6dc5775c60..1eae3c576f 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/EventEmitterAcceptanceTest.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/EventEmitterAcceptanceTest.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.tests.web3j; +package tech.pegasys.pantheon.tests.web3j; -import static net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonMinerNode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNodeConfig.pantheonMinerNode; -import net.consensys.pantheon.tests.acceptance.dsl.AcceptanceTestBase; -import net.consensys.pantheon.tests.acceptance.dsl.node.PantheonNode; -import net.consensys.pantheon.tests.web3j.generated.EventEmitter; -import net.consensys.pantheon.tests.web3j.generated.EventEmitter.StoredEventResponse; +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 java.math.BigInteger; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/EventEmitter.java b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/EventEmitter.java index e1223a6139..28e8ebb45c 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/EventEmitter.java +++ b/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/generated/EventEmitter.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.tests.web3j.generated; +package tech.pegasys.pantheon.tests.web3j.generated; import java.math.BigInteger; import java.util.ArrayList; diff --git a/build.gradle b/build.gradle index 16ad954914..b29557f808 100644 --- a/build.gradle +++ b/build.gradle @@ -92,7 +92,7 @@ allprojects { } removeUnusedImports() googleJavaFormat() - importOrder 'net.consensys', 'java', '' + importOrder 'tech.pegasys', 'java', '' trimTrailingWhitespace() endWithNewline() } @@ -131,7 +131,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:net.consensys.pantheon.ethereum.vm:test -Dtest.single=GeneralStateTest -Dtest.ethereum.include=callcodecallcallcode_101-Frontier + * ./gradlew :ethereum:tech.pegasys.pantheon.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: @@ -142,7 +142,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:net.consensys.pantheon.ethereum.vm:test -Dtest.single=GeneralStateTest -Dtest.ethereum.state.eip=Frontier + * ./gradlew :ethereum:tech.pegasys.pantheon.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. @@ -266,7 +266,7 @@ subprojects { publications { MavenDeployment(MavenPublication) { from components.java - groupId 'net.consensys.pantheon' + groupId 'tech.pegasys.pantheon' artifactId project.jar.baseName version project.version } @@ -299,7 +299,7 @@ subprojects { jar { enabled = false } apply plugin: 'application' -mainClassName = "net.consensys.pantheon.Pantheon" +mainClassName = "tech.pegasys.pantheon.Pantheon" applicationDefaultJvmArgs = [ "-Dvertx.disableFileCPResolving=true", "-Dpantheon.home=PANTHEON_HOME", @@ -330,7 +330,7 @@ dependencies { task createEVMToolApp(type: CreateStartScripts) { outputDir = startScripts.outputDir - mainClassName = 'net.consensys.pantheon.EVMTool' + mainClassName = 'tech.pegasys.pantheon.EVMTool' applicationName = 'evm' classpath = startScripts.classpath } diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/BlockHeaderValidationRulesetFactory.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/BlockHeaderValidationRulesetFactory.java index aec411aaf9..dd37282606 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/BlockHeaderValidationRulesetFactory.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/BlockHeaderValidationRulesetFactory.java @@ -1,19 +1,19 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.consensus.clique; -import net.consensys.pantheon.consensus.clique.headervalidationrules.CliqueDifficultyValidationRule; -import net.consensys.pantheon.consensus.clique.headervalidationrules.CliqueExtraDataValidationRule; -import net.consensys.pantheon.consensus.clique.headervalidationrules.CoinbaseHeaderValidationRule; -import net.consensys.pantheon.consensus.clique.headervalidationrules.SignerRateLimitValidationRule; -import net.consensys.pantheon.consensus.common.EpochManager; -import net.consensys.pantheon.consensus.common.headervalidationrules.VoteValidationRule; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.AncestryValidationRule; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.ConstantFieldValidationRule; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.GasUsageValidationRule; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.TimestampValidationRule; +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.common.EpochManager; +import tech.pegasys.pantheon.consensus.common.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.TimestampValidationRule; public class BlockHeaderValidationRulesetFactory { diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHashing.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHashing.java index 37690589b0..09b2f90fd5 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHashing.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHashing.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.consensus.clique; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Util; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.util.bytes.BytesValue; +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 java.util.function.Supplier; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueContext.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueContext.java index 056f73a319..a79c96c334 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueContext.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueContext.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.consensus.clique; -import net.consensys.pantheon.consensus.common.VoteProposer; +import tech.pegasys.pantheon.consensus.common.VoteProposer; /** * 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/tech/pegasys/pantheon/consensus/clique/CliqueDifficultyCalculator.java index 813fd41040..cace39c273 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueDifficultyCalculator.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueDifficultyCalculator.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.consensus.clique; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.DifficultyCalculator; +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 java.math.BigInteger; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueExtraData.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueExtraData.java index 96f59cd200..8598ba7190 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueExtraData.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueExtraData.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.consensus.clique; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; +import tech.pegasys.pantheon.crypto.SECP256K1.Signature; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/consensus/clique/CliqueHelpers.java index 3da7ce566c..aa761fe2f9 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueHelpers.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueHelpers.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.consensus.clique; - -import net.consensys.pantheon.consensus.clique.blockcreation.CliqueProposerSelector; -import net.consensys.pantheon.consensus.common.ValidatorProvider; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.util.bytes.BytesValue; +package tech.pegasys.pantheon.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.ethereum.ProtocolContext; +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.util.bytes.BytesValue; import java.util.List; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolSchedule.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolSchedule.java index bddec5210c..d9d36b7ad5 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolSchedule.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolSchedule.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.consensus.clique; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.core.Util; -import net.consensys.pantheon.ethereum.mainnet.MutableProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.ethereum.core.Util; +import tech.pegasys.pantheon.ethereum.mainnet.MutableProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; import java.util.Optional; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolSpecs.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolSpecs.java index b11374675c..52aa8d692c 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolSpecs.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolSpecs.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.consensus.clique; -import static net.consensys.pantheon.consensus.clique.BlockHeaderValidationRulesetFactory.cliqueBlockHeaderValidator; +import static tech.pegasys.pantheon.consensus.clique.BlockHeaderValidationRulesetFactory.cliqueBlockHeaderValidator; -import net.consensys.pantheon.consensus.common.EpochManager; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockBodyValidator; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockImporter; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSpecs; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpecBuilder; +import tech.pegasys.pantheon.consensus.common.EpochManager; +import tech.pegasys.pantheon.ethereum.core.Address; +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.MainnetProtocolSpecs; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpecBuilder; /** Factory for producing Clique protocol specs for given configurations and known fork points */ public class CliqueProtocolSpecs { diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueVoteTallyUpdater.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueVoteTallyUpdater.java index c088a51e5a..5365561858 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueVoteTallyUpdater.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/CliqueVoteTallyUpdater.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.consensus.clique; import static org.apache.logging.log4j.LogManager.getLogger; -import net.consensys.pantheon.consensus.common.EpochManager; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.consensus.common.VoteType; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.consensus.common.EpochManager; +import tech.pegasys.pantheon.consensus.common.VoteTally; +import tech.pegasys.pantheon.consensus.common.VoteType; +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.util.bytes.BytesValue; import java.util.List; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/VoteTallyCache.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/VoteTallyCache.java index cd858f4a93..51932caf90 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/VoteTallyCache.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/VoteTallyCache.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.consensus.clique; import static com.google.common.base.Preconditions.checkNotNull; -import net.consensys.pantheon.consensus.common.EpochManager; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.consensus.common.EpochManager; +import tech.pegasys.pantheon.consensus.common.VoteTally; +import tech.pegasys.pantheon.ethereum.chain.Blockchain; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.Hash; import java.util.ArrayDeque; import java.util.Deque; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreator.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreator.java index f3d0c0452a..795d7de9e1 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreator.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreator.java @@ -1,26 +1,26 @@ -package net.consensys.pantheon.consensus.clique.blockcreation; +package tech.pegasys.pantheon.consensus.clique.blockcreation; -import net.consensys.pantheon.consensus.clique.CliqueBlockHashing; -import net.consensys.pantheon.consensus.clique.CliqueContext; -import net.consensys.pantheon.consensus.clique.CliqueExtraData; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.consensus.common.VoteType; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractBlockCreator; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHashFunction; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderBuilder; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.core.SealableBlockHeader; -import net.consensys.pantheon.ethereum.core.Util; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.consensus.clique.CliqueBlockHashing; +import tech.pegasys.pantheon.consensus.clique.CliqueContext; +import tech.pegasys.pantheon.consensus.clique.CliqueExtraData; +import tech.pegasys.pantheon.consensus.common.VoteTally; +import tech.pegasys.pantheon.consensus.common.VoteType; +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.BlockHashFunction; +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.PendingTransactions; +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.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Map; import java.util.Map.Entry; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockMiner.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockMiner.java index f73638a00c..452bb3ea4e 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockMiner.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockMiner.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.consensus.clique.blockcreation; +package tech.pegasys.pantheon.consensus.clique.blockcreation; -import net.consensys.pantheon.consensus.clique.CliqueContext; -import net.consensys.pantheon.consensus.clique.CliqueHelpers; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractBlockScheduler; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator.MinedBlockObserver; -import net.consensys.pantheon.ethereum.blockcreation.BlockMiner; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.util.Subscribers; +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.AbstractMiningCoordinator.MinedBlockObserver; +import tech.pegasys.pantheon.ethereum.blockcreation.BlockMiner; +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; public class CliqueBlockMiner extends BlockMiner { diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockScheduler.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockScheduler.java index bf8ef67d9a..375767c813 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockScheduler.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockScheduler.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.consensus.clique.blockcreation; - -import net.consensys.pantheon.consensus.clique.VoteTallyCache; -import net.consensys.pantheon.consensus.common.ValidatorProvider; -import net.consensys.pantheon.ethereum.blockcreation.DefaultBlockScheduler; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.util.time.Clock; +package tech.pegasys.pantheon.consensus.clique.blockcreation; + +import tech.pegasys.pantheon.consensus.clique.VoteTallyCache; +import tech.pegasys.pantheon.consensus.common.ValidatorProvider; +import tech.pegasys.pantheon.ethereum.blockcreation.DefaultBlockScheduler; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.util.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/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMinerExecutor.java index 46083c595f..1e489ff62b 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMinerExecutor.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMinerExecutor.java @@ -1,23 +1,23 @@ -package net.consensys.pantheon.consensus.clique.blockcreation; +package tech.pegasys.pantheon.consensus.clique.blockcreation; -import net.consensys.pantheon.consensus.clique.CliqueContext; -import net.consensys.pantheon.consensus.clique.CliqueExtraData; -import net.consensys.pantheon.consensus.common.EpochManager; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractBlockScheduler; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMinerExecutor; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator.MinedBlockObserver; -import net.consensys.pantheon.ethereum.blockcreation.MiningParameters; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.core.Util; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.util.Subscribers; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; +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.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.blockcreation.AbstractMiningCoordinator.MinedBlockObserver; +import tech.pegasys.pantheon.ethereum.blockcreation.MiningParameters; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.PendingTransactions; +import tech.pegasys.pantheon.ethereum.core.Util; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.util.Subscribers; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValues; import java.util.List; import java.util.concurrent.ExecutorService; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMiningCoordinator.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMiningCoordinator.java index 179d8ad441..759eae9d11 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMiningCoordinator.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMiningCoordinator.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.consensus.clique.blockcreation; +package tech.pegasys.pantheon.consensus.clique.blockcreation; -import net.consensys.pantheon.consensus.clique.CliqueContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; -import net.consensys.pantheon.ethereum.chain.Blockchain; +import tech.pegasys.pantheon.consensus.clique.CliqueContext; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; +import tech.pegasys.pantheon.ethereum.chain.Blockchain; import java.util.Optional; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueProposerSelector.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueProposerSelector.java index f1498c64d4..b2ace03f89 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueProposerSelector.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueProposerSelector.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.consensus.clique.blockcreation; +package tech.pegasys.pantheon.consensus.clique.blockcreation; import static com.google.common.base.Preconditions.checkNotNull; -import net.consensys.pantheon.consensus.clique.VoteTallyCache; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.consensus.clique.VoteTallyCache; +import tech.pegasys.pantheon.consensus.common.VoteTally; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueDifficultyValidationRule.java index 61e4f19ec5..68b4306d62 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueDifficultyValidationRule.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueDifficultyValidationRule.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.consensus.clique.headervalidationrules; +package tech.pegasys.pantheon.consensus.clique.headervalidationrules; -import net.consensys.pantheon.consensus.clique.CliqueContext; -import net.consensys.pantheon.consensus.clique.CliqueDifficultyCalculator; -import net.consensys.pantheon.consensus.clique.CliqueHelpers; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.AttachedBlockHeaderValidationRule; +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; 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/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueExtraDataValidationRule.java index 98842cd795..c570c33641 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueExtraDataValidationRule.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueExtraDataValidationRule.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.consensus.clique.headervalidationrules; +package tech.pegasys.pantheon.consensus.clique.headervalidationrules; -import net.consensys.pantheon.consensus.clique.CliqueBlockHashing; -import net.consensys.pantheon.consensus.clique.CliqueContext; -import net.consensys.pantheon.consensus.clique.CliqueExtraData; -import net.consensys.pantheon.consensus.common.EpochManager; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.AttachedBlockHeaderValidationRule; -import net.consensys.pantheon.ethereum.rlp.RLPException; +import tech.pegasys.pantheon.consensus.clique.CliqueBlockHashing; +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; 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/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CoinbaseHeaderValidationRule.java index d4b276cf73..ad4f6548dc 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CoinbaseHeaderValidationRule.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CoinbaseHeaderValidationRule.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.consensus.clique.headervalidationrules; +package tech.pegasys.pantheon.consensus.clique.headervalidationrules; -import net.consensys.pantheon.consensus.clique.CliqueVoteTallyUpdater; -import net.consensys.pantheon.consensus.common.EpochManager; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import tech.pegasys.pantheon.consensus.clique.CliqueVoteTallyUpdater; +import tech.pegasys.pantheon.consensus.common.EpochManager; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/consensus/clique/headervalidationrules/SignerRateLimitValidationRule.java index 084ea211a0..5d0d932f65 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/SignerRateLimitValidationRule.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/SignerRateLimitValidationRule.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.consensus.clique.headervalidationrules; +package tech.pegasys.pantheon.consensus.clique.headervalidationrules; -import net.consensys.pantheon.consensus.clique.CliqueContext; -import net.consensys.pantheon.consensus.clique.CliqueHelpers; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.AttachedBlockHeaderValidationRule; +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; public class SignerRateLimitValidationRule implements AttachedBlockHeaderValidationRule { diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/CliqueJsonRpcMethodsFactory.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/CliqueJsonRpcMethodsFactory.java index bdaa593ed8..995ae4d049 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/CliqueJsonRpcMethodsFactory.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/CliqueJsonRpcMethodsFactory.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.consensus.clique.jsonrpc; +package tech.pegasys.pantheon.consensus.clique.jsonrpc; -import net.consensys.pantheon.consensus.clique.CliqueContext; -import net.consensys.pantheon.consensus.clique.jsonrpc.methods.CliqueGetSigners; -import net.consensys.pantheon.consensus.clique.jsonrpc.methods.CliqueGetSignersAtHash; -import net.consensys.pantheon.consensus.clique.jsonrpc.methods.Discard; -import net.consensys.pantheon.consensus.clique.jsonrpc.methods.Propose; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.consensus.clique.CliqueContext; +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.Discard; +import tech.pegasys.pantheon.consensus.clique.jsonrpc.methods.Propose; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; import java.util.HashMap; import java.util.Map; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSigners.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSigners.java index aa1bf14b18..15ed15ba9d 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSigners.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSigners.java @@ -1,18 +1,18 @@ -package net.consensys.pantheon.consensus.clique.jsonrpc.methods; - -import static net.consensys.pantheon.consensus.clique.CliqueHelpers.getValidatorsOfBlock; - -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; + +import static tech.pegasys.pantheon.consensus.clique.CliqueHelpers.getValidatorsOfBlock; + +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; 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/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHash.java index 41895b4baa..7f5ad9026d 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHash.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHash.java @@ -1,18 +1,18 @@ -package net.consensys.pantheon.consensus.clique.jsonrpc.methods; - -import static net.consensys.pantheon.consensus.clique.CliqueHelpers.getValidatorsOfBlock; - -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; + +import static tech.pegasys.pantheon.consensus.clique.CliqueHelpers.getValidatorsOfBlock; + +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.util.Optional; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/Discard.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/Discard.java index 36d3cb12fb..54008eb9c5 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/Discard.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/Discard.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.consensus.clique.jsonrpc.methods; +package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; -import net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.consensus.common.VoteProposer; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; public class Discard implements JsonRpcMethod { private static final String CLIQUE_DISCARD = "clique_discard"; diff --git a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/Propose.java b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/Propose.java index 2c6cd76270..ed4da87e42 100644 --- a/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/Propose.java +++ b/consensus/clique/src/main/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/Propose.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.consensus.clique.jsonrpc.methods; +package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; -import net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.consensus.common.VoteProposer; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; public class Propose implements JsonRpcMethod { private final VoteProposer proposer; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHashingTest.java b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHashingTest.java index 3e9d01d5d3..732aac0b4b 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHashingTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueBlockHashingTest.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.consensus.clique; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderBuilder; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.LogsBloomFilter; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.Arrays; 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/tech/pegasys/pantheon/consensus/clique/CliqueDifficultyCalculatorTest.java index 103e30043d..da148ea5a5 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueDifficultyCalculatorTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueDifficultyCalculatorTest.java @@ -1,19 +1,19 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.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 net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.AddressHelpers; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Util; +import tech.pegasys.pantheon.consensus.common.VoteProposer; +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.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 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/tech/pegasys/pantheon/consensus/clique/CliqueExtraDataTest.java index de2004e7e8..f6dbcd2115 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueExtraDataTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueExtraDataTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.consensus.clique; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.AddressHelpers; -import net.consensys.pantheon.util.bytes.BytesValue; +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.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/tech/pegasys/pantheon/consensus/clique/CliqueProtocolScheduleTest.java index d9ce36aea1..2fb2fc9060 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolScheduleTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolScheduleTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.consensus.clique; import static org.assertj.core.api.Java6Assertions.assertThat; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; import io.vertx.core.json.JsonObject; import org.junit.Test; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolSpecsTest.java b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolSpecsTest.java index cda085c824..984c9a10ff 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolSpecsTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueProtocolSpecsTest.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.consensus.clique; import static org.assertj.core.api.Java6Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.AddressHelpers; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSpecs; -import net.consensys.pantheon.ethereum.mainnet.MutableProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; +import tech.pegasys.pantheon.ethereum.core.AddressHelpers; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSpecs; +import tech.pegasys.pantheon.ethereum.mainnet.MutableProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; import org.junit.Test; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueVoteTallyUpdaterTest.java b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueVoteTallyUpdaterTest.java index 427b86bf02..5dd18684e3 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueVoteTallyUpdaterTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/CliqueVoteTallyUpdaterTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.consensus.clique; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; @@ -9,18 +9,18 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import net.consensys.pantheon.consensus.common.EpochManager; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.consensus.common.VoteType; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.consensus.common.EpochManager; +import tech.pegasys.pantheon.consensus.common.VoteTally; +import tech.pegasys.pantheon.consensus.common.VoteType; +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.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 tech.pegasys.pantheon.util.bytes.BytesValue; import java.math.BigInteger; import java.util.List; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/NodeCanProduceNextBlockTest.java b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/NodeCanProduceNextBlockTest.java index ce5f1b8827..5e899f386b 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/NodeCanProduceNextBlockTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/NodeCanProduceNextBlockTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.consensus.clique; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -6,23 +6,23 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import net.consensys.pantheon.consensus.clique.headervalidationrules.SignerRateLimitValidationRule; -import net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.AddressHelpers; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Util; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; +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.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.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.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; 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/tech/pegasys/pantheon/consensus/clique/TestHelpers.java index 6a1e29dc1b..dfbb09f7b3 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/TestHelpers.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/TestHelpers.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.consensus.clique; - -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.util.bytes.BytesValue; +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; import java.util.List; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/VoteTallyCacheTest.java b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/VoteTallyCacheTest.java index c2761449f2..dc36a5462b 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/VoteTallyCacheTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/VoteTallyCacheTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.consensus.clique; +package tech.pegasys.pantheon.consensus.clique; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -9,19 +9,19 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; -import net.consensys.pantheon.consensus.common.EpochManager; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.core.AddressHelpers; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.consensus.common.EpochManager; +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.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.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.math.BigInteger; import java.util.Arrays; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreatorTest.java b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreatorTest.java index 2c199fc3f2..db28f122c3 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreatorTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockCreatorTest.java @@ -1,40 +1,40 @@ -package net.consensys.pantheon.consensus.clique.blockcreation; +package tech.pegasys.pantheon.consensus.clique.blockcreation; 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 net.consensys.pantheon.consensus.clique.CliqueContext; -import net.consensys.pantheon.consensus.clique.CliqueExtraData; -import net.consensys.pantheon.consensus.clique.CliqueHelpers; -import net.consensys.pantheon.consensus.clique.CliqueProtocolSchedule; -import net.consensys.pantheon.consensus.clique.CliqueProtocolSpecs; -import net.consensys.pantheon.consensus.clique.TestHelpers; -import net.consensys.pantheon.consensus.clique.VoteTallyCache; -import net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.consensus.common.VoteType; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.AddressHelpers; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.core.Util; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.mainnet.MutableProtocolSchedule; -import net.consensys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.bytes.BytesValue; +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.CliqueProtocolSpecs; +import tech.pegasys.pantheon.consensus.clique.TestHelpers; +import tech.pegasys.pantheon.consensus.clique.VoteTallyCache; +import tech.pegasys.pantheon.consensus.common.VoteProposer; +import tech.pegasys.pantheon.consensus.common.VoteTally; +import tech.pegasys.pantheon.consensus.common.VoteType; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +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.PendingTransactions; +import tech.pegasys.pantheon.ethereum.core.Util; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.mainnet.MutableProtocolSchedule; +import tech.pegasys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.List; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockSchedulerTest.java b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockSchedulerTest.java index 8479b164dc..d6749da0b0 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockSchedulerTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueBlockSchedulerTest.java @@ -1,20 +1,20 @@ -package net.consensys.pantheon.consensus.clique.blockcreation; +package tech.pegasys.pantheon.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 net.consensys.pantheon.consensus.clique.VoteTallyCache; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.blockcreation.AbstractBlockScheduler.BlockCreationTimeResult; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.AddressHelpers; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Util; -import net.consensys.pantheon.util.time.Clock; +import tech.pegasys.pantheon.consensus.clique.VoteTallyCache; +import tech.pegasys.pantheon.consensus.common.VoteTally; +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 tech.pegasys.pantheon.util.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/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMinerExecutorTest.java index 5981a1bbce..7f7ea6cba0 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMinerExecutorTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueMinerExecutorTest.java @@ -1,28 +1,28 @@ -package net.consensys.pantheon.consensus.clique.blockcreation; +package tech.pegasys.pantheon.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 net.consensys.pantheon.consensus.clique.CliqueContext; -import net.consensys.pantheon.consensus.clique.CliqueExtraData; -import net.consensys.pantheon.consensus.clique.CliqueProtocolSchedule; -import net.consensys.pantheon.consensus.clique.VoteTallyCache; -import net.consensys.pantheon.consensus.common.EpochManager; -import net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.MiningParameters; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.AddressHelpers; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.core.Util; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.util.bytes.BytesValue; +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.clique.VoteTallyCache; +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.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.blockcreation.MiningParameters; +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.PendingTransactions; +import tech.pegasys.pantheon.ethereum.core.Util; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.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/CliqueProposerSelectorTest.java b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueProposerSelectorTest.java index d1980579bb..68c02456ea 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueProposerSelectorTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/blockcreation/CliqueProposerSelectorTest.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.consensus.clique.blockcreation; +package tech.pegasys.pantheon.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 net.consensys.pantheon.consensus.clique.VoteTallyCache; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.AddressHelpers; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; +import tech.pegasys.pantheon.consensus.clique.VoteTallyCache; +import tech.pegasys.pantheon.consensus.common.VoteTally; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.AddressHelpers; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueDifficultyValidationRuleTest.java index 3b1d2656b5..07c5fe8ac3 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueDifficultyValidationRuleTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueDifficultyValidationRuleTest.java @@ -1,28 +1,28 @@ -package net.consensys.pantheon.consensus.clique.headervalidationrules; +package tech.pegasys.pantheon.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 net.consensys.pantheon.consensus.clique.CliqueBlockHashing; -import net.consensys.pantheon.consensus.clique.CliqueContext; -import net.consensys.pantheon.consensus.clique.CliqueExtraData; -import net.consensys.pantheon.consensus.clique.VoteTallyCache; -import net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.AddressHelpers; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Util; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.consensus.clique.CliqueBlockHashing; +import tech.pegasys.pantheon.consensus.clique.CliqueContext; +import tech.pegasys.pantheon.consensus.clique.CliqueExtraData; +import tech.pegasys.pantheon.consensus.clique.VoteTallyCache; +import tech.pegasys.pantheon.consensus.common.VoteProposer; +import tech.pegasys.pantheon.consensus.common.VoteTally; +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.ethereum.core.Util; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.List; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueExtraDataValidationRuleTest.java b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueExtraDataValidationRuleTest.java index c341f5a8bc..307295c5bc 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueExtraDataValidationRuleTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/CliqueExtraDataValidationRuleTest.java @@ -1,24 +1,24 @@ -package net.consensys.pantheon.consensus.clique.headervalidationrules; +package tech.pegasys.pantheon.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 net.consensys.pantheon.consensus.clique.CliqueContext; -import net.consensys.pantheon.consensus.clique.CliqueExtraData; -import net.consensys.pantheon.consensus.clique.TestHelpers; -import net.consensys.pantheon.consensus.clique.VoteTallyCache; -import net.consensys.pantheon.consensus.common.EpochManager; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.AddressHelpers; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Util; -import net.consensys.pantheon.util.bytes.BytesValue; +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.clique.VoteTallyCache; +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.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 java.util.List; diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/SignerRateLimitValidationRuleTest.java b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/SignerRateLimitValidationRuleTest.java index 118e19fb07..5b2d3ab9bf 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/SignerRateLimitValidationRuleTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/headervalidationrules/SignerRateLimitValidationRuleTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.consensus.clique.headervalidationrules; +package tech.pegasys.pantheon.consensus.clique.headervalidationrules; public class SignerRateLimitValidationRuleTest { diff --git a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHashTest.java b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHashTest.java index 652ef9f711..ba8c41ff6f 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHashTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHashTest.java @@ -1,25 +1,25 @@ -package net.consensys.pantheon.consensus.clique.jsonrpc.methods; +package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; import static java.util.Arrays.asList; -import static net.consensys.pantheon.ethereum.core.Address.fromHexString; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; - -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.util.bytes.BytesValue; +import static tech.pegasys.pantheon.ethereum.core.Address.fromHexString; + +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.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersTest.java index b8d336ffd1..e4e2aea106 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/CliqueGetSignersTest.java @@ -1,24 +1,24 @@ -package net.consensys.pantheon.consensus.clique.jsonrpc.methods; +package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; import static java.util.Arrays.asList; -import static net.consensys.pantheon.ethereum.core.Address.fromHexString; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; - -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.util.bytes.BytesValue; +import static tech.pegasys.pantheon.ethereum.core.Address.fromHexString; + +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.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.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/DiscardTest.java b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/DiscardTest.java index 613c668f9b..1856d01c3b 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/DiscardTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/DiscardTest.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.consensus.clique.jsonrpc.methods; +package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.consensus.common.VoteType; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponseType; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.consensus.common.VoteProposer; +import tech.pegasys.pantheon.consensus.common.VoteType; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponseType; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; 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/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/ProposeTest.java index b3d0d9b24e..08bb2490d4 100644 --- a/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/ProposeTest.java +++ b/consensus/clique/src/test/java/tech/pegasys/pantheon/consensus/clique/jsonrpc/methods/ProposeTest.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.consensus.clique.jsonrpc.methods; +package tech.pegasys.pantheon.consensus.clique.jsonrpc.methods; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.consensus.common.VoteType; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponseType; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.consensus.common.VoteProposer; +import tech.pegasys.pantheon.consensus.common.VoteType; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponseType; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.util.Optional; diff --git a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/EpochManager.java b/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/EpochManager.java index 3e5612a495..0569501e8e 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/EpochManager.java +++ b/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/EpochManager.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.consensus.common; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/consensus/common/ValidatorProvider.java index 5229b84841..469ca86c4b 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/ValidatorProvider.java +++ b/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/ValidatorProvider.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.consensus.common; +package tech.pegasys.pantheon.consensus.common; -import net.consensys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.Address; import java.util.Collection; diff --git a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteProposer.java b/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteProposer.java index bec6a4b478..2f9757929b 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteProposer.java +++ b/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteProposer.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.consensus.common; +package tech.pegasys.pantheon.consensus.common; -import net.consensys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/consensus/common/VoteTally.java index 7653258f64..cdb706589c 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteTally.java +++ b/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteTally.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.consensus.common; +package tech.pegasys.pantheon.consensus.common; -import net.consensys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.Address; import java.util.Collection; import java.util.Collections; diff --git a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteType.java b/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteType.java index 81e46b8dfb..4203d69a0e 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteType.java +++ b/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/VoteType.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.consensus.common; +package tech.pegasys.pantheon.consensus.common; import java.util.Optional; diff --git a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/headervalidationrules/VoteValidationRule.java b/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/headervalidationrules/VoteValidationRule.java index e9423db517..f29b3372b4 100644 --- a/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/headervalidationrules/VoteValidationRule.java +++ b/consensus/common/src/main/java/tech/pegasys/pantheon/consensus/common/headervalidationrules/VoteValidationRule.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.consensus.common.headervalidationrules; +package tech.pegasys.pantheon.consensus.common.headervalidationrules; -import net.consensys.pantheon.consensus.common.VoteType; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import tech.pegasys.pantheon.consensus.common.VoteType; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteProposerTest.java b/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteProposerTest.java index 50880dd704..728f25fe4d 100644 --- a/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteProposerTest.java +++ b/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteProposerTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.consensus.common; +package tech.pegasys.pantheon.consensus.common; -import static net.consensys.pantheon.consensus.common.VoteType.ADD; -import static net.consensys.pantheon.consensus.common.VoteType.DROP; 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 net.consensys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.Address; import java.util.AbstractMap; import java.util.Arrays; diff --git a/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteTallyTest.java b/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteTallyTest.java index 133561d611..363c95e48f 100644 --- a/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteTallyTest.java +++ b/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/VoteTallyTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.consensus.common; +package tech.pegasys.pantheon.consensus.common; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.Address; import org.junit.Test; diff --git a/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/headervalidationrules/VoteValidationRuleTest.java b/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/headervalidationrules/VoteValidationRuleTest.java index 69d18ec502..3380ce81af 100644 --- a/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/headervalidationrules/VoteValidationRuleTest.java +++ b/consensus/common/src/test/java/tech/pegasys/pantheon/consensus/common/headervalidationrules/VoteValidationRuleTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.consensus.common.headervalidationrules; +package tech.pegasys.pantheon.consensus.common.headervalidationrules; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.consensus.common.VoteType; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; +import tech.pegasys.pantheon.consensus.common.VoteType; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; import java.util.Arrays; import java.util.Collection; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ConsensusRoundIdentifier.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ConsensusRoundIdentifier.java index e8dab38313..80af57e8a1 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ConsensusRoundIdentifier.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ConsensusRoundIdentifier.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; import com.google.common.base.MoreObjects; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHashing.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHashing.java index 362073b84b..e6d797003f 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHashing.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHashing.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.consensus.ibft; - -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Util; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.util.bytes.BytesValue; +package tech.pegasys.pantheon.consensus.ibft; + +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 java.util.List; import java.util.function.Supplier; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHeaderValidationRulesetFactory.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHeaderValidationRulesetFactory.java index c6da1e3717..e629772039 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHeaderValidationRulesetFactory.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHeaderValidationRulesetFactory.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; -import net.consensys.pantheon.consensus.common.headervalidationrules.VoteValidationRule; -import net.consensys.pantheon.consensus.ibft.headervalidationrules.IbftExtraDataValidationRule; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.AncestryValidationRule; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.ConstantFieldValidationRule; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.GasUsageValidationRule; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.TimestampValidationRule; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.consensus.common.headervalidationrules.VoteValidationRule; +import tech.pegasys.pantheon.consensus.ibft.headervalidationrules.IbftExtraDataValidationRule; +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.TimestampValidationRule; +import tech.pegasys.pantheon.util.uint.UInt256; public class IbftBlockHeaderValidationRulesetFactory { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockImporter.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockImporter.java index ce0be3e1ad..793daf3bcb 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockImporter.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockImporter.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.consensus.ibft; - -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockImporter; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; +package tech.pegasys.pantheon.consensus.ibft; + +import tech.pegasys.pantheon.ethereum.ProtocolContext; +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.TransactionReceipt; +import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; import java.util.List; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftContext.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftContext.java index 5f5ca64f29..5fe9e5d729 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftContext.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftContext.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; -import net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.consensus.common.VoteTally; +import tech.pegasys.pantheon.consensus.common.VoteProposer; +import tech.pegasys.pantheon.consensus.common.VoteTally; /** Holds the IBFT specific mutable state. */ public class IbftContext { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEvent.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEvent.java index d4f21b1ca6..66bd93a8c0 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEvent.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEvent.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; -import net.consensys.pantheon.consensus.ibft.IbftEvents.Type; +import tech.pegasys.pantheon.consensus.ibft.IbftEvents.Type; /** Category of events that will effect and are interpretable by the Ibft processing mechanism */ public interface IbftEvent { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEventQueue.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEventQueue.java index 5a6b633181..ac05d89455 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEventQueue.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEventQueue.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEvents.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEvents.java index b3eb214b5e..19aa2a8f27 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEvents.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftEvents.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; -import net.consensys.pantheon.ethereum.p2p.api.Message; +import tech.pegasys.pantheon.ethereum.p2p.api.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/IbftExtraData.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftExtraData.java index ba988b0909..0ad22f4180 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftExtraData.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftExtraData.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.crypto.SECP256K1.Signature; +import tech.pegasys.pantheon.ethereum.core.Address; +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 java.util.List; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftHelpers.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftHelpers.java index d509e9ceb0..2414c76b9c 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftHelpers.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftHelpers.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; -import net.consensys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.Hash; public class IbftHelpers { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProcessor.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProcessor.java index c400ce9111..1aae65e12b 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProcessor.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProcessor.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; import java.util.Optional; import java.util.concurrent.Executors; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolSchedule.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolSchedule.java index 04c0380bc5..2c617d695e 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolSchedule.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolSchedule.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; -import net.consensys.pantheon.ethereum.mainnet.MutableProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.MutableProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; import java.util.Optional; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolSpecs.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolSpecs.java index bb0e8ed8bc..8bed123fd6 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolSpecs.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolSpecs.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; -import static net.consensys.pantheon.consensus.ibft.IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator; +import static tech.pegasys.pantheon.consensus.ibft.IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator; -import net.consensys.pantheon.consensus.common.EpochManager; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockBodyValidator; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockImporter; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSpecs; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; +import tech.pegasys.pantheon.consensus.common.EpochManager; +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.MainnetProtocolSpecs; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; import java.math.BigInteger; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftStateMachine.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftStateMachine.java index 7e236e7ab5..5887cd436f 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftStateMachine.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/IbftStateMachine.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; /** Stateful evaluator for ibft events */ public class IbftStateMachine { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/RoundTimer.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/RoundTimer.java index 50c0028694..2b54a57cb0 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/RoundTimer.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/RoundTimer.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; -import net.consensys.pantheon.consensus.ibft.ibftevent.RoundExpiry; +import tech.pegasys.pantheon.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/VoteTallyUpdater.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/VoteTallyUpdater.java index da0919a281..d1bf8e9cae 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/VoteTallyUpdater.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/VoteTallyUpdater.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; -import net.consensys.pantheon.consensus.common.EpochManager; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.consensus.common.VoteType; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.consensus.common.EpochManager; +import tech.pegasys.pantheon.consensus.common.VoteTally; +import tech.pegasys.pantheon.consensus.common.VoteType; +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.util.bytes.BytesValue; import java.util.List; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreator.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreator.java index 49073aed40..9689dcde97 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreator.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreator.java @@ -1,24 +1,24 @@ -package net.consensys.pantheon.consensus.ibft.blockcreation; +package tech.pegasys.pantheon.consensus.ibft.blockcreation; -import net.consensys.pantheon.consensus.ibft.IbftBlockHashing; -import net.consensys.pantheon.consensus.ibft.IbftContext; -import net.consensys.pantheon.consensus.ibft.IbftExtraData; -import net.consensys.pantheon.consensus.ibft.IbftHelpers; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractBlockCreator; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHashFunction; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderBuilder; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.core.SealableBlockHeader; -import net.consensys.pantheon.ethereum.core.Util; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; +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.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.BlockHashFunction; +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.PendingTransactions; +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.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; import java.util.function.Function; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockMiner.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockMiner.java index d104b94272..3cdad9a8bc 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockMiner.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockMiner.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.consensus.ibft.blockcreation; +package tech.pegasys.pantheon.consensus.ibft.blockcreation; -import net.consensys.pantheon.consensus.ibft.IbftContext; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractBlockScheduler; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator.MinedBlockObserver; -import net.consensys.pantheon.ethereum.blockcreation.BlockMiner; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.util.Subscribers; +import tech.pegasys.pantheon.consensus.ibft.IbftContext; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractBlockScheduler; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator.MinedBlockObserver; +import tech.pegasys.pantheon.ethereum.blockcreation.BlockMiner; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.util.Subscribers; public class IbftBlockMiner extends BlockMiner { diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftExtraDataCalculator.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftExtraDataCalculator.java index 329bba696a..87ba46a482 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftExtraDataCalculator.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftExtraDataCalculator.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.consensus.ibft.blockcreation; +package tech.pegasys.pantheon.consensus.ibft.blockcreation; -import net.consensys.pantheon.consensus.common.ValidatorProvider; -import net.consensys.pantheon.consensus.ibft.IbftExtraData; -import net.consensys.pantheon.ethereum.blockcreation.AbstractBlockCreator.ExtraDataCalculator; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.consensus.common.ValidatorProvider; +import tech.pegasys.pantheon.consensus.ibft.IbftExtraData; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractBlockCreator.ExtraDataCalculator; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.util.bytes.BytesValue; import com.google.common.collect.Lists; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/ProposerSelector.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/ProposerSelector.java index 145203e69b..462e32c17f 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/ProposerSelector.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/ProposerSelector.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.consensus.ibft.blockcreation; +package tech.pegasys.pantheon.consensus.ibft.blockcreation; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.consensus.common.ValidatorProvider; -import net.consensys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import net.consensys.pantheon.consensus.ibft.IbftBlockHashing; -import net.consensys.pantheon.consensus.ibft.IbftExtraData; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.consensus.common.ValidatorProvider; +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.ethereum.chain.Blockchain; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; import java.util.ArrayList; import java.util.List; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftExtraDataValidationRule.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftExtraDataValidationRule.java index 901b6543d7..cb1fc8bec6 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftExtraDataValidationRule.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftExtraDataValidationRule.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.consensus.ibft.headervalidationrules; - -import static net.consensys.pantheon.consensus.ibft.IbftHelpers.calculateRequiredValidatorQuorum; - -import net.consensys.pantheon.consensus.common.ValidatorProvider; -import net.consensys.pantheon.consensus.ibft.IbftBlockHashing; -import net.consensys.pantheon.consensus.ibft.IbftContext; -import net.consensys.pantheon.consensus.ibft.IbftExtraData; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.AttachedBlockHeaderValidationRule; -import net.consensys.pantheon.ethereum.rlp.RLPException; +package tech.pegasys.pantheon.consensus.ibft.headervalidationrules; + +import static tech.pegasys.pantheon.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 tech.pegasys.pantheon.ethereum.rlp.RLPException; import java.util.Collection; import java.util.List; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/RoundExpiry.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/RoundExpiry.java index 1ab66e696b..1b0362b424 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/RoundExpiry.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/ibftevent/RoundExpiry.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.consensus.ibft.ibftevent; +package tech.pegasys.pantheon.consensus.ibft.ibftevent; -import net.consensys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import net.consensys.pantheon.consensus.ibft.IbftEvent; -import net.consensys.pantheon.consensus.ibft.IbftEvents.Type; +import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier; +import tech.pegasys.pantheon.consensus.ibft.IbftEvent; +import tech.pegasys.pantheon.consensus.ibft.IbftEvents.Type; import java.util.Objects; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/IbftJsonRpcMethodsFactory.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/IbftJsonRpcMethodsFactory.java index 6580289502..dd3225e57d 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/IbftJsonRpcMethodsFactory.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/IbftJsonRpcMethodsFactory.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.consensus.ibft.jsonrpc; +package tech.pegasys.pantheon.consensus.ibft.jsonrpc; -import net.consensys.pantheon.consensus.ibft.IbftContext; -import net.consensys.pantheon.consensus.ibft.jsonrpc.methods.IbftProposeValidatorVote; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.consensus.ibft.IbftContext; +import tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods.IbftProposeValidatorVote; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; import java.util.HashMap; import java.util.Map; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVote.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVote.java index 922af424e2..8d976b8f8d 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVote.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVote.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.consensus.ibft.jsonrpc.methods; - -import net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +package tech.pegasys.pantheon.consensus.ibft.jsonrpc.methods; + +import tech.pegasys.pantheon.consensus.common.VoteProposer; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; public class IbftProposeValidatorVote implements JsonRpcMethod { private final VoteProposer voteProposer; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftProtocolManager.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftProtocolManager.java index 9ec3a46c9a..86b36622e6 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftProtocolManager.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftProtocolManager.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.consensus.ibft.protocol; +package tech.pegasys.pantheon.consensus.ibft.protocol; -import net.consensys.pantheon.consensus.ibft.IbftEvent; -import net.consensys.pantheon.consensus.ibft.IbftEventQueue; -import net.consensys.pantheon.consensus.ibft.IbftEvents; -import net.consensys.pantheon.ethereum.p2p.api.Message; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.api.ProtocolManager; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.consensus.ibft.IbftEvent; +import tech.pegasys.pantheon.consensus.ibft.IbftEventQueue; +import tech.pegasys.pantheon.consensus.ibft.IbftEvents; +import tech.pegasys.pantheon.ethereum.p2p.api.Message; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.api.ProtocolManager; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.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/tech/pegasys/pantheon/consensus/ibft/protocol/IbftSubProtocol.java index 5f02459aa8..2604f761e7 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftSubProtocol.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftSubProtocol.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.consensus.ibft.protocol; +package tech.pegasys.pantheon.consensus.ibft.protocol; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; import java.util.Arrays; import java.util.Collections; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/Istanbul64Protocol.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/Istanbul64Protocol.java index fb2def8c50..6687ef5cf5 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/Istanbul64Protocol.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/Istanbul64Protocol.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.consensus.ibft.protocol; +package tech.pegasys.pantheon.consensus.ibft.protocol; -import net.consensys.pantheon.ethereum.eth.messages.EthPV62; -import net.consensys.pantheon.ethereum.eth.messages.EthPV63; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; +import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; +import tech.pegasys.pantheon.ethereum.eth.messages.EthPV63; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; import java.util.Arrays; import java.util.List; diff --git a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/Istanbul64ProtocolManager.java b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/Istanbul64ProtocolManager.java index 72ebad2347..e75d05abc8 100644 --- a/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/Istanbul64ProtocolManager.java +++ b/consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/protocol/Istanbul64ProtocolManager.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.consensus.ibft.protocol; +package tech.pegasys.pantheon.consensus.ibft.protocol; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.eth.EthProtocol; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManager; -import net.consensys.pantheon.ethereum.p2p.api.Message; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.chain.Blockchain; +import tech.pegasys.pantheon.ethereum.eth.EthProtocol; +import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; +import tech.pegasys.pantheon.ethereum.p2p.api.Message; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHashingTest.java b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHashingTest.java index 4fc8321b47..d1a4be9a76 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHashingTest.java +++ b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHashingTest.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderBuilder; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.LogsBloomFilter; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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 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/tech/pegasys/pantheon/consensus/ibft/IbftBlockHeaderValidationRulesetFactoryTest.java index d2fe26642d..fde1ce8c6a 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHeaderValidationRulesetFactoryTest.java +++ b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockHeaderValidationRulesetFactoryTest.java @@ -1,22 +1,22 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; -import static net.consensys.pantheon.consensus.ibft.IbftProtocolContextFixture.protocolContext; import static org.assertj.core.api.Assertions.assertThat; - -import net.consensys.pantheon.consensus.common.VoteType; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import static tech.pegasys.pantheon.consensus.ibft.IbftProtocolContextFixture.protocolContext; + +import tech.pegasys.pantheon.consensus.common.VoteType; +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.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 java.math.BigInteger; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockImporterTest.java b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockImporterTest.java index c596d3aeb0..fcab39e7c5 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockImporterTest.java +++ b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftBlockImporterTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; import static java.util.Collections.emptyList; import static org.mockito.Mockito.mock; @@ -6,16 +6,16 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.BlockImporter; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; +import tech.pegasys.pantheon.consensus.common.VoteProposer; +import tech.pegasys.pantheon.consensus.common.VoteTally; +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.BlockImporter; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; import java.util.Collections; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftEventQueueTest.java b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftEventQueueTest.java index f4a65d40c0..fdd03afa68 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftEventQueueTest.java +++ b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftEventQueueTest.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; -import net.consensys.pantheon.consensus.ibft.IbftEvents.Type; +import tech.pegasys.pantheon.consensus.ibft.IbftEvents.Type; import java.util.ArrayList; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftExtraDataTest.java b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftExtraDataTest.java index b3e0e2c13a..82f2b562ee 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftExtraDataTest.java +++ b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftExtraDataTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLPException; -import net.consensys.pantheon.util.bytes.BytesValue; +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 java.math.BigInteger; import java.util.Arrays; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftProcessorTest.java b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftProcessorTest.java index 40ca7a7e79..3236d3a73b 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftProcessorTest.java +++ b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftProcessorTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -10,7 +10,7 @@ import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import net.consensys.pantheon.consensus.ibft.ibftevent.RoundExpiry; +import tech.pegasys.pantheon.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/IbftProtocolContextFixture.java b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolContextFixture.java index 229d1e84a6..4916424e3a 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolContextFixture.java +++ b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/IbftProtocolContextFixture.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; import static java.util.Arrays.asList; -import net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.consensus.common.VoteProposer; +import tech.pegasys.pantheon.consensus.common.VoteTally; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.core.Address; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/RoundTimerTest.java b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/RoundTimerTest.java index 8e8659cfae..fa5a07fbb1 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/RoundTimerTest.java +++ b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/RoundTimerTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -9,7 +9,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.internal.verification.VerificationModeFactory.times; -import net.consensys.pantheon.consensus.ibft.ibftevent.RoundExpiry; +import tech.pegasys.pantheon.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/VoteTallyUpdaterTest.java b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/VoteTallyUpdaterTest.java index 37fa2b71f0..61cd636e78 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/VoteTallyUpdaterTest.java +++ b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/VoteTallyUpdaterTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.consensus.ibft; +package tech.pegasys.pantheon.consensus.ibft; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; @@ -10,18 +10,18 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import net.consensys.pantheon.consensus.common.EpochManager; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.consensus.common.VoteType; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.consensus.common.EpochManager; +import tech.pegasys.pantheon.consensus.common.VoteTally; +import tech.pegasys.pantheon.consensus.common.VoteType; +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.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 tech.pegasys.pantheon.util.bytes.BytesValue; import java.math.BigInteger; import java.util.List; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreatorTest.java b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreatorTest.java index 85859aaf10..b5539c2453 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreatorTest.java +++ b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftBlockCreatorTest.java @@ -1,31 +1,31 @@ -package net.consensys.pantheon.consensus.ibft.blockcreation; +package tech.pegasys.pantheon.consensus.ibft.blockcreation; -import static net.consensys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; 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.core.InMemoryWorldState.createInMemoryWorldStateArchive; -import net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.consensus.ibft.IbftBlockHeaderValidationRulesetFactory; -import net.consensys.pantheon.consensus.ibft.IbftContext; -import net.consensys.pantheon.consensus.ibft.IbftExtraData; -import net.consensys.pantheon.consensus.ibft.IbftProtocolSchedule; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.consensus.common.VoteProposer; +import tech.pegasys.pantheon.consensus.common.VoteTally; +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.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.PendingTransactions; +import tech.pegasys.pantheon.ethereum.core.Wei; +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.util.bytes.BytesValue; import java.time.Instant; import java.util.Arrays; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/ProposerSelectorTest.java b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/ProposerSelectorTest.java index 35cfbfb701..881e84305c 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/ProposerSelectorTest.java +++ b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/ProposerSelectorTest.java @@ -1,25 +1,25 @@ -package net.consensys.pantheon.consensus.ibft.blockcreation; +package tech.pegasys.pantheon.consensus.ibft.blockcreation; 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.when; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.consensus.ibft.ConsensusRoundIdentifier; -import net.consensys.pantheon.consensus.ibft.IbftBlockHashing; -import net.consensys.pantheon.consensus.ibft.IbftExtraData; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.AddressHelpers; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.consensus.common.VoteTally; +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.crypto.SECP256K1; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.crypto.SECP256K1.Signature; +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 tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.LinkedList; import java.util.Optional; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftExtraDataValidationRuleTest.java b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftExtraDataValidationRuleTest.java index 8d642f6ca8..aa3c0ad4f4 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftExtraDataValidationRuleTest.java +++ b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/headervalidationrules/IbftExtraDataValidationRuleTest.java @@ -1,23 +1,23 @@ -package net.consensys.pantheon.consensus.ibft.headervalidationrules; +package tech.pegasys.pantheon.consensus.ibft.headervalidationrules; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.consensus.ibft.IbftBlockHashing; -import net.consensys.pantheon.consensus.ibft.IbftContext; -import net.consensys.pantheon.consensus.ibft.IbftExtraData; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.AddressHelpers; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.consensus.common.VoteTally; +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.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 java.util.Collection; import java.util.Collections; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVoteTest.java b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVoteTest.java index a0ed7c6f80..d2a2ed56e0 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVoteTest.java +++ b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVoteTest.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.consensus.ibft.jsonrpc.methods; +package tech.pegasys.pantheon.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 net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.consensus.common.VoteProposer; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import org.junit.Before; import org.junit.Rule; diff --git a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftSubProtocolTest.java b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftSubProtocolTest.java index b7a0be28bb..cb921a2bdd 100644 --- a/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftSubProtocolTest.java +++ b/consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/protocol/IbftSubProtocolTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.consensus.ibft.protocol; +package tech.pegasys.pantheon.consensus.ibft.protocol; import static org.assertj.core.api.Assertions.assertThat; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/BouncyCastleMessageDigestFactory.java b/crypto/src/main/java/tech/pegasys/pantheon/crypto/BouncyCastleMessageDigestFactory.java index 8ccda4a8db..3e9df4312f 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/BouncyCastleMessageDigestFactory.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/BouncyCastleMessageDigestFactory.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto; +package tech.pegasys.pantheon.crypto; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/Hash.java b/crypto/src/main/java/tech/pegasys/pantheon/crypto/Hash.java index 126462f79f..297ddb5ff7 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/Hash.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/Hash.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.crypto; +package tech.pegasys.pantheon.crypto; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/InvalidSEC256K1PrivateKeyStoreException.java index 2ab0bd70ef..88daf9318e 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/InvalidSEC256K1PrivateKeyStoreException.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/InvalidSEC256K1PrivateKeyStoreException.java @@ -1,3 +1,3 @@ -package net.consensys.pantheon.crypto; +package tech.pegasys.pantheon.crypto; public class InvalidSEC256K1PrivateKeyStoreException extends RuntimeException {} diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/PRNGSecureRandom.java b/crypto/src/main/java/tech/pegasys/pantheon/crypto/PRNGSecureRandom.java index b57cd1dedf..5ced09844d 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/PRNGSecureRandom.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/PRNGSecureRandom.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.crypto; +package tech.pegasys.pantheon.crypto; -import static net.consensys.pantheon.crypto.PersonalisationString.getPersonalizationString; +import static tech.pegasys.pantheon.crypto.PersonalisationString.getPersonalizationString; import java.security.SecureRandom; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/PersonalisationString.java b/crypto/src/main/java/tech/pegasys/pantheon/crypto/PersonalisationString.java index daf6107c10..3e441b2159 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/PersonalisationString.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/PersonalisationString.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/QuickEntropy.java index 7a131bddf3..f387eae178 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/QuickEntropy.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/QuickEntropy.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/SECP256K1.java index cbc2893a98..12573a5aa7 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/SECP256K1.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/SECP256K1.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.crypto; +package tech.pegasys.pantheon.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 net.consensys.pantheon.util.bytes.BytesValues.asUnsignedBigInteger; - -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; -import net.consensys.pantheon.util.bytes.MutableBytesValue; -import net.consensys.pantheon.util.uint.UInt256; -import net.consensys.pantheon.util.uint.UInt256Bytes; +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 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/tech/pegasys/pantheon/crypto/SecureRandomProvider.java index a84ee049ed..4f7b8f1e56 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/SecureRandomProvider.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/SecureRandomProvider.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto; +package tech.pegasys.pantheon.crypto; import java.security.SecureRandom; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AbstractFieldPoint.java b/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AbstractFieldPoint.java index f6e7265151..745052d702 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AbstractFieldPoint.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AbstractFieldPoint.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.crypto.altbn128; import java.math.BigInteger; diff --git a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AbstractFqp.java b/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AbstractFqp.java index a5066c5cef..18402c1b16 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AbstractFqp.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AbstractFqp.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12Pairer.java index 0c5a4a22c0..795eb5af00 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12Pairer.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12Pairer.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.crypto.altbn128; -import static net.consensys.pantheon.crypto.altbn128.AltBn128Fq12Point.twist; +import static tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12Point.java index 6a5c5def14..4f79d92f6a 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12Point.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12Point.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq2Point.java index ecceb08d00..4f92f0e6e1 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq2Point.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq2Point.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/altbn128/AltBn128Point.java index 6392209106..699d4e04ce 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Point.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Point.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/altbn128/FieldElement.java index b9e45c7bc9..d8ff98bd2b 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/FieldElement.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/FieldElement.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/altbn128/FieldPoint.java index b28676a581..aa28b5a9ea 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/FieldPoint.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/FieldPoint.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/altbn128/Fq.java index fa86cf3f14..357025cfff 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/Fq.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/Fq.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.crypto.altbn128; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/altbn128/Fq12.java index 5b2c043e3f..57d0b06ad5 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/Fq12.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/Fq12.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/altbn128/Fq2.java index 0083305a23..0dd2f04177 100644 --- a/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/Fq2.java +++ b/crypto/src/main/java/tech/pegasys/pantheon/crypto/altbn128/Fq2.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.crypto.altbn128; import java.math.BigInteger; diff --git a/crypto/src/test/java/tech/pegasys/pantheon/crypto/HashTest.java b/crypto/src/test/java/tech/pegasys/pantheon/crypto/HashTest.java index 0b559e9248..2f6f2525ad 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/HashTest.java +++ b/crypto/src/test/java/tech/pegasys/pantheon/crypto/HashTest.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.crypto; +package tech.pegasys.pantheon.crypto; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValue; import org.junit.Test; diff --git a/crypto/src/test/java/tech/pegasys/pantheon/crypto/PRNGSecureRandomTest.java b/crypto/src/test/java/tech/pegasys/pantheon/crypto/PRNGSecureRandomTest.java index 1d1dbb357c..30d3b27cab 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/PRNGSecureRandomTest.java +++ b/crypto/src/test/java/tech/pegasys/pantheon/crypto/PRNGSecureRandomTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/SECP256K1Test.java index 2c223bade1..787cc1a8da 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/SECP256K1Test.java +++ b/crypto/src/test/java/tech/pegasys/pantheon/crypto/SECP256K1Test.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.crypto; +package tech.pegasys.pantheon.crypto; import static java.nio.charset.StandardCharsets.UTF_8; -import static net.consensys.pantheon.crypto.Hash.keccak256; -import static net.consensys.pantheon.util.bytes.BytesValue.fromHexString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static tech.pegasys.pantheon.crypto.Hash.keccak256; +import static tech.pegasys.pantheon.util.bytes.BytesValue.fromHexString; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.io.File; import java.math.BigInteger; @@ -235,7 +235,7 @@ public class SECP256K1Test { @Test public void fileContainsValidPrivateKey() throws Exception { - final URL url = Resources.getResource("net/consensys/pantheon/crypto/validPrivateKey.txt"); + final URL url = Resources.getResource("tech/pegasys/pantheon/crypto/validPrivateKey.txt"); final File file = new File(url.getFile()); final SECP256K1.PrivateKey privateKey = SECP256K1.PrivateKey.load(file); assertEquals( diff --git a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12PairerTest.java b/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12PairerTest.java index f3461c11d2..cc4baa7d14 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12PairerTest.java +++ b/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12PairerTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12PointTest.java index 8bbeebca79..1167793f1e 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12PointTest.java +++ b/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq12PointTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq2PointTest.java index ec96dd952e..6a18a7c996 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq2PointTest.java +++ b/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128Fq2PointTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/altbn128/AltBn128PointTest.java index 54a0e72f40..ae389ab3b3 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128PointTest.java +++ b/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/AltBn128PointTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/altbn128/Fq12Test.java index cac2a7d0d2..8808cecb4e 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/Fq12Test.java +++ b/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/Fq12Test.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/altbn128/Fq2Test.java index eb8ccb6fe5..1347a4c1a5 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/Fq2Test.java +++ b/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/Fq2Test.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/crypto/altbn128/FqTest.java index 22d7ab4ae9..d2127b4093 100644 --- a/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/FqTest.java +++ b/crypto/src/test/java/tech/pegasys/pantheon/crypto/altbn128/FqTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.crypto.altbn128; +package tech.pegasys.pantheon.crypto.altbn128; import static org.assertj.core.api.Assertions.assertThat; diff --git a/docs/development/building.md b/docs/development/building.md index fce7b062fa..a395e7c691 100644 --- a/docs/development/building.md +++ b/docs/development/building.md @@ -56,11 +56,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:net.consensys.pantheon.ethereum.vm:referenceTest -Dtest.single=GeneralStateTest -Dtest.ethereum.state.eip=Frontier +./gradlew :ethereum:tech.pegasys.pantheon.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:net.consensys.pantheon.ethereum.vm:test -Dtest.single=GeneralStateTest -Dtest.ethereum.include='^CALLCODE.*-Frontier' +gradle :ethereum:tech.pegasys.pantheon.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/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectly.java b/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectly.java index 726bfbae8b..5ab90bab7f 100644 --- a/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectly.java +++ b/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectly.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.errorpronechecks; import static com.google.errorprone.BugPattern.Category.JDK; 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/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectly.java index 5c1067f180..01fb0893dc 100644 --- a/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectly.java +++ b/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectly.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.errorpronechecks; import static com.google.errorprone.BugPattern.Category.JDK; 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/tech/pegasys/errorpronechecks/DoNotReturnNullOptionals.java index 2671a0d819..de9610ba73 100644 --- a/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotReturnNullOptionals.java +++ b/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/DoNotReturnNullOptionals.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.errorpronechecks; import static com.google.errorprone.BugPattern.Category.JDK; import static com.google.errorprone.BugPattern.SeverityLevel.SUGGESTION; diff --git a/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinal.java b/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinal.java index d4122c1d6f..54d7750fa4 100644 --- a/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinal.java +++ b/errorprone-checks/src/main/java/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinal.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.errorpronechecks; import static com.google.errorprone.BugPattern.Category.JDK; import static com.google.errorprone.BugPattern.SeverityLevel.WARNING; diff --git a/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java b/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java index 62fb346c5d..4840502b62 100644 --- a/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java +++ b/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.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/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java index 35ef9898a8..2270b99ca5 100644 --- a/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java +++ b/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.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/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsTest.java index 1772ebc29d..133879d87a 100644 --- a/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsTest.java +++ b/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsTest.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.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/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalTest.java index b0aa782375..52623b63b4 100644 --- a/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalTest.java +++ b/errorprone-checks/src/test/java/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalTest.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.errorpronechecks; import com.google.errorprone.CompilationTestHelper; import org.junit.Before; diff --git a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyNegativeCases.java b/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyNegativeCases.java index 9071bc5337..54d1a40304 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyNegativeCases.java +++ b/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyNegativeCases.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.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/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyPositiveCases.java index d82c18d4d2..70c8e57b81 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyPositiveCases.java +++ b/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotCreateSecureRandomDirectlyPositiveCases.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.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/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyNegativeCases.java index 4b32dec6a1..271b2b5d0e 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyNegativeCases.java +++ b/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyNegativeCases.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.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/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyPositiveCases.java index 3238e48220..da2a04593f 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyPositiveCases.java +++ b/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotInvokeMessageDigestDirectlyPositiveCases.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.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/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsNegativeCases.java index 88100dd994..1d299c0cfe 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsNegativeCases.java +++ b/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsNegativeCases.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.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/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsPositiveCases.java index 50dccc6918..053ebe0f5c 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsPositiveCases.java +++ b/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/DoNotReturnNullOptionalsPositiveCases.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.errorpronechecks; import java.util.Optional; diff --git a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalInterfaceNegativeCases.java b/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalInterfaceNegativeCases.java index f66af5d3ff..1dab682cdc 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalInterfaceNegativeCases.java +++ b/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalInterfaceNegativeCases.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.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/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalInterfacePositiveCases.java index 5044d20610..d9c7ee0a84 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalInterfacePositiveCases.java +++ b/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalInterfacePositiveCases.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.errorpronechecks; public interface MethodInputParametersMustBeFinalInterfacePositiveCases { diff --git a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalNegativeCases.java b/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalNegativeCases.java index 68aac775f2..5734efe215 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalNegativeCases.java +++ b/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalNegativeCases.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.errorpronechecks; public class MethodInputParametersMustBeFinalNegativeCases { diff --git a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalPositiveCases.java b/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalPositiveCases.java index 19522faa81..da03688758 100644 --- a/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalPositiveCases.java +++ b/errorprone-checks/src/test/resources/tech/pegasys/errorpronechecks/MethodInputParametersMustBeFinalPositiveCases.java @@ -1,4 +1,4 @@ -package net.consensys.errorpronechecks; +package tech.pegasys.errorpronechecks; public class MethodInputParametersMustBeFinalPositiveCases { diff --git a/ethereum/core/build.gradle b/ethereum/core/build.gradle index 39e317af58..2ecb6fc1b8 100644 --- a/ethereum/core/build.gradle +++ b/ethereum/core/build.gradle @@ -46,9 +46,9 @@ task testJar (type: Jar) { } test { - exclude 'net/consensys/pantheon/ethereum/vm/**ReferenceTest.class' - exclude 'net/consensys/pantheon/ethereum/vm/blockchain/**.class' - exclude 'net/consensys/pantheon/ethereum/vm/generalstate/**.class' + exclude 'tech/pegasys/pantheon/ethereum/vm/**ReferenceTest.class' + exclude 'tech/pegasys/pantheon/ethereum/vm/blockchain/**.class' + exclude 'tech/pegasys/pantheon/ethereum/vm/generalstate/**.class' } def generateTestFiles(FileTree jsonPath, File resourcesPath, File templateFile, String pathstrip, String destination, String namePrefix) { @@ -92,9 +92,9 @@ task blockchainReferenceTestsSetup { generateTestFiles( fileTree('../referencetests/src/test/resources/BlockchainTests'), file("../referencetests/src/test/resources"), - file("./src/test/resources/net/consensys/pantheon/ethereum/vm/BlockchainReferenceTest.java.template"), + file("./src/test/resources/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTest.java.template"), "BlockchainTests/", - "./src/test/java/net/consensys/pantheon/ethereum/vm/blockchain", + "./src/test/java/tech/pegasys/pantheon/ethereum/vm/blockchain", "BlockchainReferenceTest" ) } @@ -105,9 +105,9 @@ task generalstateReferenceTestsSetup { generateTestFiles( fileTree("../referencetests/src/test/resources/GeneralStateTests"), file("../referencetests/src/test/resources"), - file("./src/test/resources/net/consensys/pantheon/ethereum/vm/GeneralStateReferenceTest.java.template"), + file("./src/test/resources/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTest.java.template"), "GeneralStateTests/", - "./src/test/java/net/consensys/pantheon/ethereum/vm/generalstate", + "./src/test/java/tech/pegasys/pantheon/ethereum/vm/generalstate", "GeneralStateReferenceTest" ) } @@ -118,9 +118,9 @@ task generalstateRegressionReferenceTestsSetup { generateTestFiles( fileTree("./src/test/resources/regressions/generalstate"), file("./src/test/resources"), - file("./src/test/resources/net/consensys/pantheon/ethereum/vm/GeneralStateReferenceTest.java.template"), + file("./src/test/resources/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTest.java.template"), "regressions/generalstate/", - "./src/test/java/net/consensys/pantheon/ethereum/vm/generalstate", + "./src/test/java/tech/pegasys/pantheon/ethereum/vm/generalstate", "GeneralStateRegressionReferenceTest" ) } @@ -128,11 +128,11 @@ task generalstateRegressionReferenceTestsSetup { compileTestJava.dependsOn(generalstateRegressionReferenceTestsSetup) task cleanupReferenceTests(type: Delete) { - delete fileTree("./src/test/java/net/consensys/pantheon/ethereum/vm/generalstate/") { + delete fileTree("./src/test/java/tech/pegasys/pantheon/ethereum/vm/generalstate/") { include("**/GeneralStateReferenceTest*.java") include("**/GeneralStateRegressionReferenceTest*.java") } - delete fileTree("./src/test/java/net/consensys/pantheon/ethereum/vm/blockchain/") { include("**/BlockchainReferenceTest*.java") } + delete fileTree("./src/test/java/tech/pegasys/pantheon/ethereum/vm/blockchain/") { include("**/BlockchainReferenceTest*.java") } } clean.dependsOn(cleanupReferenceTests) @@ -140,9 +140,9 @@ clean.dependsOn(cleanupReferenceTests) task referenceTests(type: Test, dependsOn: ["compileTestJava"]) { scanForTestClasses = false enableAssertions = true - include 'net/consensys/pantheon/ethereum/vm/**ReferenceTest.class' - include 'net/consensys/pantheon/ethereum/vm/blockchain/**.class' - include 'net/consensys/pantheon/ethereum/vm/generalstate/**.class' + include 'tech/pegasys/pantheon/ethereum/vm/**ReferenceTest.class' + include 'tech/pegasys/pantheon/ethereum/vm/blockchain/**.class' + include 'tech/pegasys/pantheon/ethereum/vm/generalstate/**.class' } artifacts { diff --git a/ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/vm/EntriesFromIntegrationTest.java b/ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/vm/EntriesFromIntegrationTest.java index 975f2a3742..7122bbb123 100644 --- a/ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/vm/EntriesFromIntegrationTest.java +++ b/ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/vm/EntriesFromIntegrationTest.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import static net.consensys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; import static org.assertj.core.api.Assertions.assertThat; - -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.MutableAccount; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +import static tech.pegasys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; + +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 java.util.Map; import java.util.Random; diff --git a/ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/vm/TraceTransactionIntegrationTest.java b/ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/vm/TraceTransactionIntegrationTest.java index 3642c964b0..fa3e42c003 100644 --- a/ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/vm/TraceTransactionIntegrationTest.java +++ b/ethereum/core/src/integration-test/java/tech/pegasys/pantheon/ethereum/vm/TraceTransactionIntegrationTest.java @@ -1,34 +1,34 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.debug.TraceFrame; -import net.consensys.pantheon.ethereum.debug.TraceOptions; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor.Result; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +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.Gas; +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.core.WorldUpdater; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.debug.TraceFrame; +import tech.pegasys.pantheon.ethereum.debug.TraceOptions; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +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.rlp.BytesValueRLPInput; +import tech.pegasys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.List; import java.util.Map.Entry; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/ProtocolContext.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/ProtocolContext.java index f68f5b0f65..f76b997195 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/ProtocolContext.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/ProtocolContext.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum; +package tech.pegasys.pantheon.ethereum; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; /** * Holds the mutable state used to track the current context of the protocol. This is primarily the diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractBlockCreator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractBlockCreator.java index 26482baedb..8223533193 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractBlockCreator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractBlockCreator.java @@ -1,26 +1,26 @@ -package net.consensys.pantheon.ethereum.blockcreation; - -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderBuilder; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.MutableAccount; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.core.ProcessableBlockHeader; -import net.consensys.pantheon.ethereum.core.SealableBlockHeader; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.mainnet.BodyValidation; -import net.consensys.pantheon.ethereum.mainnet.DifficultyCalculator; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockProcessor.TransactionReceiptFactory; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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.Hash; +import tech.pegasys.pantheon.ethereum.core.MutableAccount; +import tech.pegasys.pantheon.ethereum.core.MutableWorldState; +import tech.pegasys.pantheon.ethereum.core.PendingTransactions; +import tech.pegasys.pantheon.ethereum.core.ProcessableBlockHeader; +import tech.pegasys.pantheon.ethereum.core.SealableBlockHeader; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.ethereum.core.WorldUpdater; +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.TransactionProcessor; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.math.BigInteger; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractBlockScheduler.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractBlockScheduler.java index 8b6a304682..3950174a62 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractBlockScheduler.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractBlockScheduler.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.util.time.Clock; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.util.time.Clock; public abstract class AbstractBlockScheduler { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMinerExecutor.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMinerExecutor.java index d245c996ef..29a9e0c169 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMinerExecutor.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMinerExecutor.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.blockcreation; - -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator.MinedBlockObserver; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.util.Subscribers; -import net.consensys.pantheon.util.bytes.BytesValue; +package tech.pegasys.pantheon.ethereum.blockcreation; + +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator.MinedBlockObserver; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.PendingTransactions; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.util.Subscribers; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.concurrent.ExecutorService; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMiningCoordinator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMiningCoordinator.java index e3909adcbd..d1680b50e3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMiningCoordinator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AbstractMiningCoordinator.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.blockcreation; - -import net.consensys.pantheon.ethereum.chain.BlockAddedEvent; -import net.consensys.pantheon.ethereum.chain.BlockAddedEvent.EventType; -import net.consensys.pantheon.ethereum.chain.BlockAddedObserver; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.mainnet.EthHashSolution; -import net.consensys.pantheon.ethereum.mainnet.EthHashSolverInputs; -import net.consensys.pantheon.util.Subscribers; -import net.consensys.pantheon.util.bytes.BytesValue; +package tech.pegasys.pantheon.ethereum.blockcreation; + +import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; +import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent.EventType; +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.Wei; +import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolution; +import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolverInputs; +import tech.pegasys.pantheon.util.Subscribers; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AsyncBlockCreator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AsyncBlockCreator.java index b676fba879..59fdf03924 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AsyncBlockCreator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/AsyncBlockCreator.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; public interface AsyncBlockCreator extends BlockCreator { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockCreator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockCreator.java index cc1dc48da4..dc675ad080 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockCreator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockCreator.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; -import net.consensys.pantheon.ethereum.core.Block; +import tech.pegasys.pantheon.ethereum.core.Block; public interface BlockCreator { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockMiner.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockMiner.java index 248d5d855f..bf0b0c6579 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockMiner.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockMiner.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator.MinedBlockObserver; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockImporter; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.util.Subscribers; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator.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.mainnet.HeaderValidationMode; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.util.Subscribers; import java.util.concurrent.CancellationException; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelector.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelector.java index e28fdc9baa..e81c965351 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelector.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelector.java @@ -1,18 +1,18 @@ -package net.consensys.pantheon.ethereum.blockcreation; - -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.core.PendingTransactions.TransactionSelectionResult; -import net.consensys.pantheon.ethereum.core.ProcessableBlockHeader; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockProcessor.TransactionReceiptFactory; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor; -import net.consensys.pantheon.ethereum.vm.BlockHashLookup; +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.PendingTransactions; +import tech.pegasys.pantheon.ethereum.core.PendingTransactions.TransactionSelectionResult; +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.mainnet.MainnetBlockProcessor.TransactionReceiptFactory; +import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; +import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; import java.util.List; import java.util.concurrent.CancellationException; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/CoinbaseNotSetException.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/CoinbaseNotSetException.java index acf898ba8c..4d1b384ce0 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/CoinbaseNotSetException.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/CoinbaseNotSetException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; public class CoinbaseNotSetException extends RuntimeException { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/DefaultBlockScheduler.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/DefaultBlockScheduler.java index bca72917e6..13eab0d763 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/DefaultBlockScheduler.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/DefaultBlockScheduler.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.util.time.Clock; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.util.time.Clock; import java.util.concurrent.TimeUnit; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashBlockMiner.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashBlockMiner.java index 1003a25847..44eeea9a21 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashBlockMiner.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashBlockMiner.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator.MinedBlockObserver; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.EthHashBlockCreator; -import net.consensys.pantheon.ethereum.mainnet.EthHashSolution; -import net.consensys.pantheon.ethereum.mainnet.EthHashSolverInputs; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.util.Subscribers; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator.MinedBlockObserver; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.mainnet.EthHashBlockCreator; +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 java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutor.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutor.java index 0882474f8a..73eb4b9732 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutor.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutor.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator.MinedBlockObserver; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.mainnet.EthHashBlockCreator; -import net.consensys.pantheon.ethereum.mainnet.EthHashSolver; -import net.consensys.pantheon.ethereum.mainnet.EthHasher; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.util.Subscribers; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator.MinedBlockObserver; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.PendingTransactions; +import tech.pegasys.pantheon.ethereum.mainnet.EthHashBlockCreator; +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 java.util.Optional; import java.util.concurrent.ExecutorService; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMiningCoordinator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMiningCoordinator.java index 2bffd83913..6fd85062ed 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMiningCoordinator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMiningCoordinator.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; -import net.consensys.pantheon.ethereum.chain.BlockAddedObserver; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.mainnet.EthHashSolution; -import net.consensys.pantheon.ethereum.mainnet.EthHashSolverInputs; +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.mainnet.EthHashSolution; +import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolverInputs; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/IncrementingNonceGenerator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/IncrementingNonceGenerator.java index 91657681df..b93c1d3d6c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/IncrementingNonceGenerator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/IncrementingNonceGenerator.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; import java.util.Iterator; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/MiningParameters.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/MiningParameters.java index 34ba9eea4f..ce8eebe667 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/MiningParameters.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/MiningParameters.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/RandomNonceGenerator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/RandomNonceGenerator.java index 709808db9c..7897c422d2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/RandomNonceGenerator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/blockcreation/RandomNonceGenerator.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; -import net.consensys.pantheon.crypto.SecureRandomProvider; +import tech.pegasys.pantheon.crypto.SecureRandomProvider; import java.util.Iterator; import java.util.Random; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/BlockAddedEvent.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/BlockAddedEvent.java index 93128d3c3e..7606ab7fcb 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/BlockAddedEvent.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/BlockAddedEvent.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.chain; +package tech.pegasys.pantheon.ethereum.chain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.core.Block; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/chain/BlockAddedObserver.java index 4d697aab14..4998004086 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/BlockAddedObserver.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/BlockAddedObserver.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.chain; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/chain/Blockchain.java index d0e4551ccf..6741d65fae 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/Blockchain.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/Blockchain.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.chain; - -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.util.uint.UInt256; +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; import java.util.List; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/ChainHead.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/ChainHead.java index a163a69e52..e66f094aea 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/ChainHead.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/ChainHead.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.chain; +package tech.pegasys.pantheon.ethereum.chain; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.util.uint.UInt256; /** Head of a blockchain. */ public final class ChainHead { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/GenesisConfig.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/GenesisConfig.java index 3aaa2f6555..50399d96d1 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/GenesisConfig.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/GenesisConfig.java @@ -1,25 +1,25 @@ -package net.consensys.pantheon.ethereum.chain; - -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderBuilder; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.LogsBloomFilter; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.development.DevelopmentProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; -import net.consensys.pantheon.ethereum.worldstate.DefaultMutableWorldState; -import net.consensys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +package tech.pegasys.pantheon.ethereum.chain; + +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.MutableWorldState; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.ethereum.core.WorldUpdater; +import tech.pegasys.pantheon.ethereum.development.DevelopmentProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; +import tech.pegasys.pantheon.ethereum.worldstate.DefaultMutableWorldState; +import tech.pegasys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; +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 java.io.IOException; import java.math.BigInteger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/MutableBlockchain.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/MutableBlockchain.java index d3faf68bd1..1ba52aeb89 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/MutableBlockchain.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/MutableBlockchain.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.chain; +package tech.pegasys.pantheon.ethereum.chain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; +import tech.pegasys.pantheon.ethereum.core.Block; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/chain/TransactionLocation.java index 96c5beb271..a72b4a18f3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/TransactionLocation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/TransactionLocation.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.chain; +package tech.pegasys.pantheon.ethereum.chain; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/AbstractWorldUpdater.java index c106fdb77f..0cd6efc481 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AbstractWorldUpdater.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AbstractWorldUpdater.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; import static com.google.common.base.Preconditions.checkNotNull; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/Account.java index 8c3df6ee9f..4f8d308303 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Account.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Account.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.NavigableMap; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AccountTransactionOrder.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AccountTransactionOrder.java index 3927e76ecf..f3f8c0474d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AccountTransactionOrder.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/AccountTransactionOrder.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/Address.java index cba12a0974..c02e96df4b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Address.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Address.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.rlp.RLPException; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.DelegatingBytesValue; +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 com.fasterxml.jackson.annotation.JsonCreator; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Block.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Block.java index 1d5991ed66..b7fcdccbfa 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Block.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Block.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; -import net.consensys.pantheon.util.bytes.BytesValue; +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 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/tech/pegasys/pantheon/ethereum/core/BlockBody.java index 1ece9d6e40..62f047347a 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockBody.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockBody.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; import java.util.Collections; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHashFunction.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHashFunction.java index fb10dce14b..dbf67f38df 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHashFunction.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHashFunction.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; /** * An interface for creating the block hash given a {@link BlockHeader}. diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeader.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeader.java index 570a4961f2..e42224da53 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeader.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeader.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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 java.util.Objects; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderBuilder.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderBuilder.java index 80ac647758..ab4a05d5ec 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderBuilder.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderBuilder.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.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 net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.time.Instant; import java.util.OptionalLong; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockImporter.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockImporter.java index cb1fa3963e..94186da033 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockImporter.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockImporter.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockMetadata.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockMetadata.java index 0c4e3ec5a7..56038e1a7c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockMetadata.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/BlockMetadata.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.core; - -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.rlp.RLPException; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +package tech.pegasys.pantheon.ethereum.core; + +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 tech.pegasys.pantheon.util.uint.UInt256; public class BlockMetadata { private static final BlockMetadata EMPTY = new BlockMetadata(null); diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Gas.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Gas.java index 7becc866ff..03a140ce3b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Gas.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Gas.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/Hash.java index 578195eec9..3b41ecbbc0 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Hash.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Hash.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import static net.consensys.pantheon.crypto.Hash.keccak256; +import static tech.pegasys.pantheon.crypto.Hash.keccak256; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.DelegatingBytes32; +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 com.fasterxml.jackson.annotation.JsonCreator; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Log.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Log.java index d9a29e4ef0..12ff83b747 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Log.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Log.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.List; import java.util.Objects; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogSeries.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogSeries.java index 97b2883ddd..fe60162ce2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogSeries.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogSeries.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/LogTopic.java index 5ce5e9272e..3ecd9aea94 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogTopic.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogTopic.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.DelegatingBytesValue; +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; 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/tech/pegasys/pantheon/ethereum/core/LogsBloomFilter.java index 4f7b040dc4..8c9ed9b30e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogsBloomFilter.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/LogsBloomFilter.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; import static com.google.common.base.Preconditions.checkArgument; -import static net.consensys.pantheon.crypto.Hash.keccak256; +import static tech.pegasys.pantheon.crypto.Hash.keccak256; -import net.consensys.pantheon.ethereum.rlp.RLPException; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytesValue; +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.MutableBytesValue; import java.util.Collection; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableAccount.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableAccount.java index dea2f5ccc6..337db20693 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableAccount.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableAccount.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/MutableWorldState.java index 14fee55b62..996b74e66f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableWorldState.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableWorldState.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/MutableWorldView.java index 12286edc5c..af2403c41a 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableWorldView.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/MutableWorldView.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; public interface MutableWorldView extends WorldView { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/PendingTransactionListener.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/PendingTransactionListener.java index aca49c5e67..66132481b5 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/PendingTransactionListener.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/PendingTransactionListener.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; @FunctionalInterface public interface PendingTransactionListener { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/PendingTransactions.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/PendingTransactions.java index 43472a3f3a..dfb4d06bec 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/PendingTransactions.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/PendingTransactions.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; import static java.util.Collections.newSetFromMap; import static java.util.Comparator.comparing; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/ProcessableBlockHeader.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/ProcessableBlockHeader.java index 2f721cc724..a0e4596a8b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/ProcessableBlockHeader.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/ProcessableBlockHeader.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/SealableBlockHeader.java index 9187a2ad63..9ed8a12b01 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/SealableBlockHeader.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/SealableBlockHeader.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/SyncStatus.java index 85ee4205f9..fcf54c09fe 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/SyncStatus.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/SyncStatus.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; public final class SyncStatus { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Synchronizer.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Synchronizer.java index 3f198a5a37..5ac4ee761a 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Synchronizer.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Synchronizer.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Transaction.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Transaction.java index e56b0e4f05..b6b5dd14cd 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Transaction.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Transaction.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; import static com.google.common.base.Preconditions.checkState; -import static net.consensys.pantheon.crypto.Hash.keccak256; - -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.rlp.RLPException; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; -import net.consensys.pantheon.util.uint.UInt256; +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 java.math.BigInteger; import java.util.Objects; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionBuilder.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionBuilder.java index 24c4a0b8a3..4cbb438ede 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionBuilder.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionBuilder.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.crypto.SECP256K1.Signature; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.util.bytes.BytesValue; /** Convenience object for building {@link Transaction}s. */ public interface TransactionBuilder { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionPool.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionPool.java index 76139e38cf..ea488c46ae 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionPool.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionPool.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; import static java.util.Collections.singletonList; import static org.apache.logging.log4j.LogManager.getLogger; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.BlockAddedEvent; -import net.consensys.pantheon.ethereum.chain.BlockAddedObserver; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.TransactionValidator; -import net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import net.consensys.pantheon.ethereum.mainnet.ValidationResult; +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.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator; +import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; +import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionReceipt.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionReceipt.java index 5507636825..13ecc56051 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionReceipt.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/TransactionReceipt.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.ethereum.mainnet.TransactionReceiptType; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; +import tech.pegasys.pantheon.ethereum.mainnet.TransactionReceiptType; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; 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/tech/pegasys/pantheon/ethereum/core/Util.java index 3a336bc7b1..ded6542ab2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Util.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Util.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.crypto.SECP256K1.PublicKey; -import net.consensys.pantheon.crypto.SECP256K1.Signature; +import tech.pegasys.pantheon.crypto.SECP256K1.PublicKey; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/Wei.java index bb39b70c83..d29b5f70f6 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Wei.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/Wei.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.BaseUInt256Value; -import net.consensys.pantheon.util.uint.Counter; -import net.consensys.pantheon.util.uint.UInt256; +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 java.math.BigInteger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldState.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldState.java index b7df8a03a7..3d143334e6 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldState.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldState.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; import java.util.stream.Stream; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldUpdater.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldUpdater.java index c3797abfe3..3dd18748c8 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldUpdater.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldUpdater.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/WorldView.java index 97ef4d2cd0..141da8d0e8 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldView.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/WorldView.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.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/db/BlockchainStorage.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/db/BlockchainStorage.java index bbedf1c331..db27a2d0f0 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/db/BlockchainStorage.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/db/BlockchainStorage.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.db; - -import net.consensys.pantheon.ethereum.chain.TransactionLocation; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.util.uint.UInt256; +package tech.pegasys.pantheon.ethereum.db; + +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.Hash; +import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.Collection; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/db/DefaultMutableBlockchain.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/db/DefaultMutableBlockchain.java index f969f3f0b3..67bfbac2e8 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/db/DefaultMutableBlockchain.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/db/DefaultMutableBlockchain.java @@ -1,25 +1,25 @@ -package net.consensys.pantheon.ethereum.db; +package tech.pegasys.pantheon.ethereum.db; 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 net.consensys.pantheon.ethereum.chain.BlockAddedEvent; -import net.consensys.pantheon.ethereum.chain.BlockAddedObserver; -import net.consensys.pantheon.ethereum.chain.ChainHead; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.chain.TransactionLocation; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHashFunction; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.Subscribers; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; +import tech.pegasys.pantheon.ethereum.chain.BlockAddedObserver; +import tech.pegasys.pantheon.ethereum.chain.ChainHead; +import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; +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.BlockHashFunction; +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.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.util.Subscribers; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/db/KeyValueStoragePrefixedKeyBlockchainStorage.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/db/KeyValueStoragePrefixedKeyBlockchainStorage.java index 705d74dfbc..f6ffc2f1f5 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/db/KeyValueStoragePrefixedKeyBlockchainStorage.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/db/KeyValueStoragePrefixedKeyBlockchainStorage.java @@ -1,18 +1,18 @@ -package net.consensys.pantheon.ethereum.db; - -import net.consensys.pantheon.ethereum.chain.TransactionLocation; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHashFunction; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; -import net.consensys.pantheon.util.uint.UInt256; -import net.consensys.pantheon.util.uint.UInt256Bytes; +package tech.pegasys.pantheon.ethereum.db; + +import tech.pegasys.pantheon.ethereum.chain.TransactionLocation; +import tech.pegasys.pantheon.ethereum.core.BlockBody; +import tech.pegasys.pantheon.ethereum.core.BlockHashFunction; +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.rlp.RLP; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +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; import java.nio.charset.StandardCharsets; import java.util.Collection; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/db/WorldStateArchive.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/db/WorldStateArchive.java index ea43346c5a..43e9bb5025 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/db/WorldStateArchive.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/db/WorldStateArchive.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.db; +package tech.pegasys.pantheon.ethereum.db; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.WorldState; -import net.consensys.pantheon.ethereum.trie.MerklePatriciaTrie; -import net.consensys.pantheon.ethereum.worldstate.DefaultMutableWorldState; -import net.consensys.pantheon.ethereum.worldstate.WorldStateStorage; +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.trie.MerklePatriciaTrie; +import tech.pegasys.pantheon.ethereum.worldstate.DefaultMutableWorldState; +import tech.pegasys.pantheon.ethereum.worldstate.WorldStateStorage; public class WorldStateArchive { private final WorldStateStorage storage; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/debug/TraceFrame.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/debug/TraceFrame.java index d87439db87..25dd8d1d7c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/debug/TraceFrame.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/debug/TraceFrame.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.debug; +package tech.pegasys.pantheon.ethereum.debug; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.core.Gas; +import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/debug/TraceOptions.java index c7df5bb214..92e2a5edd1 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/debug/TraceOptions.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/debug/TraceOptions.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.debug; +package tech.pegasys.pantheon.ethereum.debug; public class TraceOptions { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/development/DevelopmentDifficultyCalculators.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/development/DevelopmentDifficultyCalculators.java index 8e76aa4ed5..76ca096698 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/development/DevelopmentDifficultyCalculators.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/development/DevelopmentDifficultyCalculators.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.development; +package tech.pegasys.pantheon.ethereum.development; -import net.consensys.pantheon.ethereum.mainnet.DifficultyCalculator; +import tech.pegasys.pantheon.ethereum.mainnet.DifficultyCalculator; import java.math.BigInteger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/development/DevelopmentProtocolSchedule.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/development/DevelopmentProtocolSchedule.java index da0978d19c..b70f884558 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/development/DevelopmentProtocolSchedule.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/development/DevelopmentProtocolSchedule.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.development; +package tech.pegasys.pantheon.ethereum.development; -import static net.consensys.pantheon.ethereum.mainnet.MainnetTransactionValidator.NO_CHAIN_ID; +import static tech.pegasys.pantheon.ethereum.mainnet.MainnetTransactionValidator.NO_CHAIN_ID; -import net.consensys.pantheon.ethereum.mainnet.MutableProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.MutableProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; import io.vertx.core.json.JsonObject; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/development/DevelopmentProtocolSpecs.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/development/DevelopmentProtocolSpecs.java index 2d6f64c6db..8c87fc1455 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/development/DevelopmentProtocolSpecs.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/development/DevelopmentProtocolSpecs.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.development; +package tech.pegasys.pantheon.ethereum.development; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSpecs; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSpecs; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; /** * Provides a protocol specification which is suitable for use on private, PoW networks, where block diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AbstractMessageProcessor.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AbstractMessageProcessor.java index 52966f6f48..8205c8300a 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AbstractMessageProcessor.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AbstractMessageProcessor.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.mainnet; - -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.OperationTracer; -import net.consensys.pantheon.ethereum.vm.ehalt.ExceptionalHaltException; +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; 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/tech/pegasys/pantheon/ethereum/mainnet/AbstractPrecompiledContract.java index 4b511e2c66..6c5d8ac419 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AbstractPrecompiledContract.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AbstractPrecompiledContract.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Gas; +import tech.pegasys.pantheon.ethereum.vm.GasCalculator; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/AttachedBlockHeaderValidationRule.java index c44bac4f48..2011623122 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AttachedBlockHeaderValidationRule.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/AttachedBlockHeaderValidationRule.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/BlockBodyValidator.java index e40254f6d5..633636d57d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockBodyValidator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockBodyValidator.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; +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 java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockHeaderValidator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockHeaderValidator.java index 784731ea9c..c3e707f19f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockHeaderValidator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockHeaderValidator.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/BlockProcessor.java index 9ce3849552..3171daa5ed 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockProcessor.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BlockProcessor.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; +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 java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BodyValidation.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BodyValidation.java index 707ccbd521..93fd446ac0 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BodyValidation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/BodyValidation.java @@ -1,18 +1,18 @@ -package net.consensys.pantheon.ethereum.mainnet; - -import static net.consensys.pantheon.crypto.Hash.keccak256; -import static net.consensys.pantheon.util.bytes.BytesValues.trimLeadingZeros; - -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.LogsBloomFilter; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.trie.MerklePatriciaTrie; -import net.consensys.pantheon.ethereum.trie.SimpleMerklePatriciaTrie; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ConstantinopleGasCalculator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ConstantinopleGasCalculator.java index 1237d659f4..93b79016a4 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ConstantinopleGasCalculator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ConstantinopleGasCalculator.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +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 java.util.function.Supplier; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/DetachedBlockHeaderValidationRule.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/DetachedBlockHeaderValidationRule.java index 5fa6e5ecd3..45e506092b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/DetachedBlockHeaderValidationRule.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/DetachedBlockHeaderValidationRule.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/DifficultyCalculator.java index 290e1927fd..e3416ae53c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/DifficultyCalculator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/DifficultyCalculator.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; import java.math.BigInteger; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHash.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHash.java index af71d222e9..27502cfe28 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHash.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHash.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.crypto.BouncyCastleMessageDigestFactory; -import net.consensys.pantheon.crypto.Hash; -import net.consensys.pantheon.ethereum.core.SealableBlockHeader; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; +import tech.pegasys.pantheon.crypto.BouncyCastleMessageDigestFactory; +import tech.pegasys.pantheon.crypto.Hash; +import tech.pegasys.pantheon.ethereum.core.SealableBlockHeader; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; import java.math.BigInteger; import java.nio.ByteBuffer; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashBlockCreator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashBlockCreator.java index 0882f68b9f..4f595533c2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashBlockCreator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashBlockCreator.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractBlockCreator; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderBuilder; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.core.SealableBlockHeader; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.mainnet.EthHashSolver.EthHashSolverJob; -import net.consensys.pantheon.util.bytes.BytesValues; -import net.consensys.pantheon.util.uint.UInt256; +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.PendingTransactions; +import tech.pegasys.pantheon.ethereum.core.SealableBlockHeader; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolver.EthHashSolverJob; +import tech.pegasys.pantheon.util.bytes.BytesValues; +import tech.pegasys.pantheon.util.uint.UInt256; import java.math.BigInteger; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashCacheFactory.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashCacheFactory.java index 246acce791..0838c36e5f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashCacheFactory.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashCacheFactory.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolution.java index 1ca3bbae01..934612cae8 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolution.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolution.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolver.java index 6eb0ca2aa5..e12b7cbb1f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolver.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolver.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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 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/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolverInputs.java index 5265643ee7..4b327f467d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolverInputs.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolverInputs.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/EthHasher.java index 98c00b329f..7252d25b02 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHasher.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/EthHasher.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; import java.io.Closeable; import java.io.IOException; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/FrontierGasCalculator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/FrontierGasCalculator.java index d0e5c82f8b..c36a395b13 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/FrontierGasCalculator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/FrontierGasCalculator.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.mainnet; - -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Words; -import net.consensys.pantheon.ethereum.vm.operations.ExpOperation; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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; import java.util.function.Supplier; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/HeaderValidationMode.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/HeaderValidationMode.java index 1b75428c53..74f250ec1c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/HeaderValidationMode.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/HeaderValidationMode.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/HomesteadGasCalculator.java index 1890debbe4..cd0f4315bc 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/HomesteadGasCalculator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/HomesteadGasCalculator.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.Gas; +import tech.pegasys.pantheon.ethereum.core.Gas; public class HomesteadGasCalculator extends FrontierGasCalculator { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockBodyValidator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockBodyValidator.java index d1760463f1..f04cc54eb3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockBodyValidator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockBodyValidator.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.mainnet; - -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.LogsBloomFilter; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.util.bytes.Bytes32; +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; import java.util.HashSet; import java.util.List; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHashFunction.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHashFunction.java index 24772681c8..57f2ca902b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHashFunction.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHashFunction.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.rlp.RLP; +import tech.pegasys.pantheon.util.bytes.BytesValue; /** Implements the block hashing algorithm for MainNet as per the yellow paper. */ public class MainnetBlockHashFunction { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderValidator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderValidator.java index ff7c8b2b3d..517019b17c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderValidator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderValidator.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.AncestryValidationRule; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.CalculatedDifficultyValidationRule; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.ConstantFieldValidationRule; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.ExtraDataMaxLengthValidationRule; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.GasUsageValidationRule; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.ProofOfWorkValidationRule; -import net.consensys.pantheon.ethereum.mainnet.headervalidationrules.TimestampValidationRule; -import net.consensys.pantheon.util.bytes.BytesValue; +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.TimestampValidationRule; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockImporter.java index 891f745674..fc0ad7537e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockImporter.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockImporter.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; import static org.apache.logging.log4j.LogManager.getLogger; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockImporter; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; +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.core.TransactionReceipt; import java.util.List; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockProcessor.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockProcessor.java index c881aff699..090ff18e47 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockProcessor.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockProcessor.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.mainnet; - -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.MutableAccount; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.ProcessableBlockHeader; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldState; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.vm.BlockHashLookup; +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; 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/tech/pegasys/pantheon/ethereum/mainnet/MainnetContractCreationProcessor.java index 645e465a3b..2b44d54ae1 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetContractCreationProcessor.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetContractCreationProcessor.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.mainnet; - -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.MutableAccount; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.BytesValue; +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; import java.util.Collection; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetDifficultyCalculators.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetDifficultyCalculators.java index e3ae7824f1..10f5f07e70 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetDifficultyCalculators.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetDifficultyCalculators.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/MainnetEvmRegistries.java index 4ba7ccc69b..a5d814e1a4 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetEvmRegistries.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetEvmRegistries.java @@ -1,84 +1,84 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.Operation; -import net.consensys.pantheon.ethereum.vm.OperationRegistry; -import net.consensys.pantheon.ethereum.vm.operations.AddModOperation; -import net.consensys.pantheon.ethereum.vm.operations.AddOperation; -import net.consensys.pantheon.ethereum.vm.operations.AddressOperation; -import net.consensys.pantheon.ethereum.vm.operations.AndOperation; -import net.consensys.pantheon.ethereum.vm.operations.BalanceOperation; -import net.consensys.pantheon.ethereum.vm.operations.BlockHashOperation; -import net.consensys.pantheon.ethereum.vm.operations.ByteOperation; -import net.consensys.pantheon.ethereum.vm.operations.CallCodeOperation; -import net.consensys.pantheon.ethereum.vm.operations.CallDataCopyOperation; -import net.consensys.pantheon.ethereum.vm.operations.CallDataLoadOperation; -import net.consensys.pantheon.ethereum.vm.operations.CallDataSizeOperation; -import net.consensys.pantheon.ethereum.vm.operations.CallOperation; -import net.consensys.pantheon.ethereum.vm.operations.CallValueOperation; -import net.consensys.pantheon.ethereum.vm.operations.CallerOperation; -import net.consensys.pantheon.ethereum.vm.operations.CodeCopyOperation; -import net.consensys.pantheon.ethereum.vm.operations.CodeSizeOperation; -import net.consensys.pantheon.ethereum.vm.operations.CoinbaseOperation; -import net.consensys.pantheon.ethereum.vm.operations.Create2Operation; -import net.consensys.pantheon.ethereum.vm.operations.CreateOperation; -import net.consensys.pantheon.ethereum.vm.operations.DelegateCallOperation; -import net.consensys.pantheon.ethereum.vm.operations.DifficultyOperation; -import net.consensys.pantheon.ethereum.vm.operations.DivOperation; -import net.consensys.pantheon.ethereum.vm.operations.DupOperation; -import net.consensys.pantheon.ethereum.vm.operations.EqOperation; -import net.consensys.pantheon.ethereum.vm.operations.ExpOperation; -import net.consensys.pantheon.ethereum.vm.operations.ExtCodeCopyOperation; -import net.consensys.pantheon.ethereum.vm.operations.ExtCodeHashOperation; -import net.consensys.pantheon.ethereum.vm.operations.ExtCodeSizeOperation; -import net.consensys.pantheon.ethereum.vm.operations.GasLimitOperation; -import net.consensys.pantheon.ethereum.vm.operations.GasOperation; -import net.consensys.pantheon.ethereum.vm.operations.GasPriceOperation; -import net.consensys.pantheon.ethereum.vm.operations.GtOperation; -import net.consensys.pantheon.ethereum.vm.operations.InvalidOperation; -import net.consensys.pantheon.ethereum.vm.operations.IsZeroOperation; -import net.consensys.pantheon.ethereum.vm.operations.JumpDestOperation; -import net.consensys.pantheon.ethereum.vm.operations.JumpOperation; -import net.consensys.pantheon.ethereum.vm.operations.JumpiOperation; -import net.consensys.pantheon.ethereum.vm.operations.LogOperation; -import net.consensys.pantheon.ethereum.vm.operations.LtOperation; -import net.consensys.pantheon.ethereum.vm.operations.MLoadOperation; -import net.consensys.pantheon.ethereum.vm.operations.MSizeOperation; -import net.consensys.pantheon.ethereum.vm.operations.MStore8Operation; -import net.consensys.pantheon.ethereum.vm.operations.MStoreOperation; -import net.consensys.pantheon.ethereum.vm.operations.ModOperation; -import net.consensys.pantheon.ethereum.vm.operations.MulModOperation; -import net.consensys.pantheon.ethereum.vm.operations.MulOperation; -import net.consensys.pantheon.ethereum.vm.operations.NotOperation; -import net.consensys.pantheon.ethereum.vm.operations.NumberOperation; -import net.consensys.pantheon.ethereum.vm.operations.OrOperation; -import net.consensys.pantheon.ethereum.vm.operations.OriginOperation; -import net.consensys.pantheon.ethereum.vm.operations.PCOperation; -import net.consensys.pantheon.ethereum.vm.operations.PopOperation; -import net.consensys.pantheon.ethereum.vm.operations.PushOperation; -import net.consensys.pantheon.ethereum.vm.operations.ReturnDataCopyOperation; -import net.consensys.pantheon.ethereum.vm.operations.ReturnDataSizeOperation; -import net.consensys.pantheon.ethereum.vm.operations.ReturnOperation; -import net.consensys.pantheon.ethereum.vm.operations.RevertOperation; -import net.consensys.pantheon.ethereum.vm.operations.SDivOperation; -import net.consensys.pantheon.ethereum.vm.operations.SGtOperation; -import net.consensys.pantheon.ethereum.vm.operations.SLoadOperation; -import net.consensys.pantheon.ethereum.vm.operations.SLtOperation; -import net.consensys.pantheon.ethereum.vm.operations.SModOperation; -import net.consensys.pantheon.ethereum.vm.operations.SStoreOperation; -import net.consensys.pantheon.ethereum.vm.operations.SarOperation; -import net.consensys.pantheon.ethereum.vm.operations.SelfDestructOperation; -import net.consensys.pantheon.ethereum.vm.operations.Sha3Operation; -import net.consensys.pantheon.ethereum.vm.operations.ShlOperation; -import net.consensys.pantheon.ethereum.vm.operations.ShrOperation; -import net.consensys.pantheon.ethereum.vm.operations.SignExtendOperation; -import net.consensys.pantheon.ethereum.vm.operations.StaticCallOperation; -import net.consensys.pantheon.ethereum.vm.operations.StopOperation; -import net.consensys.pantheon.ethereum.vm.operations.SubOperation; -import net.consensys.pantheon.ethereum.vm.operations.SwapOperation; -import net.consensys.pantheon.ethereum.vm.operations.TimestampOperation; -import net.consensys.pantheon.ethereum.vm.operations.XorOperation; +import tech.pegasys.pantheon.ethereum.vm.EVM; +import tech.pegasys.pantheon.ethereum.vm.GasCalculator; +import tech.pegasys.pantheon.ethereum.vm.Operation; +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.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.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 java.util.List; import java.util.function.Function; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetMessageCallProcessor.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetMessageCallProcessor.java index 626e6d0108..d3c512d4ff 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetMessageCallProcessor.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetMessageCallProcessor.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.MutableAccount; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.BytesValue; +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 java.util.Collection; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetPrecompiledContractRegistries.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetPrecompiledContractRegistries.java index a31edaa72e..17638c5fab 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetPrecompiledContractRegistries.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetPrecompiledContractRegistries.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.mainnet.precompiles.AltBN128AddPrecompiledContract; -import net.consensys.pantheon.ethereum.mainnet.precompiles.AltBN128MulPrecompiledContract; -import net.consensys.pantheon.ethereum.mainnet.precompiles.AltBN128PairingPrecompiledContract; -import net.consensys.pantheon.ethereum.mainnet.precompiles.BigIntegerModularExponentiationPrecompiledContract; -import net.consensys.pantheon.ethereum.mainnet.precompiles.ECRECPrecompiledContract; -import net.consensys.pantheon.ethereum.mainnet.precompiles.IDPrecompiledContract; -import net.consensys.pantheon.ethereum.mainnet.precompiles.RIPEMD160PrecompiledContract; -import net.consensys.pantheon.ethereum.mainnet.precompiles.SHA256PrecompiledContract; -import net.consensys.pantheon.ethereum.vm.GasCalculator; +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.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.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/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolSchedule.java index 0e70e0006b..de5503b456 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolSchedule.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolSchedule.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; import io.vertx.core.json.JsonObject; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolSpecs.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolSpecs.java index 178e4cf55f..461b7d4e4b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolSpecs.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolSpecs.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.mainnet; - -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.MutableAccount; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldState; -import net.consensys.pantheon.ethereum.core.WorldUpdater; +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.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 java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionProcessor.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionProcessor.java index 139c008ea6..883037cb6b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionProcessor.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionProcessor.java @@ -1,22 +1,22 @@ -package net.consensys.pantheon.ethereum.mainnet; - -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.LogSeries; -import net.consensys.pantheon.ethereum.core.MutableAccount; -import net.consensys.pantheon.ethereum.core.ProcessableBlockHeader; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import net.consensys.pantheon.ethereum.vm.BlockHashLookup; -import net.consensys.pantheon.ethereum.vm.Code; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.OperationTracer; -import net.consensys.pantheon.util.bytes.BytesValue; +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; import java.util.ArrayDeque; import java.util.Deque; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionValidator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionValidator.java index 4143b00610..2d54908850 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionValidator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionValidator.java @@ -1,18 +1,18 @@ -package net.consensys.pantheon.ethereum.mainnet; - -import static net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INCORRECT_NONCE; -import static net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INTRINSIC_GAS_EXCEEDS_GAS_LIMIT; -import static net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INVALID_SIGNATURE; -import static net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.NONCE_TOO_LOW; -import static net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED; -import static net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.UPFRONT_COST_EXCEEDS_BALANCE; -import static net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.WRONG_CHAIN_ID; - -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.vm.GasCalculator; +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.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.vm.GasCalculator; import java.util.OptionalInt; import java.util.OptionalLong; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MiningBeneficiaryCalculator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MiningBeneficiaryCalculator.java index 1b71e77ec0..9429b300d9 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MiningBeneficiaryCalculator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MiningBeneficiaryCalculator.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/MutableProtocolSchedule.java index cad296e32a..996167c08e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MutableProtocolSchedule.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/MutableProtocolSchedule.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; import static com.google.common.base.Preconditions.checkArgument; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompileContractRegistry.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompileContractRegistry.java index f52716b8fb..cb26093b71 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompileContractRegistry.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompileContractRegistry.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.Address; import java.util.HashMap; import java.util.Map; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompiledContract.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompiledContract.java index 09ab2ed4c4..8173a838ae 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompiledContract.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/PrecompiledContract.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Gas; +import tech.pegasys.pantheon.util.bytes.BytesValue; /** * A pre-compiled contract. diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSchedule.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSchedule.java index 91773d4cd0..067661317d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSchedule.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSchedule.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; public interface ProtocolSchedule { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSpec.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSpec.java index 1bdb5ac760..8e94d18599 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSpec.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSpec.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.BlockHashFunction; -import net.consensys.pantheon.ethereum.core.BlockImporter; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockProcessor.TransactionReceiptFactory; -import net.consensys.pantheon.ethereum.vm.EVM; +import tech.pegasys.pantheon.ethereum.core.BlockHashFunction; +import tech.pegasys.pantheon.ethereum.core.BlockImporter; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockProcessor.TransactionReceiptFactory; +import tech.pegasys.pantheon.ethereum.vm.EVM; /** A protocol specification. */ public class ProtocolSpec { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSpecBuilder.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSpecBuilder.java index af8f754884..adba966063 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSpecBuilder.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolSpecBuilder.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; import static com.google.common.base.Preconditions.checkNotNull; -import net.consensys.pantheon.ethereum.core.BlockHashFunction; -import net.consensys.pantheon.ethereum.core.BlockImporter; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockProcessor.TransactionReceiptFactory; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.GasCalculator; +import tech.pegasys.pantheon.ethereum.core.BlockHashFunction; +import tech.pegasys.pantheon.ethereum.core.BlockImporter; +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 java.util.function.BiFunction; import java.util.function.Function; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ScheduleBasedBlockHashFunction.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ScheduleBasedBlockHashFunction.java index b6f07e06bc..4f8d85ae8e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ScheduleBasedBlockHashFunction.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ScheduleBasedBlockHashFunction.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.BlockHashFunction; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.BlockHashFunction; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.Hash; /** * Looks up the correct {@link BlockHashFunction} 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/tech/pegasys/pantheon/ethereum/mainnet/ScheduledProtocolSpec.java index eece91b655..8850f0b32c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ScheduledProtocolSpec.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ScheduledProtocolSpec.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/SpuriousDragonGasCalculator.java index 9b72b7ba77..b4adddce7a 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/SpuriousDragonGasCalculator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/SpuriousDragonGasCalculator.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/mainnet/TangerineWhistleGasCalculator.java index f7d53c8742..f99cf9b42e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TangerineWhistleGasCalculator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TangerineWhistleGasCalculator.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/mainnet/TransactionProcessor.java index 37ac84b4d7..e97b638888 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionProcessor.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionProcessor.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.mainnet; - -import static net.consensys.pantheon.ethereum.vm.OperationTracer.NO_TRACING; - -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.LogSeries; -import net.consensys.pantheon.ethereum.core.ProcessableBlockHeader; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import net.consensys.pantheon.ethereum.vm.BlockHashLookup; -import net.consensys.pantheon.ethereum.vm.OperationTracer; -import net.consensys.pantheon.util.bytes.BytesValue; +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; /** Processes transactions. */ public interface TransactionProcessor { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionReceiptType.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionReceiptType.java index f75f35cdc3..2fd3002ff5 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionReceiptType.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionReceiptType.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; public enum TransactionReceiptType { ROOT, diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionValidator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionValidator.java index faf3fe9e30..8386f8de33 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionValidator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/TransactionValidator.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.core.Account; +import tech.pegasys.pantheon.ethereum.core.Transaction; import java.util.OptionalLong; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationResult.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationResult.java index b5da989801..4584809e93 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationResult.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationResult.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; import java.util.NoSuchElementException; import java.util.Objects; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/AncestryValidationRule.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/AncestryValidationRule.java index 3b77347932..bbad1e2594 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/AncestryValidationRule.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/AncestryValidationRule.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.mainnet.headervalidationrules; +package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/CalculatedDifficultyValidationRule.java index d027bf7e5b..f9ca622223 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/CalculatedDifficultyValidationRule.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/CalculatedDifficultyValidationRule.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.mainnet.headervalidationrules; +package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.AttachedBlockHeaderValidationRule; -import net.consensys.pantheon.ethereum.mainnet.DifficultyCalculator; +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 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/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRule.java index 738e630884..241dc0f992 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRule.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRule.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.mainnet.headervalidationrules; +package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; import static org.apache.logging.log4j.LogManager.getLogger; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRule.java index 9a005517cf..8b1a1df01f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRule.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRule.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.mainnet.headervalidationrules; +package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRule.java index 8c01fdc429..a03c2fb37f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRule.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRule.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.mainnet.headervalidationrules; +package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasUsageValidationRule.java index 2edbbae2a4..8f5fe09b6c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasUsageValidationRule.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasUsageValidationRule.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.mainnet.headervalidationrules; +package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRule.java index a7ee575b4d..4d74c320c2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRule.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRule.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.mainnet.headervalidationrules; - -import net.consensys.pantheon.crypto.BouncyCastleMessageDigestFactory; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; -import net.consensys.pantheon.ethereum.mainnet.EthHasher; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.rlp.RlpUtils; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; -import net.consensys.pantheon.util.uint.UInt256; +package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; + +import tech.pegasys.pantheon.crypto.BouncyCastleMessageDigestFactory; +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.RLP; +import tech.pegasys.pantheon.ethereum.rlp.RlpUtils; +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 java.math.BigInteger; import java.security.MessageDigest; @@ -36,7 +36,7 @@ public final class ProofOfWorkValidationRule implements DetachedBlockHeaderValid () -> { try { return BouncyCastleMessageDigestFactory.create( - net.consensys.pantheon.crypto.Hash.KECCAK256_ALG); + tech.pegasys.pantheon.crypto.Hash.KECCAK256_ALG); } catch (final NoSuchAlgorithmException ex) { throw new IllegalStateException(ex); } diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/TimestampValidationRule.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/TimestampValidationRule.java index aaff1a0d6d..5cecb5b9d4 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/TimestampValidationRule.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/TimestampValidationRule.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.mainnet.headervalidationrules; +package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.mainnet.DetachedBlockHeaderValidationRule; import java.util.concurrent.TimeUnit; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128AddPrecompiledContract.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128AddPrecompiledContract.java index 2134c3ba03..563b665004 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128AddPrecompiledContract.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128AddPrecompiledContract.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.mainnet.precompiles; - -import net.consensys.pantheon.crypto.altbn128.AltBn128Point; -import net.consensys.pantheon.crypto.altbn128.Fq; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytesValue; +package tech.pegasys.pantheon.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.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128MulPrecompiledContract.java index 375215f630..c47c8310bd 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128MulPrecompiledContract.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128MulPrecompiledContract.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.mainnet.precompiles; - -import net.consensys.pantheon.crypto.altbn128.AltBn128Point; -import net.consensys.pantheon.crypto.altbn128.Fq; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytesValue; +package tech.pegasys.pantheon.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.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContract.java index 0f968ccec6..2e031e123c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContract.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContract.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.mainnet.precompiles; +package tech.pegasys.pantheon.ethereum.mainnet.precompiles; -import net.consensys.pantheon.crypto.altbn128.AltBn128Fq12Pairer; -import net.consensys.pantheon.crypto.altbn128.AltBn128Fq2Point; -import net.consensys.pantheon.crypto.altbn128.AltBn128Point; -import net.consensys.pantheon.crypto.altbn128.Fq; -import net.consensys.pantheon.crypto.altbn128.Fq12; -import net.consensys.pantheon.crypto.altbn128.Fq2; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.util.bytes.BytesValue; +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.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/BigIntegerModularExponentiationPrecompiledContract.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/BigIntegerModularExponentiationPrecompiledContract.java index 77f887e864..b2b09cbdf9 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/BigIntegerModularExponentiationPrecompiledContract.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/BigIntegerModularExponentiationPrecompiledContract.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.mainnet.precompiles; - -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; -import net.consensys.pantheon.util.bytes.MutableBytesValue; +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.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValues; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/precompiles/ECRECPrecompiledContract.java index 9460bbcd82..9c0ee8e615 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/ECRECPrecompiledContract.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/ECRECPrecompiledContract.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.mainnet.precompiles; +package tech.pegasys.pantheon.ethereum.mainnet.precompiles; -import net.consensys.pantheon.crypto.SECP256K1.PublicKey; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; -import net.consensys.pantheon.util.bytes.MutableBytes32; -import net.consensys.pantheon.util.bytes.MutableBytesValue; +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.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 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/tech/pegasys/pantheon/ethereum/mainnet/precompiles/IDPrecompiledContract.java index e926266139..cc31f3e4a8 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/IDPrecompiledContract.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/IDPrecompiledContract.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.mainnet.precompiles; +package tech.pegasys.pantheon.ethereum.mainnet.precompiles; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.util.bytes.BytesValue; +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.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/tech/pegasys/pantheon/ethereum/mainnet/precompiles/RIPEMD160PrecompiledContract.java index 90a63cb24a..0797ee5454 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/RIPEMD160PrecompiledContract.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/RIPEMD160PrecompiledContract.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.mainnet.precompiles; +package tech.pegasys.pantheon.ethereum.mainnet.precompiles; -import net.consensys.pantheon.crypto.Hash; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +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.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/precompiles/SHA256PrecompiledContract.java index 6e71c0f8d2..9754a0e075 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/SHA256PrecompiledContract.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/SHA256PrecompiledContract.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.mainnet.precompiles; +package tech.pegasys.pantheon.ethereum.mainnet.precompiles; -import net.consensys.pantheon.crypto.Hash; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.mainnet.AbstractPrecompiledContract; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.util.bytes.BytesValue; +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.util.bytes.BytesValue; public class SHA256PrecompiledContract extends AbstractPrecompiledContract { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/BlockchainUtil.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/BlockchainUtil.java index ca40dc2619..e8bdfd750a 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/BlockchainUtil.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/BlockchainUtil.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.util; +package tech.pegasys.pantheon.ethereum.util; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.chain.Blockchain; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/util/ByteArrayUtil.java index 720d3c66b7..1822886940 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/ByteArrayUtil.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/ByteArrayUtil.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.util; +package tech.pegasys.pantheon.ethereum.util; import com.google.common.primitives.Longs; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/RawBlockIterator.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/RawBlockIterator.java index 4453f1d5b2..e3d18ebb62 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/RawBlockIterator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/util/RawBlockIterator.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.util; +package tech.pegasys.pantheon.ethereum.util; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RlpUtils; -import net.consensys.pantheon.util.bytes.BytesValue; +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.ethereum.rlp.RlpUtils; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/AbstractCallOperation.java index 77a4103c37..d18393c2f9 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/AbstractCallOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/AbstractCallOperation.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.vm; - -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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; /** * 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/tech/pegasys/pantheon/ethereum/vm/AbstractOperation.java index 9ccabcefc4..0291c0cb48 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/AbstractOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/AbstractOperation.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/BlockHashLookup.java index d1f582371f..c72304a0b8 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/BlockHashLookup.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/BlockHashLookup.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.ProcessableBlockHeader; -import net.consensys.pantheon.ethereum.vm.operations.BlockHashOperation; +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 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/tech/pegasys/pantheon/ethereum/vm/Code.java index 4d450ff47b..50ce77eca7 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Code.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Code.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import net.consensys.pantheon.ethereum.vm.operations.JumpDestOperation; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.vm.operations.JumpDestOperation; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/DebugOperationTracer.java index 7cdd08c59f..ec1a28dcd3 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/DebugOperationTracer.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/DebugOperationTracer.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import static net.consensys.pantheon.util.uint.UInt256.U_32; +import static tech.pegasys.pantheon.util.uint.UInt256.U_32; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.debug.TraceFrame; -import net.consensys.pantheon.ethereum.debug.TraceOptions; -import net.consensys.pantheon.ethereum.vm.ehalt.ExceptionalHaltException; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.core.Gas; +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 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/tech/pegasys/pantheon/ethereum/vm/EVM.java index 7207bc1b6b..e931543fbb 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/EVM.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/EVM.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import static net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS; import static org.apache.logging.log4j.LogManager.getLogger; +import static tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.MessageFrame.State; -import net.consensys.pantheon.ethereum.vm.ehalt.ExceptionalHaltException; -import net.consensys.pantheon.ethereum.vm.ehalt.ExceptionalHaltManager; -import net.consensys.pantheon.util.bytes.BytesValue; +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 java.util.EnumSet; import java.util.Optional; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ExceptionalHaltReason.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ExceptionalHaltReason.java index 991c3a7a24..4825bd1857 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ExceptionalHaltReason.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ExceptionalHaltReason.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/GasCalculator.java index 0bfddf5016..830927bd9b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/GasCalculator.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/GasCalculator.java @@ -1,30 +1,30 @@ -package net.consensys.pantheon.ethereum.vm; - -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.mainnet.AbstractMessageProcessor; -import net.consensys.pantheon.ethereum.mainnet.precompiles.ECRECPrecompiledContract; -import net.consensys.pantheon.ethereum.mainnet.precompiles.IDPrecompiledContract; -import net.consensys.pantheon.ethereum.mainnet.precompiles.RIPEMD160PrecompiledContract; -import net.consensys.pantheon.ethereum.mainnet.precompiles.SHA256PrecompiledContract; -import net.consensys.pantheon.ethereum.vm.operations.BalanceOperation; -import net.consensys.pantheon.ethereum.vm.operations.BlockHashOperation; -import net.consensys.pantheon.ethereum.vm.operations.ExpOperation; -import net.consensys.pantheon.ethereum.vm.operations.ExtCodeCopyOperation; -import net.consensys.pantheon.ethereum.vm.operations.ExtCodeHashOperation; -import net.consensys.pantheon.ethereum.vm.operations.ExtCodeSizeOperation; -import net.consensys.pantheon.ethereum.vm.operations.JumpDestOperation; -import net.consensys.pantheon.ethereum.vm.operations.LogOperation; -import net.consensys.pantheon.ethereum.vm.operations.MLoadOperation; -import net.consensys.pantheon.ethereum.vm.operations.MStore8Operation; -import net.consensys.pantheon.ethereum.vm.operations.MStoreOperation; -import net.consensys.pantheon.ethereum.vm.operations.SLoadOperation; -import net.consensys.pantheon.ethereum.vm.operations.SelfDestructOperation; -import net.consensys.pantheon.ethereum.vm.operations.Sha3Operation; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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; import java.util.function.Supplier; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Memory.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Memory.java index e3724eabe7..c5ca11a5ce 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Memory.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Memory.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.vm; - -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; -import net.consensys.pantheon.util.bytes.MutableBytes32; -import net.consensys.pantheon.util.bytes.MutableBytesValue; -import net.consensys.pantheon.util.uint.UInt256; -import net.consensys.pantheon.util.uint.UInt256Value; -import net.consensys.pantheon.util.uint.UInt256s; +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; 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/tech/pegasys/pantheon/ethereum/vm/MessageFrame.java index c1957e0041..a3d81347c0 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/MessageFrame.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/MessageFrame.java @@ -1,21 +1,21 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; import static com.google.common.base.Preconditions.checkState; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Log; -import net.consensys.pantheon.ethereum.core.LogSeries; -import net.consensys.pantheon.ethereum.core.ProcessableBlockHeader; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.mainnet.AbstractMessageProcessor; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; -import net.consensys.pantheon.util.uint.UInt256Value; +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 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/tech/pegasys/pantheon/ethereum/vm/OperandStack.java index 07f25596b9..39baecc617 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperandStack.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperandStack.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/Operation.java index 612cfcdf41..c948124687 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Operation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Operation.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.ehalt.ExceptionalHaltPredicate; +import tech.pegasys.pantheon.ethereum.core.Gas; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/OperationRegistry.java index fd2d05fd4c..fc23cb332c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperationRegistry.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperationRegistry.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; /** Encapsulates a group of {@link Operation}s used together. */ public class OperationRegistry { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperationTracer.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperationTracer.java index 770442b67a..2919f7701d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperationTracer.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/OperationTracer.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.ehalt.ExceptionalHaltException; +import tech.pegasys.pantheon.ethereum.core.Gas; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/PreAllocatedOperandStack.java index 0960a27073..32cf5cdfec 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/PreAllocatedOperandStack.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/PreAllocatedOperandStack.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import net.consensys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/Words.java index c3c67d2468..1273fabb83 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Words.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/Words.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytes32; +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; /** 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/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltException.java index 93f1831e21..bbb073b6c0 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltException.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltException.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.vm.ehalt; +package tech.pegasys.pantheon.ethereum.vm.ehalt; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltManager.java index 2f1e66499d..83e34c56f9 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltManager.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltManager.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.vm.ehalt; +package tech.pegasys.pantheon.ethereum.vm.ehalt; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.ethereum.vm.MessageFrame; +import tech.pegasys.pantheon.ethereum.vm.EVM; +import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltPredicate.java index f824b68a29..10a93aa09a 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltPredicate.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/ExceptionalHaltPredicate.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.vm.ehalt; +package tech.pegasys.pantheon.ethereum.vm.ehalt; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.ethereum.vm.MessageFrame; +import tech.pegasys.pantheon.ethereum.vm.EVM; +import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/ehalt/InsufficientGasExceptionalHaltPredicate.java index 2e9f1b9950..c773216d54 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/InsufficientGasExceptionalHaltPredicate.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/InsufficientGasExceptionalHaltPredicate.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.vm.ehalt; +package tech.pegasys.pantheon.ethereum.vm.ehalt; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.ethereum.vm.MessageFrame; +import tech.pegasys.pantheon.ethereum.vm.EVM; +import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/ehalt/InvalidOperationExceptionalHaltPredicate.java index fdc389f986..661e254521 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/InvalidOperationExceptionalHaltPredicate.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/InvalidOperationExceptionalHaltPredicate.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.vm.ehalt; +package tech.pegasys.pantheon.ethereum.vm.ehalt; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.ethereum.vm.MessageFrame; +import tech.pegasys.pantheon.ethereum.vm.EVM; +import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/ehalt/StackOverflowExceptionalHaltPredicate.java index cf6adea387..d94d6b1114 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/StackOverflowExceptionalHaltPredicate.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/StackOverflowExceptionalHaltPredicate.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.vm.ehalt; +package tech.pegasys.pantheon.ethereum.vm.ehalt; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Operation; +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 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/tech/pegasys/pantheon/ethereum/vm/ehalt/StackUnderflowExceptionalHaltPredicate.java index ea8b174a49..eded81ff1b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/StackUnderflowExceptionalHaltPredicate.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/ehalt/StackUnderflowExceptionalHaltPredicate.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.vm.ehalt; +package tech.pegasys.pantheon.ethereum.vm.ehalt; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Operation; +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 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/tech/pegasys/pantheon/ethereum/vm/operations/AbstractCreateOperation.java index e80c6af792..b6caa0db09 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AbstractCreateOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AbstractCreateOperation.java @@ -1,19 +1,19 @@ -package net.consensys.pantheon.ethereum.vm.operations; - -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.MutableAccount; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.Code; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Words; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/AddModOperation.java index a17e1cb939..6e6ffb5fde 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AddModOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AddModOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/AddOperation.java index 38a5e1ea73..4539d64ebc 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AddOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AddOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/AddressOperation.java index 462ead9466..f1b3733e96 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AddressOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AddressOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Words; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/AndOperation.java index e72ad827fa..3566c0ff2d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AndOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/AndOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/BalanceOperation.java index 74c81796ca..861dbbd0ea 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/BalanceOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/BalanceOperation.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Words; -import net.consensys.pantheon.util.bytes.Bytes32; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/BlockHashOperation.java index 60fc240899..b92f1d176a 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/BlockHashOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/BlockHashOperation.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.vm.operations; - -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.ProcessableBlockHeader; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.BlockHashLookup; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +package tech.pegasys.pantheon.ethereum.vm.operations; + +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/ByteOperation.java index a7089c065f..448331ad25 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ByteOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ByteOperation.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.vm.operations; - -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.Counter; -import net.consensys.pantheon.util.uint.UInt256; -import net.consensys.pantheon.util.uint.UInt256Value; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/CallCodeOperation.java index 9da93a6672..6d84836271 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallCodeOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallCodeOperation.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.vm.operations; - -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.vm.AbstractCallOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Words; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/CallDataCopyOperation.java index cc6c510bb0..581870eab2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallDataCopyOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallDataCopyOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; - -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/CallDataLoadOperation.java index 032d5a717a..3a694a83b1 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallDataLoadOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallDataLoadOperation.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytes32; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/CallDataSizeOperation.java index d12b000bd6..5c9fc1fd00 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallDataSizeOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallDataSizeOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256Bytes; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/CallOperation.java index 5222a84df7..d7c284baa1 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallOperation.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.vm.operations; - -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.vm.AbstractCallOperation; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Words; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/CallValueOperation.java index aadddaebf0..8e66beaa2d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallValueOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallValueOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/CallerOperation.java index b549caf3e8..a155d0196e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallerOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CallerOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Words; +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; public class CallerOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CodeCopyOperation.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CodeCopyOperation.java index 80a14b8b1f..8a9401b280 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CodeCopyOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CodeCopyOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; - -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.Code; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/CodeSizeOperation.java index e4b7c6b4aa..7f3bc35ff5 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CodeSizeOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CodeSizeOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.Code; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256Bytes; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/CoinbaseOperation.java index ecdee3c09e..58e46b1b95 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CoinbaseOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CoinbaseOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Words; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/Create2Operation.java index 935d11c699..ee8c7b5dad 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/Create2Operation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/Create2Operation.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/CreateOperation.java index 868088a041..7efd2a3550 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CreateOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/CreateOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/DelegateCallOperation.java index 2992e0fc3e..7226751e04 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DelegateCallOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DelegateCallOperation.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.vm.operations; - -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.vm.AbstractCallOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Words; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/DifficultyOperation.java index dfa415f29a..339628e02b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DifficultyOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DifficultyOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/DivOperation.java index ccbe065512..be9b020ba7 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DivOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DivOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/DupOperation.java index 3a92f026b8..86c50500cc 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DupOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/DupOperation.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/EqOperation.java index 4d0c99f1e0..132431dc22 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/EqOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/EqOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/ExpOperation.java index 77aa872a49..34028c7854 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExpOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExpOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeCopyOperation.java index 25383b6889..2904e3ddf1 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeCopyOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeCopyOperation.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.vm.operations; - -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Words; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeHashOperation.java index 5b71850a7c..da0b8f0855 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeHashOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeHashOperation.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Words; -import net.consensys.pantheon.util.bytes.Bytes32; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeSizeOperation.java index 4c433fdee8..2291a0bcf1 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeSizeOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeSizeOperation.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Words; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256Bytes; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/GasLimitOperation.java index d0707a6051..655a2e5e89 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GasLimitOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GasLimitOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/GasOperation.java index 0851cd3c51..968b2f7b67 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GasOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GasOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/GasPriceOperation.java index 81f1093a1d..e72fa2c71c 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GasPriceOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GasPriceOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/GtOperation.java index 6462dbada4..ac24386a62 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GtOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/GtOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/InvalidOperation.java index fd7e89363d..93af5d5cb4 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/InvalidOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/InvalidOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/IsZeroOperation.java index 0d04750e5a..fae1f11faa 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/IsZeroOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/IsZeroOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/JumpDestOperation.java index 6d54450a3b..db01ced459 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/JumpDestOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/JumpDestOperation.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/JumpOperation.java index 487938d09f..76975cfd80 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/JumpOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/JumpOperation.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.vm.operations; - -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.Code; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/JumpiOperation.java index 5330885c90..1d88bb8456 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/JumpiOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/JumpiOperation.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.vm.operations; - -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.Code; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +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.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/operations/LogOperation.java index af1f22a6db..9cc4821ebe 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/LogOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/LogOperation.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.vm.operations; - -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Log; -import net.consensys.pantheon.ethereum.core.LogTopic; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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.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 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/tech/pegasys/pantheon/ethereum/vm/operations/LtOperation.java index 2424a9a4c6..bcfb48892d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/LtOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/LtOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/MLoadOperation.java index 4bd02499f6..299e36cae5 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MLoadOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MLoadOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; - -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/MSizeOperation.java index 5195b6a3ec..77e8cc6889 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MSizeOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MSizeOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256Bytes; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/MStore8Operation.java index 2c68824917..a3c33501bc 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MStore8Operation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MStore8Operation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/MStoreOperation.java index baa1dba8d9..eb8ebc9827 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MStoreOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MStoreOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/ModOperation.java index a8a373fee6..701a00d6d8 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ModOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ModOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/MulModOperation.java index 6db1377f25..31f9819b3b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MulModOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MulModOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/MulOperation.java index 77c5e4a6fa..d24018862a 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MulOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/MulOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/NotOperation.java index 402e3d5ee2..8715372fa2 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/NotOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/NotOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/NumberOperation.java index 3d81ae5edb..b812edc031 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/NumberOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/NumberOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256Bytes; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/OrOperation.java index 3ba61125d7..8512fd9277 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/OrOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/OrOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/OriginOperation.java index e6e723bd38..8096c64a68 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/OriginOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/OriginOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Words; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/PCOperation.java index 7b0eb2f5ed..eaae9ddf18 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/PCOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/PCOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256Bytes; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/PopOperation.java index d080e99226..5b237c434b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/PopOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/PopOperation.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/PushOperation.java index bd26bb3ab5..35e9e4380e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/PushOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/PushOperation.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; import static java.lang.Math.min; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytes32; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/ReturnDataCopyOperation.java index 051f2c9f76..d2fe6d2601 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ReturnDataCopyOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ReturnDataCopyOperation.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.vm.operations; - -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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.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 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/tech/pegasys/pantheon/ethereum/vm/operations/ReturnDataSizeOperation.java index f6cc6e0124..68201ee68e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ReturnDataSizeOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ReturnDataSizeOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256Bytes; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/ReturnOperation.java index d6e502acf6..92c608a6b7 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ReturnOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ReturnOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/RevertOperation.java index b9098e0792..ebdc0910a7 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/RevertOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/RevertOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/SDivOperation.java index 37d1cc852b..a3c1fdb128 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SDivOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SDivOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.Int256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/SGtOperation.java index abd4cc0c74..a5b2c89ab4 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SGtOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SGtOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.Int256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/SLoadOperation.java index 4d57c96fbd..9c486da96b 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SLoadOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SLoadOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/SLtOperation.java index 240bcdf7e8..e6b3c7b478 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SLtOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SLtOperation.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.Int256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/SModOperation.java index d41855be0e..c226e8a578 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SModOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SModOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.Int256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/SStoreOperation.java index 1425e43e84..c713f0c1af 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SStoreOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SStoreOperation.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.MutableAccount; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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 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/tech/pegasys/pantheon/ethereum/vm/operations/SarOperation.java index e882ba1a4f..0364375f98 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SarOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SarOperation.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import static net.consensys.pantheon.util.uint.UInt256s.greaterThanOrEqualTo256; +import static tech.pegasys.pantheon.util.uint.UInt256s.greaterThanOrEqualTo256; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.Bytes32s; -import net.consensys.pantheon.util.uint.UInt256; +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; public class SarOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SelfDestructOperation.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SelfDestructOperation.java index 99f62ef6cb..f78c53b6ec 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SelfDestructOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SelfDestructOperation.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.vm.operations; - -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.MutableAccount; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.EVM; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Words; +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.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 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/tech/pegasys/pantheon/ethereum/vm/operations/Sha3Operation.java index cac05f28a2..e08d79969e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/Sha3Operation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/Sha3Operation.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/ShlOperation.java index 58ca3d1248..3eebd46a92 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ShlOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ShlOperation.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import static net.consensys.pantheon.util.uint.UInt256s.greaterThanOrEqualTo256; +import static tech.pegasys.pantheon.util.uint.UInt256s.greaterThanOrEqualTo256; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.Bytes32s; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/ShrOperation.java index 46ea129ec9..ff18dee35e 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ShrOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/ShrOperation.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import static net.consensys.pantheon.util.uint.UInt256s.greaterThanOrEqualTo256; +import static tech.pegasys.pantheon.util.uint.UInt256s.greaterThanOrEqualTo256; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.Bytes32s; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/SignExtendOperation.java index 5666b257d9..efacf34459 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SignExtendOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SignExtendOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/StaticCallOperation.java index 9fdb4b9525..4b042b7686 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/StaticCallOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/StaticCallOperation.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.vm.operations; - -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.vm.AbstractCallOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.Words; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/StopOperation.java index 9f08a89ed3..91d6ab4d94 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/StopOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/StopOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.BytesValue; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/SubOperation.java index 97f6a99514..364e6139a6 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SubOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SubOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/SwapOperation.java index a05d7a6547..b0dd2f4e4f 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SwapOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/SwapOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/TimestampOperation.java index 34cb4d563f..346b822160 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/TimestampOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/TimestampOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256Bytes; +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; 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/tech/pegasys/pantheon/ethereum/vm/operations/XorOperation.java index 8b225bbc23..7496c10dbf 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/XorOperation.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/vm/operations/XorOperation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.vm.AbstractOperation; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.uint.UInt256; +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; public class XorOperation extends AbstractOperation { diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/DebuggableMutableWorldState.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/DebuggableMutableWorldState.java index d4814ce651..ce8c69f587 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/DebuggableMutableWorldState.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/DebuggableMutableWorldState.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.worldstate; - -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.MutableAccount; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldState; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; +package tech.pegasys.pantheon.ethereum.worldstate; + +import tech.pegasys.pantheon.ethereum.core.Account; +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.WorldState; +import tech.pegasys.pantheon.ethereum.core.WorldUpdater; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; import java.util.Collection; import java.util.HashSet; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutableWorldState.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutableWorldState.java index 31f0da02cb..8ff7b0b655 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutableWorldState.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutableWorldState.java @@ -1,21 +1,21 @@ -package net.consensys.pantheon.ethereum.worldstate; - -import net.consensys.pantheon.ethereum.core.AbstractWorldUpdater; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldState; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.rlp.RLPException; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.trie.MerklePatriciaTrie; -import net.consensys.pantheon.ethereum.trie.StoredMerklePatriciaTrie; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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.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; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/KeyValueStorageWorldStateStorage.java b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/KeyValueStorageWorldStateStorage.java index b42ce4dd42..9d1cab2525 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/KeyValueStorageWorldStateStorage.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/KeyValueStorageWorldStateStorage.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.worldstate; +package tech.pegasys.pantheon.ethereum.worldstate; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; 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/tech/pegasys/pantheon/ethereum/worldstate/WorldStateStorage.java index 3c7da3b40c..10b6515f6d 100644 --- a/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/WorldStateStorage.java +++ b/ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/worldstate/WorldStateStorage.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.worldstate; +package tech.pegasys.pantheon.ethereum.worldstate; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; 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/tech/pegasys/pantheon/ethereum/core/AddressHelpers.java index 7ca617de20..0cfb667d16 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/AddressHelpers.java +++ b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/AddressHelpers.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; import java.math.BigInteger; diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderTestFixture.java b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderTestFixture.java index 8f7933c418..cc8a01a530 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderTestFixture.java +++ b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderTestFixture.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/BlockSyncTestUtils.java index bf294ef110..e9cb6af215 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockSyncTestUtils.java +++ b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/BlockSyncTestUtils.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.util.RawBlockIterator; -import net.consensys.pantheon.testutil.BlockTestUtil; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.util.RawBlockIterator; +import tech.pegasys.pantheon.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/ExecutionContextTestFixture.java b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/ExecutionContextTestFixture.java index a99cac7b8d..b823a61f62 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/ExecutionContextTestFixture.java +++ b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/ExecutionContextTestFixture.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.core; - -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.worldstate.DefaultMutableWorldState; -import net.consensys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; +package tech.pegasys.pantheon.ethereum.core; + +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.worldstate.DefaultMutableWorldState; +import tech.pegasys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; public class ExecutionContextTestFixture { diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/HeaderDecodingHelpers.java b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/HeaderDecodingHelpers.java index f575c02bdc..e2d4964bc2 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/HeaderDecodingHelpers.java +++ b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/HeaderDecodingHelpers.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.Map; diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/InMemoryWorldState.java b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/InMemoryWorldState.java index 95eb26ed2d..55ada1e18f 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/InMemoryWorldState.java +++ b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/InMemoryWorldState.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; public class InMemoryWorldState { diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/MiningParametersTestBuilder.java b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/MiningParametersTestBuilder.java index f6b1c7f25b..c117a33ee0 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/MiningParametersTestBuilder.java +++ b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/MiningParametersTestBuilder.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.ethereum.blockcreation.MiningParameters; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.blockcreation.MiningParameters; +import tech.pegasys.pantheon.util.bytes.BytesValue; public class MiningParametersTestBuilder { diff --git a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/TestCodeExecutor.java b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/TestCodeExecutor.java index 5236623129..28cc016ed7 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/TestCodeExecutor.java +++ b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/TestCodeExecutor.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.mainnet.MainnetMessageCallProcessor; -import net.consensys.pantheon.ethereum.mainnet.PrecompileContractRegistry; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.vm.BlockHashLookup; -import net.consensys.pantheon.ethereum.vm.Code; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.MessageFrame.Type; -import net.consensys.pantheon.ethereum.vm.OperationTracer; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.crypto.SECP256K1.Signature; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +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.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.ethereum.vm.OperationTracer; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/TransactionTestFixture.java index e0a7b6a204..720fd282a0 100644 --- a/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/TransactionTestFixture.java +++ b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/TransactionTestFixture.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockMinerTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockMinerTest.java index c321825e12..45e9814571 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockMinerTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockMinerTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; @@ -7,18 +7,18 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator.MinedBlockObserver; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.BlockImporter; -import net.consensys.pantheon.ethereum.mainnet.EthHashBlockCreator; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; -import net.consensys.pantheon.ethereum.mainnet.MutableProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.util.Subscribers; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator.MinedBlockObserver; +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.BlockImporter; +import tech.pegasys.pantheon.ethereum.mainnet.EthHashBlockCreator; +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 com.google.common.collect.Lists; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelectorTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelectorTest.java index d2cfe8bacf..3a5804101e 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelectorTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/BlockTransactionSelectorTest.java @@ -1,40 +1,40 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; -import static net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.NONCE_TOO_LOW; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.AddressHelpers; -import net.consensys.pantheon.ethereum.core.BlockHeaderBuilder; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.LogSeries; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.core.ProcessableBlockHeader; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.core.TransactionTestFixture; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldState; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.development.DevelopmentProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.MainnetTransactionProcessor; -import net.consensys.pantheon.ethereum.mainnet.MainnetTransactionProcessor.Result; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor; -import net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import net.consensys.pantheon.ethereum.mainnet.ValidationResult; -import net.consensys.pantheon.ethereum.vm.TestBlockchain; -import net.consensys.pantheon.ethereum.worldstate.DefaultMutableWorldState; -import net.consensys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.NONCE_TOO_LOW; + +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.PendingTransactions; +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.development.DevelopmentProtocolSchedule; +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.ethereum.worldstate.DefaultMutableWorldState; +import tech.pegasys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.time.Instant; import java.util.List; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/DefaultBlockSchedulerTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/DefaultBlockSchedulerTest.java index 16618c1511..8c290ee3d6 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/DefaultBlockSchedulerTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/DefaultBlockSchedulerTest.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.blockcreation.AbstractBlockScheduler.BlockCreationTimeResult; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.util.time.Clock; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractBlockScheduler.BlockCreationTimeResult; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; +import tech.pegasys.pantheon.util.time.Clock; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutorTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutorTest.java index f1b2125e21..2aa6dbe49e 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutorTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMinerExecutorTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import net.consensys.pantheon.ethereum.core.MiningParametersTestBuilder; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.util.Subscribers; -import net.consensys.pantheon.util.time.SystemClock; +import tech.pegasys.pantheon.ethereum.core.MiningParametersTestBuilder; +import tech.pegasys.pantheon.ethereum.core.PendingTransactions; +import tech.pegasys.pantheon.util.Subscribers; +import tech.pegasys.pantheon.util.time.SystemClock; import java.util.concurrent.Executors; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMiningCoordinatorTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMiningCoordinatorTest.java index 6e617ae6ab..891efdc2c5 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMiningCoordinatorTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/EthHashMiningCoordinatorTest.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.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 net.consensys.pantheon.ethereum.core.ExecutionContextTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.mainnet.EthHashSolution; -import net.consensys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.ethereum.core.ExecutionContextTestFixture; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolution; +import tech.pegasys.pantheon.util.bytes.Bytes32; import java.util.Optional; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/IncrementingNonceGeneratorTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/IncrementingNonceGeneratorTest.java index c114600d80..b54ba2b5c3 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/IncrementingNonceGeneratorTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/blockcreation/IncrementingNonceGeneratorTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.blockcreation; +package tech.pegasys.pantheon.ethereum.blockcreation; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/chain/GenesisConfigTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/chain/GenesisConfigTest.java index 0f1fae11e5..74f432fb45 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/chain/GenesisConfigTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/chain/GenesisConfigTest.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.chain; +package tech.pegasys.pantheon.ethereum.chain; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.worldstate.DefaultMutableWorldState; -import net.consensys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.util.bytes.BytesValue; +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.mainnet.MainnetProtocolSchedule; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; +import tech.pegasys.pantheon.ethereum.worldstate.DefaultMutableWorldState; +import tech.pegasys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.util.bytes.BytesValue; import com.google.common.base.Charsets; import com.google.common.io.Resources; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/AccountTransactionOrderTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/AccountTransactionOrderTest.java index 05defd9c74..38caf21a00 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/AccountTransactionOrderTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/AccountTransactionOrderTest.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/BlockHeaderMock.java index c87ded983a..a1ce7fd8e9 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderMock.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/BlockHeaderMock.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.vm.TestBlockchain; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.vm.TestBlockchain; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/HashTest.java index adecb1341c..daa4b6701d 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/HashTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/HashTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/LogTest.java index b3e14a0bae..4658dd84aa 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/LogTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/LogTest.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; import static org.junit.Assert.assertEquals; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.ethereum.rlp.RLP; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; 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/tech/pegasys/pantheon/ethereum/core/LogsBloomFilterTest.java index d455c33484..934bd59b0e 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/LogsBloomFilterTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/LogsBloomFilterTest.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; import static org.junit.Assert.assertEquals; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/core/LogsBloomFilterTestCaseSpec.java index 5498dfd484..0bf33e8968 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/LogsBloomFilterTestCaseSpec.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/LogsBloomFilterTestCaseSpec.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.ethereum.vm.LogMock; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.vm.LogMock; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.List; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/PendingTransactionsTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/PendingTransactionsTest.java index 5408508a7e..5ff1147c20 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/PendingTransactionsTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/PendingTransactionsTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; 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.verifyZeroInteractions; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.core.PendingTransactions.TransactionSelectionResult; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.ethereum.core.PendingTransactions.TransactionSelectionResult; import java.util.ArrayList; 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/tech/pegasys/pantheon/ethereum/core/TransactionIntegrationTest.java index 3a9380871d..a35e374e79 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionIntegrationTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionIntegrationTest.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.BytesValue; +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.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionPoolTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionPoolTest.java index cc4dd172c6..c358e5fe92 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionPoolTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionPoolTest.java @@ -1,14 +1,10 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.Collections.singleton; import static java.util.Collections.singletonList; import static java.util.stream.Collectors.toList; -import static net.consensys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; -import static net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.EXCEEDS_BLOCK_GAS_LIMIT; -import static net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.NONCE_TOO_LOW; -import static net.consensys.pantheon.ethereum.mainnet.ValidationResult.valid; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; @@ -20,22 +16,26 @@ 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 net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.TransactionPool.TransactionBatchAddedListener; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.mainnet.TransactionValidator; -import net.consensys.pantheon.ethereum.mainnet.ValidationResult; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.uint.UInt256; +import static tech.pegasys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; +import static tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.EXCEEDS_BLOCK_GAS_LIMIT; +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.GenesisConfig; +import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; +import tech.pegasys.pantheon.ethereum.core.TransactionPool.TransactionBatchAddedListener; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +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.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.List; import java.util.OptionalLong; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionReceiptTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionReceiptTest.java index 68f07c9da4..f40b4f87b1 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionReceiptTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionReceiptTest.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; import static org.junit.Assert.assertEquals; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.ethereum.rlp.RLP; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; 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/tech/pegasys/pantheon/ethereum/core/TransactionTest.java index 8f3574d9ab..2994b81cd4 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.ethereum.mainnet.TransactionValidator; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.vm.ReferenceTestProtocolSchedules; -import net.consensys.pantheon.testutil.JsonTestParameters; -import net.consensys.pantheon.util.bytes.BytesValue; +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 java.util.Collection; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionTestCaseSpec.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionTestCaseSpec.java index 513c4b9888..328ffb6d01 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionTestCaseSpec.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/core/TransactionTestCaseSpec.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.HashMap; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/db/DefaultMutableBlockchainTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/db/DefaultMutableBlockchainTest.java index dd96899e1a..09367eac3e 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/db/DefaultMutableBlockchainTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/db/DefaultMutableBlockchainTest.java @@ -1,20 +1,20 @@ -package net.consensys.pantheon.ethereum.db; +package tech.pegasys.pantheon.ethereum.db; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator.BlockOptions; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.uint.UInt256; +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.core.Transaction; +import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator.BlockOptions; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/development/DevelopmentProtocolScheduleTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/development/DevelopmentProtocolScheduleTest.java index 155e9f5894..bf65ef2a0b 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/development/DevelopmentProtocolScheduleTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/development/DevelopmentProtocolScheduleTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.development; +package tech.pegasys.pantheon.ethereum.development; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; import io.vertx.core.json.JsonObject; 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/tech/pegasys/pantheon/ethereum/mainnet/BlockHeaderValidatorTest.java index 1a8e0667eb..d300bbe3ed 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/BlockHeaderValidatorTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/BlockHeaderValidatorTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -10,11 +10,11 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.BlockHeaderValidator.Builder; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; +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.mainnet.BlockHeaderValidator.Builder; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; 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/tech/pegasys/pantheon/ethereum/mainnet/BodyValidationTest.java index 02ac344c0a..f51359e4fb 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/BodyValidationTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/BodyValidationTest.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.ethereum.core.BlockBody; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.util.bytes.Bytes32; import java.io.IOException; import java.util.Arrays; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ConstantinopleSstoreGasTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ConstantinopleSstoreGasTest.java index 90a65bd28c..1fba9bb04a 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ConstantinopleSstoreGasTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ConstantinopleSstoreGasTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import static net.consensys.pantheon.util.uint.UInt256.ONE; -import static net.consensys.pantheon.util.uint.UInt256.ZERO; import static org.assertj.core.api.Assertions.assertThat; +import static tech.pegasys.pantheon.util.uint.UInt256.ONE; +import static tech.pegasys.pantheon.util.uint.UInt256.ZERO; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.core.Gas; +import tech.pegasys.pantheon.util.uint.UInt256; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashBlockCreatorTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashBlockCreatorTest.java index c0503cdff1..21c1d9f3e3 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashBlockCreatorTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashBlockCreatorTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.mainnet; - -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.ExecutionContextTestFixture; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.util.bytes.BytesValue; +package tech.pegasys.pantheon.ethereum.mainnet; + +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.Block; +import tech.pegasys.pantheon.ethereum.core.ExecutionContextTestFixture; +import tech.pegasys.pantheon.ethereum.core.PendingTransactions; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.io.IOException; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolverTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolverTest.java index 079af06add..265cbd1d1a 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolverTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashSolverTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -6,9 +6,9 @@ import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.mainnet.EthHashSolver.EthHashSolverJob; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.mainnet.EthHashSolver.EthHashSolverJob; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.Arrays; import java.util.List; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashTest.java index 7962078ab4..b9c491b16f 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHashTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +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 java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHasherTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHasherTest.java index 6cd88fb134..3be77b5bc5 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHasherTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/EthHasherTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.util.ByteArrayUtil; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.ethereum.util.ByteArrayUtil; +import tech.pegasys.pantheon.util.bytes.BytesValue; import com.google.common.io.Resources; import org.assertj.core.api.Assertions; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderValidatorTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderValidatorTest.java index 16aaeae1fa..c6a6cf79d5 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderValidatorTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockHeaderValidatorTest.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import net.consensys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.ProtocolContext; import org.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockProcessorTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockProcessorTest.java index ccbc8f27e2..278c6029fa 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockProcessorTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetBlockProcessorTest.java @@ -1,19 +1,19 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.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 net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockProcessor.TransactionReceiptFactory; -import net.consensys.pantheon.ethereum.vm.TestBlockchain; -import net.consensys.pantheon.ethereum.vm.WorldStateMock; +import tech.pegasys.pantheon.ethereum.chain.Blockchain; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +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.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.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolScheduleTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolScheduleTest.java index 1baa9d1e24..5e25744176 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolScheduleTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetProtocolScheduleTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; import io.vertx.core.json.JsonObject; import org.assertj.core.api.Assertions; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionValidatorTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionValidatorTest.java index 42da41fbb1..6f6e7365d0 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionValidatorTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/MainnetTransactionValidatorTest.java @@ -1,22 +1,22 @@ -package net.consensys.pantheon.ethereum.mainnet; - -import static net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INCORRECT_NONCE; -import static net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.INTRINSIC_GAS_EXCEEDS_GAS_LIMIT; -import static net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.NONCE_TOO_LOW; -import static net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED; -import static net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.UPFRONT_COST_EXCEEDS_BALANCE; -import static net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason.WRONG_CHAIN_ID; +package tech.pegasys.pantheon.ethereum.mainnet; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionTestFixture; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.vm.GasCalculator; +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.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.Gas; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.core.TransactionTestFixture; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.ethereum.vm.GasCalculator; import java.util.OptionalLong; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolScheduleTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolScheduleTest.java index f3d4f705a0..9104525e8d 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolScheduleTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ProtocolScheduleTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.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/ValidationResultTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationResultTest.java index 0a62077f5f..1c5c52f473 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationResultTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationResultTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/ValidationTestUtils.java index 9d754e8773..4e5619cffe 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationTestUtils.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/ValidationTestUtils.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.mainnet; +package tech.pegasys.pantheon.ethereum.mainnet; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.BytesValue; +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 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/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/AncestryValidationRuleTest.java index 1f7f912446..52a4ffdb2b 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/AncestryValidationRuleTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/AncestryValidationRuleTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.mainnet.headervalidationrules; +package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRuleTest.java index ea578e09ad..33282688f5 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRuleTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRuleTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.mainnet.headervalidationrules; +package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.util.uint.UInt256; +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.junit.Test; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRuleTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRuleTest.java index 50d89ad809..d8475ef26a 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRuleTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRuleTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.mainnet.headervalidationrules; +package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRuleTest.java index b77fb24955..97e1bb42ec 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRuleTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRuleTest.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.mainnet.headervalidationrules; +package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasUsageValidationRuleTest.java index 1a3c4c21ba..ef873b4cf7 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasUsageValidationRuleTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/GasUsageValidationRuleTest.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.mainnet.headervalidationrules; +package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.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/TimestampValidationRuleTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/TimestampValidationRuleTest.java index 42e7495080..51afdbc45c 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/TimestampValidationRuleTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/headervalidationrules/TimestampValidationRuleTest.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.mainnet.headervalidationrules; +package tech.pegasys.pantheon.ethereum.mainnet.headervalidationrules; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; import java.util.concurrent.TimeUnit; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/ECRECPrecompiledContractTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/ECRECPrecompiledContractTest.java index 33f878e5de..7fbd125e6c 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/ECRECPrecompiledContractTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/mainnet/precompiles/ECRECPrecompiledContractTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.mainnet.precompiles; +package tech.pegasys.pantheon.ethereum.mainnet.precompiles; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.mainnet.SpuriousDragonGasCalculator; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.mainnet.SpuriousDragonGasCalculator; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/testutil/BlockDataGenerator.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/testutil/BlockDataGenerator.java index 4accb2d5ab..bd44828030 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/testutil/BlockDataGenerator.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/testutil/BlockDataGenerator.java @@ -1,29 +1,29 @@ -package net.consensys.pantheon.ethereum.testutil; +package tech.pegasys.pantheon.ethereum.testutil; import static com.google.common.base.Preconditions.checkArgument; -import static net.consensys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; - -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderBuilder; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Log; -import net.consensys.pantheon.ethereum.core.LogsBloomFilter; -import net.consensys.pantheon.ethereum.core.MutableAccount; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.trie.MerklePatriciaTrie; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import static tech.pegasys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; + +import tech.pegasys.pantheon.crypto.SECP256K1; +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.Log; +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.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.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.trie.MerklePatriciaTrie; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.time.Instant; import java.time.temporal.ChronoUnit; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/util/BlockchainUtilTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/util/BlockchainUtilTest.java index d0aac78246..69c41adbc3 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/util/BlockchainUtilTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/util/BlockchainUtilTest.java @@ -1,24 +1,24 @@ -package net.consensys.pantheon.ethereum.util; +package tech.pegasys.pantheon.ethereum.util; import static org.assertj.core.api.Assertions.assertThat; import static sun.security.krb5.Confounder.bytes; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderBuilder; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.LogsBloomFilter; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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.TransactionReceipt; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.time.Instant; import java.time.temporal.ChronoUnit; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AbstractRetryingTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AbstractRetryingTest.java index 6fab230ae1..68995cf90f 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AbstractRetryingTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AbstractRetryingTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/AddressMock.java index a92388aacc..7935a2abaa 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AddressMock.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AddressMock.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import net.consensys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/AddressTest.java index 3151859e88..d40567433a 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AddressTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/AddressTest.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.util.bytes.BytesValue; import org.junit.Assert; 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/tech/pegasys/pantheon/ethereum/vm/BlockHashLookupTest.java index 16ffd2ab49..5eb6e1d2ca 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockHashLookupTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockHashLookupTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyLong; @@ -9,10 +9,10 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; +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 java.util.Optional; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestCaseSpec.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestCaseSpec.java index 394b8e9dcf..609210f1f4 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestCaseSpec.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestCaseSpec.java @@ -1,27 +1,27 @@ -package net.consensys.pantheon.ethereum.vm; - -import static net.consensys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; -import static net.consensys.pantheon.ethereum.vm.WorldStateMock.insertAccount; - -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.LogsBloomFilter; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +package tech.pegasys.pantheon.ethereum.vm; + +import static tech.pegasys.pantheon.ethereum.core.InMemoryWorldState.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.Hash; +import tech.pegasys.pantheon.ethereum.core.LogsBloomFilter; +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.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.Map; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestTools.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestTools.java index c2d61fb8d8..d5324b98bf 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestTools.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestTools.java @@ -1,18 +1,18 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockImporter; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.rlp.RLPException; -import net.consensys.pantheon.testutil.JsonTestParameters; +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 java.util.Arrays; import java.util.Collection; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/CodeMock.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/CodeMock.java index 4c97109988..b92f3a6091 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/CodeMock.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/CodeMock.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/DebugOperationTracerTest.java index 7f00b515e5..9c63685753 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/DebugOperationTracerTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/DebugOperationTracerTest.java @@ -1,28 +1,28 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import static net.consensys.pantheon.ethereum.core.AddressHelpers.calculateAddressWithRespectTo; -import static net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason.INSUFFICIENT_GAS; 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 net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.AddressHelpers; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.MutableAccount; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.debug.TraceFrame; -import net.consensys.pantheon.ethereum.debug.TraceOptions; -import net.consensys.pantheon.ethereum.vm.OperationTracer.ExecuteOperation; -import net.consensys.pantheon.ethereum.vm.ehalt.ExceptionalHaltException; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import static tech.pegasys.pantheon.ethereum.core.AddressHelpers.calculateAddressWithRespectTo; +import static tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason.INSUFFICIENT_GAS; + +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.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.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.ArrayDeque; import java.util.EnumSet; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/EnvironmentInformation.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/EnvironmentInformation.java index d2805532e3..faf8cae2e2 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/EnvironmentInformation.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/EnvironmentInformation.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.util.bytes.BytesValue; +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; 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/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTestTools.java index c79ac0bbce..50d532742c 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTestTools.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTestTools.java @@ -1,18 +1,18 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; import static org.junit.Assert.assertEquals; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.LogSeries; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.WorldState; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.worldstate.DebuggableMutableWorldState; -import net.consensys.pantheon.testutil.JsonTestParameters; +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.rlp.RLP; +import tech.pegasys.pantheon.ethereum.worldstate.DebuggableMutableWorldState; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/GeneralStateTestCaseEipSpec.java index b325f32793..edf1463422 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateTestCaseEipSpec.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateTestCaseEipSpec.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.WorldState; +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 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/tech/pegasys/pantheon/ethereum/vm/GeneralStateTestCaseSpec.java index 2118bad453..d87fc0bdc8 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateTestCaseSpec.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateTestCaseSpec.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderMock; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; +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 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/tech/pegasys/pantheon/ethereum/vm/LogMock.java index ca51b304db..9db7b6b929 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/LogMock.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/LogMock.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Log; -import net.consensys.pantheon.ethereum.core.LogTopic; -import net.consensys.pantheon.util.bytes.BytesValue; +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 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/tech/pegasys/pantheon/ethereum/vm/MemoryTest.java index ca84e9791f..4f100a41ae 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/MemoryTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/MemoryTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; -import net.consensys.pantheon.util.uint.UInt256; +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 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/tech/pegasys/pantheon/ethereum/vm/PreAllocatedOperandStackTest.java index c54a86ab0d..54f6856bbd 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/PreAllocatedOperandStackTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/PreAllocatedOperandStackTest.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/ReferenceTestProtocolSchedules.java index d04cdd773a..675ff20449 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/ReferenceTestProtocolSchedules.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/ReferenceTestProtocolSchedules.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSpecs; -import net.consensys.pantheon.ethereum.mainnet.MutableProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSpecs; +import tech.pegasys.pantheon.ethereum.mainnet.MutableProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; import java.util.Map; import java.util.function.Function; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/StateTestVersionedTransaction.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/StateTestVersionedTransaction.java index 213b432565..ab80b24952 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/StateTestVersionedTransaction.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/StateTestVersionedTransaction.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.crypto.SECP256K1.PrivateKey; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +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 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/tech/pegasys/pantheon/ethereum/vm/TestBlockchain.java index 181e262b9f..4c02a15c12 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/TestBlockchain.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/TestBlockchain.java @@ -1,19 +1,19 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; import static java.nio.charset.StandardCharsets.UTF_8; -import net.consensys.pantheon.ethereum.chain.BlockAddedObserver; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.chain.ChainHead; -import net.consensys.pantheon.ethereum.chain.TransactionLocation; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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 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/tech/pegasys/pantheon/ethereum/vm/VMReferenceTest.java index b6cecd9641..06d2df9a64 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/VMReferenceTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/VMReferenceTest.java @@ -1,18 +1,18 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import static net.consensys.pantheon.ethereum.vm.OperationTracer.NO_TRACING; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSpecs; -import net.consensys.pantheon.ethereum.mainnet.MutableProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.vm.ehalt.ExceptionalHaltException; -import net.consensys.pantheon.ethereum.worldstate.DefaultMutableWorldState; -import net.consensys.pantheon.testutil.JsonTestParameters; +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.mainnet.MainnetProtocolSpecs; +import tech.pegasys.pantheon.ethereum.mainnet.MutableProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; +import tech.pegasys.pantheon.ethereum.vm.ehalt.ExceptionalHaltException; +import tech.pegasys.pantheon.ethereum.worldstate.DefaultMutableWorldState; +import tech.pegasys.pantheon.testutil.JsonTestParameters; import java.util.ArrayDeque; import java.util.Collection; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/VMReferenceTestCaseSpec.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/VMReferenceTestCaseSpec.java index 0e65c07136..74f71dec70 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/VMReferenceTestCaseSpec.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/VMReferenceTestCaseSpec.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.vm; +package tech.pegasys.pantheon.ethereum.vm; -import net.consensys.pantheon.ethereum.core.BlockHeaderMock; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.WorldState; -import net.consensys.pantheon.util.bytes.BytesValue; +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 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/tech/pegasys/pantheon/ethereum/vm/WorldStateMock.java index 8ce7e81d39..17b492397b 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/WorldStateMock.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/WorldStateMock.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.vm; - -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.MutableAccount; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.worldstate.DebuggableMutableWorldState; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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.worldstate.DebuggableMutableWorldState; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.HashMap; import java.util.Map; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ConstantinopleSStoreOperationGasCostTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ConstantinopleSStoreOperationGasCostTest.java index 06ab70c4de..2c66255863 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ConstantinopleSStoreOperationGasCostTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ConstantinopleSStoreOperationGasCostTest.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.TestCodeExecutor; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.MessageFrame.State; -import net.consensys.pantheon.util.uint.UInt256; +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.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/tech/pegasys/pantheon/ethereum/vm/operations/Create2OperationTest.java index 927551e3ae..6d926121a2 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/Create2OperationTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/Create2OperationTest.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.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 net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.mainnet.ConstantinopleGasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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.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/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeHashOperationTest.java index 4771cb91ba..2bb86d58ac 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeHashOperationTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ExtCodeHashOperationTest.java @@ -1,29 +1,29 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.AddressHelpers; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.mainnet.ConstantinopleGasCalculator; -import net.consensys.pantheon.ethereum.vm.BlockHashLookup; -import net.consensys.pantheon.ethereum.vm.Code; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.ethereum.vm.MessageFrame.Type; -import net.consensys.pantheon.ethereum.vm.Words; -import net.consensys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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.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.Wei; +import tech.pegasys.pantheon.ethereum.core.WorldUpdater; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.mainnet.ConstantinopleGasCalculator; +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.ethereum.vm.Words; +import tech.pegasys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; +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 java.util.ArrayDeque; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/SarOperationTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/SarOperationTest.java index d023ed4f3e..bcb22e08c2 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/SarOperationTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/SarOperationTest.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.mainnet.SpuriousDragonGasCalculator; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; +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 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/tech/pegasys/pantheon/ethereum/vm/operations/ShlOperationTest.java index 31cba3712f..19ce35b58a 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ShlOperationTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ShlOperationTest.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.mainnet.SpuriousDragonGasCalculator; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; +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 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/tech/pegasys/pantheon/ethereum/vm/operations/ShrOperationTest.java index 67949ec0f1..5de03cc06a 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ShrOperationTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/ShrOperationTest.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.vm.operations; +package tech.pegasys.pantheon.ethereum.vm.operations; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.mainnet.SpuriousDragonGasCalculator; -import net.consensys.pantheon.ethereum.vm.GasCalculator; -import net.consensys.pantheon.ethereum.vm.MessageFrame; -import net.consensys.pantheon.util.bytes.Bytes32; +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 java.util.Arrays; diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutableWorldStateTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutableWorldStateTest.java index d6918cb0a2..cfe890e3d8 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutableWorldStateTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/worldstate/DefaultMutableWorldStateTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.worldstate; +package tech.pegasys.pantheon.ethereum.worldstate; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; @@ -6,19 +6,19 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.MutableAccount; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldState; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.trie.MerklePatriciaTrie; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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.WorldUpdater; +import tech.pegasys.pantheon.ethereum.trie.MerklePatriciaTrie; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.NavigableMap; import java.util.TreeMap; diff --git a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTest.java.template b/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTest.java.template index 6fc8382b60..bc84204435 100644 --- a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTest.java.template +++ b/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTest.java.template @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.vm.blockchain; +package tech.pegasys.pantheon.ethereum.vm.blockchain; -import static net.consensys.pantheon.ethereum.vm.BlockchainReferenceTestTools.executeTest; -import static net.consensys.pantheon.ethereum.vm.BlockchainReferenceTestTools.generateTestParametersForConfig; +import static tech.pegasys.pantheon.ethereum.vm.BlockchainReferenceTestTools.executeTest; +import static tech.pegasys.pantheon.ethereum.vm.BlockchainReferenceTestTools.generateTestParametersForConfig; -import net.consensys.pantheon.ethereum.vm.BlockchainReferenceTestCaseSpec; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTest.java.template index 3f6e36cc2a..fb17963801 100644 --- a/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTest.java.template +++ b/ethereum/core/src/test/resources/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTest.java.template @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.vm.generalstate; +package tech.pegasys.pantheon.ethereum.vm.generalstate; -import static net.consensys.pantheon.ethereum.vm.GeneralStateReferenceTestTools.executeTest; -import static net.consensys.pantheon.ethereum.vm.GeneralStateReferenceTestTools.generateTestParametersForConfig; +import static tech.pegasys.pantheon.ethereum.vm.GeneralStateReferenceTestTools.executeTest; +import static tech.pegasys.pantheon.ethereum.vm.GeneralStateReferenceTestTools.generateTestParametersForConfig; -import net.consensys.pantheon.ethereum.vm.GeneralStateTestCaseEipSpec; +import tech.pegasys.pantheon.ethereum.vm.GeneralStateTestCaseEipSpec; import java.util.Collection; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/EthProtocol.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/EthProtocol.java index 47e31404a7..d85523acc5 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/EthProtocol.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/EthProtocol.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.eth; +package tech.pegasys.pantheon.ethereum.eth; -import net.consensys.pantheon.ethereum.eth.messages.EthPV62; -import net.consensys.pantheon.ethereum.eth.messages.EthPV63; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; +import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; +import tech.pegasys.pantheon.ethereum.eth.messages.EthPV63; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; import java.util.ArrayList; import java.util.Arrays; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractEthTask.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractEthTask.java index dc46c38d70..0af3457eb1 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractEthTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractEthTask.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; import java.util.Collection; import java.util.concurrent.CancellationException; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractPeerRequestTask.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractPeerRequestTask.java index c83a1c6759..ac05c0fd70 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractPeerRequestTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractPeerRequestTask.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; -import net.consensys.pantheon.ethereum.eth.manager.RequestManager.ResponseStream; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.PeerBreachedProtocolException; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.ethereum.rlp.RLPException; -import net.consensys.pantheon.util.ExceptionUtils; +import tech.pegasys.pantheon.ethereum.eth.manager.RequestManager.ResponseStream; +import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.PeerBreachedProtocolException; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.rlp.RLPException; +import tech.pegasys.pantheon.util.ExceptionUtils; import java.util.Optional; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractPeerTask.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractPeerTask.java index 6ac2665cc4..ff620338a7 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractPeerTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractPeerTask.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; -import net.consensys.pantheon.ethereum.eth.manager.AbstractPeerTask.PeerTaskResult; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.NoAvailablePeersException; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.PeerDisconnectedException; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; +import tech.pegasys.pantheon.ethereum.eth.manager.AbstractPeerTask.PeerTaskResult; +import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.NoAvailablePeersException; +import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.PeerDisconnectedException; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; import java.util.Optional; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractRetryingPeerTask.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractRetryingPeerTask.java index 7bd0e007ce..ee8e7d1c52 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractRetryingPeerTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractRetryingPeerTask.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.NoAvailablePeersException; -import net.consensys.pantheon.ethereum.eth.sync.tasks.WaitForPeerTask; -import net.consensys.pantheon.util.ExceptionUtils; +import tech.pegasys.pantheon.ethereum.eth.manager.exceptions.NoAvailablePeersException; +import tech.pegasys.pantheon.ethereum.eth.sync.tasks.WaitForPeerTask; +import tech.pegasys.pantheon.util.ExceptionUtils; import java.time.Duration; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/ChainState.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/ChainState.java index 1f42fd18ca..9ca0b50aec 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/ChainState.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/ChainState.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/eth/manager/EthContext.java index 0c0ea4404c..27482a0550 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthContext.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthContext.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/eth/manager/EthMessage.java index 1a30101fd3..d23a4f8ee5 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthMessage.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthMessage.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.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/tech/pegasys/pantheon/ethereum/eth/manager/EthMessages.java index f5413a0fa6..a60a9d9d99 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthMessages.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthMessages.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; -import net.consensys.pantheon.util.Subscribers; +import tech.pegasys.pantheon.util.Subscribers; import java.util.Map; import java.util.Map.Entry; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeer.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeer.java index a892f95c74..8f73a2ed86 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeer.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeer.java @@ -1,21 +1,21 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.eth.manager.RequestManager.ResponseStream; -import net.consensys.pantheon.ethereum.eth.messages.EthPV62; -import net.consensys.pantheon.ethereum.eth.messages.EthPV63; -import net.consensys.pantheon.ethereum.eth.messages.GetBlockBodiesMessage; -import net.consensys.pantheon.ethereum.eth.messages.GetBlockHeadersMessage; -import net.consensys.pantheon.ethereum.eth.messages.GetReceiptsMessage; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.util.Subscribers; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.core.Hash; +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.GetReceiptsMessage; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.util.Subscribers; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeers.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeers.java index fd11c4d793..d73d0db126 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeers.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeers.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer.DisconnectCallback; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.util.Subscribers; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer.DisconnectCallback; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.util.Subscribers; import java.util.Collections; import java.util.Comparator; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManager.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManager.java index 5a7613e828..9e66e938dd 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManager.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManager.java @@ -1,24 +1,24 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator.MinedBlockObserver; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.eth.EthProtocol; -import net.consensys.pantheon.ethereum.eth.messages.EthPV62; -import net.consensys.pantheon.ethereum.eth.messages.NewBlockMessage; -import net.consensys.pantheon.ethereum.eth.messages.StatusMessage; -import net.consensys.pantheon.ethereum.p2p.api.Message; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; -import net.consensys.pantheon.ethereum.p2p.api.ProtocolManager; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.ethereum.rlp.RLPException; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator.MinedBlockObserver; +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.eth.EthProtocol; +import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; +import tech.pegasys.pantheon.ethereum.eth.messages.NewBlockMessage; +import tech.pegasys.pantheon.ethereum.eth.messages.StatusMessage; +import tech.pegasys.pantheon.ethereum.p2p.api.Message; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; +import tech.pegasys.pantheon.ethereum.p2p.api.ProtocolManager; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.rlp.RLPException; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.Arrays; import java.util.Collections; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthScheduler.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthScheduler.java index 7b2cc66308..08ed4f3a21 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthScheduler.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthScheduler.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; -import net.consensys.pantheon.util.ExceptionUtils; +import tech.pegasys.pantheon.util.ExceptionUtils; import java.time.Duration; import java.util.concurrent.CancellationException; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthServer.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthServer.java index 722ca18982..298f879b32 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthServer.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthServer.java @@ -1,25 +1,25 @@ -package net.consensys.pantheon.ethereum.eth.manager; - -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.eth.messages.BlockBodiesMessage; -import net.consensys.pantheon.ethereum.eth.messages.BlockHeadersMessage; -import net.consensys.pantheon.ethereum.eth.messages.EthPV62; -import net.consensys.pantheon.ethereum.eth.messages.EthPV63; -import net.consensys.pantheon.ethereum.eth.messages.GetBlockBodiesMessage; -import net.consensys.pantheon.ethereum.eth.messages.GetBlockHeadersMessage; -import net.consensys.pantheon.ethereum.eth.messages.GetNodeDataMessage; -import net.consensys.pantheon.ethereum.eth.messages.GetReceiptsMessage; -import net.consensys.pantheon.ethereum.eth.messages.NodeDataMessage; -import net.consensys.pantheon.ethereum.eth.messages.ReceiptsMessage; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.ethereum.rlp.RLPException; -import net.consensys.pantheon.util.bytes.BytesValue; +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.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.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.rlp.RLPException; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Arrays; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthTask.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthTask.java index 7eab5b014f..af192c79d1 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthTask.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/PeerReputation.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/PeerReputation.java index b1c916022e..006b8372ed 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/PeerReputation.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/PeerReputation.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; import static org.apache.logging.log4j.LogManager.getLogger; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.p2p.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/RequestManager.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/RequestManager.java index 25fa059d1a..41e0ceb96a 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/RequestManager.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/RequestManager.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/EthTaskException.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/EthTaskException.java index 934cdfc9ac..912ced6472 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/EthTaskException.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/EthTaskException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.manager.exceptions; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/IncompleteResultsException.java index 5eb04adf29..723438443e 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/IncompleteResultsException.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/IncompleteResultsException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.manager.exceptions; +package tech.pegasys.pantheon.ethereum.eth.manager.exceptions; public class IncompleteResultsException 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/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/NoAvailablePeersException.java index 37d062b760..72946404c4 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/NoAvailablePeersException.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/NoAvailablePeersException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.manager.exceptions; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/PeerBreachedProtocolException.java index 21074477ec..0ff6af43a2 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/PeerBreachedProtocolException.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/PeerBreachedProtocolException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.manager.exceptions; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/PeerDisconnectedException.java index 435f21da6f..1dc8cacddd 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/PeerDisconnectedException.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/exceptions/PeerDisconnectedException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.manager.exceptions; +package tech.pegasys.pantheon.ethereum.eth.manager.exceptions; public class PeerDisconnectedException extends EthTaskException { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockBodiesMessage.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockBodiesMessage.java index c662c53dd4..ddcc0e504e 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockBodiesMessage.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockBodiesMessage.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.eth.messages; - -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHashFunction; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.AbstractMessageData; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.util.bytes.BytesValue; +package tech.pegasys.pantheon.ethereum.eth.messages; + +import tech.pegasys.pantheon.ethereum.core.BlockBody; +import tech.pegasys.pantheon.ethereum.core.BlockHashFunction; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.AbstractMessageData; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; +import tech.pegasys.pantheon.util.bytes.BytesValue; import io.netty.buffer.ByteBuf; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockHeadersMessage.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockHeadersMessage.java index c4bd0bbaf6..96edc87f24 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockHeadersMessage.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockHeadersMessage.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; -import net.consensys.pantheon.ethereum.core.BlockHashFunction; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.AbstractMessageData; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.BlockHashFunction; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.AbstractMessageData; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Iterator; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/EthPV62.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/EthPV62.java index 90ea27f3b8..aa1f3b076d 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/EthPV62.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/EthPV62.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/eth/messages/EthPV63.java index 303fb01b84..bd189185fd 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/EthPV63.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/EthPV63.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockBodiesMessage.java index 77499878a0..c7e155eee0 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockBodiesMessage.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockBodiesMessage.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.AbstractMessageData; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.AbstractMessageData; +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 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/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockHeadersMessage.java index a8c8b2a9b1..dc9d5c3df9 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockHeadersMessage.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockHeadersMessage.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.eth.messages; - -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.AbstractMessageData; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RlpUtils; -import net.consensys.pantheon.util.bytes.Bytes32; +package tech.pegasys.pantheon.ethereum.eth.messages; + +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.AbstractMessageData; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; +import tech.pegasys.pantheon.ethereum.rlp.RlpUtils; +import tech.pegasys.pantheon.util.bytes.Bytes32; import java.nio.ByteBuffer; import java.util.Optional; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetNodeDataMessage.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetNodeDataMessage.java index bf4a44e3e1..72abdee00f 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetNodeDataMessage.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetNodeDataMessage.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.AbstractMessageData; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.AbstractMessageData; +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 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/tech/pegasys/pantheon/ethereum/eth/messages/GetReceiptsMessage.java index 87bc1f374f..98fc9a656b 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetReceiptsMessage.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/GetReceiptsMessage.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.AbstractMessageData; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.AbstractMessageData; +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 java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockHashesMessage.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockHashesMessage.java index 6172afb87b..0b69e9d5bf 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockHashesMessage.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockHashesMessage.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.eth.messages; - -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.AbstractMessageData; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.util.bytes.BytesValue; +package tech.pegasys.pantheon.ethereum.eth.messages; + +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.AbstractMessageData; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockMessage.java index abbfaafad6..742a45bb36 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockMessage.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockMessage.java @@ -1,19 +1,19 @@ -package net.consensys.pantheon.ethereum.eth.messages; - -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHashFunction; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.utils.ByteBufUtils; -import net.consensys.pantheon.ethereum.p2p.wire.AbstractMessageData; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +package tech.pegasys.pantheon.ethereum.eth.messages; + +import tech.pegasys.pantheon.ethereum.core.Block; +import tech.pegasys.pantheon.ethereum.core.BlockHashFunction; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.utils.ByteBufUtils; +import tech.pegasys.pantheon.ethereum.p2p.wire.AbstractMessageData; +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; import io.netty.buffer.ByteBuf; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NodeDataMessage.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NodeDataMessage.java index b0a541d0e8..910edd81e6 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NodeDataMessage.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/NodeDataMessage.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.AbstractMessageData; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.AbstractMessageData; +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 java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/ReceiptsMessage.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/ReceiptsMessage.java index 3d81286f65..11200ac8e4 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/ReceiptsMessage.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/ReceiptsMessage.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.AbstractMessageData; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.AbstractMessageData; +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 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/tech/pegasys/pantheon/ethereum/eth/messages/StatusMessage.java index a8d5342751..36e4b98e61 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/StatusMessage.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/StatusMessage.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.eth.messages; - -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.utils.ByteBufUtils; -import net.consensys.pantheon.ethereum.p2p.wire.AbstractMessageData; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +package tech.pegasys.pantheon.ethereum.eth.messages; + +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.utils.ByteBufUtils; +import tech.pegasys.pantheon.ethereum.p2p.wire.AbstractMessageData; +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; import io.netty.buffer.ByteBuf; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/TransactionsMessage.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/TransactionsMessage.java index 872bdef06c..ccfcb29d14 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/TransactionsMessage.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/messages/TransactionsMessage.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.eth.messages; - -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.AbstractMessageData; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.BytesValue; +package tech.pegasys.pantheon.ethereum.eth.messages; + +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.AbstractMessageData; +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 java.util.Iterator; import java.util.function.Function; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManager.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManager.java index d8b8ed29cd..3e63288a89 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManager.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManager.java @@ -1,28 +1,28 @@ -package net.consensys.pantheon.ethereum.eth.sync; +package tech.pegasys.pantheon.ethereum.eth.sync; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.BlockAddedEvent; -import net.consensys.pantheon.ethereum.chain.BlockAddedEvent.EventType; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.eth.manager.AbstractPeerTask; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthMessage; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.messages.EthPV62; -import net.consensys.pantheon.ethereum.eth.messages.NewBlockHashesMessage; -import net.consensys.pantheon.ethereum.eth.messages.NewBlockHashesMessage.NewBlockHash; -import net.consensys.pantheon.ethereum.eth.messages.NewBlockMessage; -import net.consensys.pantheon.ethereum.eth.sync.state.PendingBlocks; -import net.consensys.pantheon.ethereum.eth.sync.state.SyncState; -import net.consensys.pantheon.ethereum.eth.sync.tasks.GetBlockFromPeerTask; -import net.consensys.pantheon.ethereum.eth.sync.tasks.PersistBlockTask; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.ethereum.rlp.RLPException; -import net.consensys.pantheon.util.uint.UInt256; +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.Hash; +import tech.pegasys.pantheon.ethereum.eth.manager.AbstractPeerTask; +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.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.GetBlockFromPeerTask; +import tech.pegasys.pantheon.ethereum.eth.sync.tasks.PersistBlockTask; +import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.rlp.RLPException; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainHeadTracker.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainHeadTracker.java index 56b24d2d11..50f107314e 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainHeadTracker.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainHeadTracker.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.eth.sync; +package tech.pegasys.pantheon.ethereum.eth.sync; import static org.apache.logging.log4j.LogManager.getLogger; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.manager.EthPeers.ConnectCallback; -import net.consensys.pantheon.ethereum.eth.sync.tasks.GetHeadersFromPeerByHashTask; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +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.sync.tasks.GetHeadersFromPeerByHashTask; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; import org.apache.logging.log4j.Logger; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DefaultSynchronizer.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DefaultSynchronizer.java index 45dd820089..ee832b79b0 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DefaultSynchronizer.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DefaultSynchronizer.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.eth.sync; +package tech.pegasys.pantheon.ethereum.eth.sync; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.SyncStatus; -import net.consensys.pantheon.ethereum.core.Synchronizer; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.sync.state.PendingBlocks; -import net.consensys.pantheon.ethereum.eth.sync.state.SyncState; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.core.SyncStatus; +import tech.pegasys.pantheon.ethereum.core.Synchronizer; +import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; +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 java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/Downloader.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/Downloader.java index 088362257a..bc9058c890 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/Downloader.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/Downloader.java @@ -1,28 +1,28 @@ -package net.consensys.pantheon.ethereum.eth.sync; - -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.eth.manager.AbstractPeerTask.PeerTaskResult; -import net.consensys.pantheon.ethereum.eth.manager.ChainState; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.manager.EthPeers; -import net.consensys.pantheon.ethereum.eth.manager.EthTask; -import net.consensys.pantheon.ethereum.eth.sync.state.SyncState; -import net.consensys.pantheon.ethereum.eth.sync.state.SyncTarget; -import net.consensys.pantheon.ethereum.eth.sync.tasks.DetermineCommonAncestorTask; -import net.consensys.pantheon.ethereum.eth.sync.tasks.GetHeadersFromPeerByHashTask; -import net.consensys.pantheon.ethereum.eth.sync.tasks.ImportBlocksTask; -import net.consensys.pantheon.ethereum.eth.sync.tasks.PipelinedImportChainSegmentTask; -import net.consensys.pantheon.ethereum.eth.sync.tasks.WaitForPeerTask; -import net.consensys.pantheon.ethereum.eth.sync.tasks.WaitForPeersTask; -import net.consensys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.util.ExceptionUtils; -import net.consensys.pantheon.util.uint.UInt256; +package tech.pegasys.pantheon.ethereum.eth.sync; + +import tech.pegasys.pantheon.ethereum.ProtocolContext; +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.eth.manager.AbstractPeerTask.PeerTaskResult; +import tech.pegasys.pantheon.ethereum.eth.manager.ChainState; +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.manager.EthTask; +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.DetermineCommonAncestorTask; +import tech.pegasys.pantheon.ethereum.eth.sync.tasks.GetHeadersFromPeerByHashTask; +import tech.pegasys.pantheon.ethereum.eth.sync.tasks.ImportBlocksTask; +import tech.pegasys.pantheon.ethereum.eth.sync.tasks.PipelinedImportChainSegmentTask; +import tech.pegasys.pantheon.ethereum.eth.sync.tasks.WaitForPeerTask; +import tech.pegasys.pantheon.ethereum.eth.sync.tasks.WaitForPeersTask; +import tech.pegasys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.util.ExceptionUtils; +import tech.pegasys.pantheon.util.uint.UInt256; import java.time.Duration; import java.util.ArrayList; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SyncMode.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SyncMode.java index a44496e03a..2c68dc4b2a 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SyncMode.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SyncMode.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.sync; +package tech.pegasys.pantheon.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/SynchronizerConfiguration.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SynchronizerConfiguration.java index f66c79b472..39e31ce5e0 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SynchronizerConfiguration.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SynchronizerConfiguration.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.eth.sync; +package tech.pegasys.pantheon.ethereum.eth.sync; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.chain.Blockchain; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.Optional; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/TrailingPeerLimiter.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/TrailingPeerLimiter.java index 54adc12515..82b48eeb8c 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/TrailingPeerLimiter.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/TrailingPeerLimiter.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.eth.sync; +package tech.pegasys.pantheon.ethereum.eth.sync; import static org.apache.logging.log4j.LogManager.getLogger; -import net.consensys.pantheon.ethereum.chain.BlockAddedEvent; -import net.consensys.pantheon.ethereum.chain.BlockAddedEvent.EventType; -import net.consensys.pantheon.ethereum.chain.BlockAddedObserver; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.manager.EthPeers; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent; +import tech.pegasys.pantheon.ethereum.chain.BlockAddedEvent.EventType; +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.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/state/FastSyncState.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/FastSyncState.java index 3788b98738..ff179406f1 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/FastSyncState.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/FastSyncState.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.eth.sync.state; +package tech.pegasys.pantheon.ethereum.eth.sync.state; -import net.consensys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; +import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; public final class FastSyncState { private long fastSyncTargetBlockNumber = -1; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/PendingBlocks.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/PendingBlocks.java index de193a0e97..8925a9e0dd 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/PendingBlocks.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/PendingBlocks.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.eth.sync.state; +package tech.pegasys.pantheon.ethereum.eth.sync.state; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.Block; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/eth/sync/state/SyncState.java index 284b2fbcf2..c95e62da93 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/SyncState.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/SyncState.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.eth.sync.state; +package tech.pegasys.pantheon.ethereum.eth.sync.state; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.SyncStatus; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.chain.Blockchain; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.SyncStatus; +import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +import tech.pegasys.pantheon.util.uint.UInt256; 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/tech/pegasys/pantheon/ethereum/eth/sync/state/SyncTarget.java index f5eed6a703..f546abec33 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/SyncTarget.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/state/SyncTarget.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.eth.sync.state; +package tech.pegasys.pantheon.ethereum.eth.sync.state; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.eth.manager.ChainState; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.eth.manager.ChainState; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; import com.google.common.base.MoreObjects; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/AbstractGetHeadersFromPeerTask.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/AbstractGetHeadersFromPeerTask.java index c21ddb7c0a..b8824119eb 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/AbstractGetHeadersFromPeerTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/AbstractGetHeadersFromPeerTask.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.eth.manager.AbstractPeerRequestTask; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.messages.BlockHeadersMessage; -import net.consensys.pantheon.ethereum.eth.messages.EthPV62; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.eth.manager.AbstractPeerRequestTask; +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.api.MessageData; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/CompleteBlocksTask.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/CompleteBlocksTask.java index 80f9e4be04..ad1d4a1b7e 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/CompleteBlocksTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/CompleteBlocksTask.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.eth.manager.AbstractPeerTask.PeerTaskResult; -import net.consensys.pantheon.ethereum.eth.manager.AbstractRetryingPeerTask; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.NoAvailablePeersException; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.PeerBreachedProtocolException; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.PeerDisconnectedException; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.core.Block; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.eth.manager.AbstractPeerTask.PeerTaskResult; +import tech.pegasys.pantheon.ethereum.eth.manager.AbstractRetryingPeerTask; +import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +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.ethereum.mainnet.ProtocolSchedule; import java.util.HashMap; 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/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTask.java index 06159ed231..104bb1e776 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTask.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; - -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.eth.manager.AbstractEthTask; -import net.consensys.pantheon.ethereum.eth.manager.AbstractPeerTask; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.util.BlockchainUtil; +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.AbstractEthTask; +import tech.pegasys.pantheon.ethereum.eth.manager.AbstractPeerTask; +import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.util.BlockchainUtil; 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/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DownloadHeaderSequenceTask.java index 522088967d..99a03371f5 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DownloadHeaderSequenceTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DownloadHeaderSequenceTask.java @@ -1,22 +1,22 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; import static java.util.Arrays.asList; -import static net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode.DETACHED_ONLY; - -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.eth.manager.AbstractPeerTask.PeerTaskResult; -import net.consensys.pantheon.ethereum.eth.manager.AbstractRetryingPeerTask; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.NoAvailablePeersException; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.PeerBreachedProtocolException; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.PeerDisconnectedException; -import net.consensys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import net.consensys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import static tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode.DETACHED_ONLY; + +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.AbstractPeerTask.PeerTaskResult; +import tech.pegasys.pantheon.ethereum.eth.manager.AbstractRetryingPeerTask; +import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; +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.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.wire.messages.DisconnectMessage.DisconnectReason; import java.util.Arrays; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetBlockFromPeerTask.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetBlockFromPeerTask.java index 2772ba8f59..e3a25bb017 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetBlockFromPeerTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetBlockFromPeerTask.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.eth.manager.AbstractPeerTask; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.IncompleteResultsException; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; +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.AbstractPeerTask; +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.ethereum.p2p.api.PeerConnection.PeerNotConnected; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetBodiesFromPeerTask.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetBodiesFromPeerTask.java index ebe849f693..1e70973364 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetBodiesFromPeerTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetBodiesFromPeerTask.java @@ -1,23 +1,23 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.eth.manager.AbstractPeerRequestTask; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.manager.RequestManager.ResponseStream; -import net.consensys.pantheon.ethereum.eth.messages.BlockBodiesMessage; -import net.consensys.pantheon.ethereum.eth.messages.EthPV62; -import net.consensys.pantheon.ethereum.mainnet.BodyValidation; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; -import net.consensys.pantheon.util.bytes.Bytes32; +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.AbstractPeerRequestTask; +import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +import tech.pegasys.pantheon.ethereum.eth.manager.RequestManager.ResponseStream; +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.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; +import tech.pegasys.pantheon.util.bytes.Bytes32; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetHeadersFromPeerByHashTask.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetHeadersFromPeerByHashTask.java index e663414959..2d5bd36789 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetHeadersFromPeerByHashTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetHeadersFromPeerByHashTask.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; import static com.google.common.base.Preconditions.checkNotNull; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.manager.RequestManager.ResponseStream; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; +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.RequestManager.ResponseStream; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; 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/sync/tasks/GetHeadersFromPeerByNumberTask.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetHeadersFromPeerByNumberTask.java index e2081bd3d7..cd3ee5f38a 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetHeadersFromPeerByNumberTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetHeadersFromPeerByNumberTask.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.manager.RequestManager.ResponseStream; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; +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.RequestManager.ResponseStream; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; 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/sync/tasks/ImportBlocksTask.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/ImportBlocksTask.java index 81bbb5486d..38d1b9e1bb 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/ImportBlocksTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/ImportBlocksTask.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.eth.manager.AbstractPeerTask; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.core.Block; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.eth.manager.AbstractPeerTask; +import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; import java.util.Collections; 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/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PersistBlockTask.java index 15da3f9ef9..b491f92fcc 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PersistBlockTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PersistBlockTask.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockImporter; -import net.consensys.pantheon.ethereum.eth.manager.AbstractEthTask; -import net.consensys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; +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.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 java.util.ArrayList; import java.util.List; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PipelinedImportChainSegmentTask.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PipelinedImportChainSegmentTask.java index 8cc0138286..59a2e25095 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PipelinedImportChainSegmentTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PipelinedImportChainSegmentTask.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.eth.manager.AbstractEthTask; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import net.consensys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +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.eth.manager.AbstractEthTask; +import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; +import tech.pegasys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; +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 java.util.ArrayList; import java.util.Arrays; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/WaitForPeerTask.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/WaitForPeerTask.java index 0d34b088ff..18ee34f858 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/WaitForPeerTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/WaitForPeerTask.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; -import net.consensys.pantheon.ethereum.eth.manager.AbstractEthTask; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthPeers; +import tech.pegasys.pantheon.ethereum.eth.manager.AbstractEthTask; +import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; 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/sync/tasks/WaitForPeersTask.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/WaitForPeersTask.java index 6f6c5bf14a..b72d5b84f5 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/WaitForPeersTask.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/WaitForPeersTask.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; -import net.consensys.pantheon.ethereum.eth.manager.AbstractEthTask; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthPeers; +import tech.pegasys.pantheon.ethereum.eth.manager.AbstractEthTask; +import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeers; 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/sync/tasks/exceptions/InvalidBlockException.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/exceptions/InvalidBlockException.java index 8c1326ad4d..8c2d2837c0 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/exceptions/InvalidBlockException.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/exceptions/InvalidBlockException.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks.exceptions; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks.exceptions; -import net.consensys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.Hash; public class InvalidBlockException extends RuntimeException { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PeerTransactionTracker.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PeerTransactionTracker.java index d38943a9a1..4e9f87d3cf 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PeerTransactionTracker.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/PeerTransactionTracker.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.eth.transactions; +package tech.pegasys.pantheon.ethereum.eth.transactions; import static java.util.Collections.emptySet; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer.DisconnectCallback; +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 java.util.Collection; import java.util.Collections; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolFactory.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolFactory.java index 25faa5ec13..acaafa181b 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolFactory.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolFactory.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.eth.transactions; +package tech.pegasys.pantheon.ethereum.eth.transactions; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.messages.EthPV62; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.core.PendingTransactions; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; +import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; public class TransactionPoolFactory { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionSender.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionSender.java index 35c5dee49c..13dac75ae7 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionSender.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionSender.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.eth.transactions; +package tech.pegasys.pantheon.ethereum.eth.transactions; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionPool.TransactionBatchAddedListener; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.core.TransactionPool.TransactionBatchAddedListener; +import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; 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/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageHandler.java index dc7d820f27..7309ecdb91 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageHandler.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageHandler.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.eth.transactions; +package tech.pegasys.pantheon.ethereum.eth.transactions; -import net.consensys.pantheon.ethereum.eth.manager.EthMessage; -import net.consensys.pantheon.ethereum.eth.manager.EthMessages.MessageCallback; -import net.consensys.pantheon.ethereum.eth.manager.EthScheduler; -import net.consensys.pantheon.ethereum.eth.messages.TransactionsMessage; +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; class TransactionsMessageHandler implements MessageCallback { diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageProcessor.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageProcessor.java index b7bef55faf..05cd60c80a 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageProcessor.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageProcessor.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.eth.transactions; +package tech.pegasys.pantheon.ethereum.eth.transactions; import static org.apache.logging.log4j.LogManager.getLogger; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.messages.TransactionsMessage; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.ethereum.rlp.RLPException; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +import tech.pegasys.pantheon.ethereum.eth.messages.TransactionsMessage; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.rlp.RLPException; import java.util.Iterator; import java.util.Set; diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageSender.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageSender.java index c528fe9dab..7fb6a018bc 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageSender.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageSender.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.eth.transactions; +package tech.pegasys.pantheon.ethereum.eth.transactions; import static java.util.stream.Collectors.toSet; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.messages.TransactionsMessage; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; +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.api.PeerConnection.PeerNotConnected; import java.util.Set; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractEthTaskTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractEthTaskTest.java index f1da55ee83..36fe47f269 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractEthTaskTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/AbstractEthTaskTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.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/ChainStateTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ChainStateTest.java index 3cce2b7855..2c3e7d3c5e 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ChainStateTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ChainStateTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; -import net.consensys.pantheon.util.uint.UInt256; +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.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.util.uint.UInt256; import org.junit.Test; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/DeterministicEthScheduler.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/DeterministicEthScheduler.java index e53ac7bb64..097de0ba4f 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/DeterministicEthScheduler.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/DeterministicEthScheduler.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; import java.time.Duration; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeerTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeerTest.java index 7d76468f89..66a5a678a3 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeerTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeerTest.java @@ -1,18 +1,18 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.eth.EthProtocol; -import net.consensys.pantheon.ethereum.eth.manager.RequestManager.ResponseCallback; -import net.consensys.pantheon.ethereum.eth.manager.RequestManager.ResponseStream; -import net.consensys.pantheon.ethereum.eth.messages.BlockBodiesMessage; -import net.consensys.pantheon.ethereum.eth.messages.BlockHeadersMessage; -import net.consensys.pantheon.ethereum.eth.messages.ReceiptsMessage; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.testutil.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.ReceiptsMessage; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; import java.util.Arrays; import java.util.Collections; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeersTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeersTest.java index 09f1ba8282..2a49410c2c 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeersTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthPeersTest.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.util.uint.UInt256; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTest.java index 804a5a0c65..becceea2a5 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -6,38 +6,38 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.eth.EthProtocol; -import net.consensys.pantheon.ethereum.eth.EthProtocol.EthVersion; -import net.consensys.pantheon.ethereum.eth.manager.MockPeerConnection.PeerSendHandler; -import net.consensys.pantheon.ethereum.eth.manager.ethtaskutils.BlockchainSetupUtil; -import net.consensys.pantheon.ethereum.eth.messages.BlockBodiesMessage; -import net.consensys.pantheon.ethereum.eth.messages.BlockHeadersMessage; -import net.consensys.pantheon.ethereum.eth.messages.EthPV62; -import net.consensys.pantheon.ethereum.eth.messages.EthPV63; -import net.consensys.pantheon.ethereum.eth.messages.GetBlockBodiesMessage; -import net.consensys.pantheon.ethereum.eth.messages.GetBlockHeadersMessage; -import net.consensys.pantheon.ethereum.eth.messages.GetReceiptsMessage; -import net.consensys.pantheon.ethereum.eth.messages.NewBlockMessage; -import net.consensys.pantheon.ethereum.eth.messages.ReceiptsMessage; -import net.consensys.pantheon.ethereum.eth.messages.StatusMessage; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.DefaultMessage; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.uint.UInt256; +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.TransactionReceipt; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.eth.EthProtocol; +import tech.pegasys.pantheon.ethereum.eth.EthProtocol.EthVersion; +import tech.pegasys.pantheon.ethereum.eth.manager.MockPeerConnection.PeerSendHandler; +import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.BlockchainSetupUtil; +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.GetReceiptsMessage; +import tech.pegasys.pantheon.ethereum.eth.messages.NewBlockMessage; +import tech.pegasys.pantheon.ethereum.eth.messages.ReceiptsMessage; +import tech.pegasys.pantheon.ethereum.eth.messages.StatusMessage; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.DefaultMessage; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.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/EthProtocolManagerTestUtil.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTestUtil.java index 1025733fdb..c768135e5b 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTestUtil.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTestUtil.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.chain.ChainHead; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.eth.EthProtocol; -import net.consensys.pantheon.ethereum.eth.manager.DeterministicEthScheduler.TimeoutPolicy; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.DefaultMessage; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.chain.Blockchain; +import tech.pegasys.pantheon.ethereum.chain.ChainHead; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.eth.EthProtocol; +import tech.pegasys.pantheon.ethereum.eth.manager.DeterministicEthScheduler.TimeoutPolicy; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.DefaultMessage; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.util.uint.UInt256; public class EthProtocolManagerTestUtil { diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthSchedulerTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthSchedulerTest.java index 19dff7a763..56df86e129 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthSchedulerTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthSchedulerTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockEthTask.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockEthTask.java index afd1989ba9..ade0a854b6 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockEthTask.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockEthTask.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; public class MockEthTask extends AbstractEthTask { diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockExecutorService.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockExecutorService.java index a75132fbcc..d1da5f801c 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockExecutorService.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockExecutorService.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; import static org.mockito.Mockito.spy; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockPeerConnection.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockPeerConnection.java index e750ca27be..4915e13b8f 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockPeerConnection.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockPeerConnection.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.eth.manager; - -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.util.bytes.Bytes32; +package tech.pegasys.pantheon.ethereum.eth.manager; + +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.util.bytes.Bytes32; import java.net.SocketAddress; 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/tech/pegasys/pantheon/ethereum/eth/manager/MockScheduledExecutor.java index b1680fdc41..de4c65b1ca 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockScheduledExecutor.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/MockScheduledExecutor.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; 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/tech/pegasys/pantheon/ethereum/eth/manager/PeerReputationTest.java index decc1e9c18..08ce3b7bc2 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/PeerReputationTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/PeerReputationTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; -import static net.consensys.pantheon.ethereum.eth.manager.PeerReputation.USELESS_RESPONSE_WINDOW_IN_MILLIS; -import static net.consensys.pantheon.ethereum.eth.messages.EthPV62.GET_BLOCK_BODIES; -import static net.consensys.pantheon.ethereum.eth.messages.EthPV62.GET_BLOCK_HEADERS; -import static net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason.TIMEOUT; -import static net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason.USELESS_PEER; 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.wire.messages.DisconnectMessage.DisconnectReason.TIMEOUT; +import static tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason.USELESS_PEER; import org.junit.Test; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/RequestManagerTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/RequestManagerTest.java index ca2b254b13..4241fb0af7 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/RequestManagerTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/RequestManagerTest.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.eth.EthProtocol; -import net.consensys.pantheon.ethereum.eth.manager.RequestManager.RequestSender; -import net.consensys.pantheon.ethereum.eth.manager.RequestManager.ResponseCallback; -import net.consensys.pantheon.ethereum.eth.manager.RequestManager.ResponseStream; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.RawMessage; +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.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/RespondingEthPeer.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/RespondingEthPeer.java index 95b0da41be..e813f5c480 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/RespondingEthPeer.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/RespondingEthPeer.java @@ -1,24 +1,24 @@ -package net.consensys.pantheon.ethereum.eth.manager; +package tech.pegasys.pantheon.ethereum.eth.manager; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.eth.EthProtocol; -import net.consensys.pantheon.ethereum.eth.messages.BlockBodiesMessage; -import net.consensys.pantheon.ethereum.eth.messages.BlockHeadersMessage; -import net.consensys.pantheon.ethereum.eth.messages.EthPV62; -import net.consensys.pantheon.ethereum.eth.messages.EthPV63; -import net.consensys.pantheon.ethereum.eth.messages.NodeDataMessage; -import net.consensys.pantheon.ethereum.eth.messages.ReceiptsMessage; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.DefaultMessage; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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.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.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.DefaultMessage; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java index f1295c727c..4f27a1cde6 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.eth.manager.ethtaskutils; +package tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManager; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import net.consensys.pantheon.ethereum.eth.manager.EthTask; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.chain.Blockchain; +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.EthTask; +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 java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/BlockchainSetupUtil.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/BlockchainSetupUtil.java index 0708f1134f..28f8869718 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/BlockchainSetupUtil.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/BlockchainSetupUtil.java @@ -1,27 +1,27 @@ -package net.consensys.pantheon.ethereum.eth.manager.ethtaskutils; +package tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils; -import static net.consensys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; import static org.assertj.core.util.Preconditions.checkArgument; - -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHashFunction; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockImporter; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; -import net.consensys.pantheon.ethereum.util.RawBlockIterator; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; +import static tech.pegasys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; + +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.chain.Blockchain; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; +import tech.pegasys.pantheon.ethereum.core.Block; +import tech.pegasys.pantheon.ethereum.core.BlockHashFunction; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.BlockImporter; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +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.ScheduleBasedBlockHashFunction; +import tech.pegasys.pantheon.ethereum.util.RawBlockIterator; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; import java.io.IOException; import java.net.URL; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/PeerMessageTaskTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/PeerMessageTaskTest.java index 59a448b915..d54566dfaf 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/PeerMessageTaskTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/PeerMessageTaskTest.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.eth.manager.ethtaskutils; +package tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.eth.manager.AbstractPeerTask.PeerTaskResult; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import net.consensys.pantheon.ethereum.eth.manager.EthTask; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.EthTaskException; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.EthTaskException.FailureReason; -import net.consensys.pantheon.util.ExceptionUtils; +import tech.pegasys.pantheon.ethereum.eth.manager.AbstractPeerTask.PeerTaskResult; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; +import tech.pegasys.pantheon.ethereum.eth.manager.EthTask; +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.util.ExceptionUtils; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskTest.java index f260ba44a1..04bf1506d9 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.eth.manager.ethtaskutils; +package tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import net.consensys.pantheon.ethereum.eth.manager.EthTask; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; +import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; +import tech.pegasys.pantheon.ethereum.eth.manager.EthTask; +import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; +import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskWithResultsTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskWithResultsTest.java index e4cc18e80a..466dad6e2d 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskWithResultsTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskWithResultsTest.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.eth.manager.ethtaskutils; +package tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; public abstract class RetryingMessageTaskWithResultsTest extends RetryingMessageTaskTest { diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockBodiesMessageTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockBodiesMessageTest.java index b5ea299a37..9ea9cdd41c 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockBodiesMessageTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockBodiesMessageTest.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.development.DevelopmentProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.RawMessage; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RlpUtils; -import net.consensys.pantheon.util.bytes.BytesValue; +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.development.DevelopmentProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RlpUtils; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/eth/messages/BlockHeadersMessageTest.java index 1f19cc35a8..bf559d2a6b 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockHeadersMessageTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/BlockHeadersMessageTest.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.development.DevelopmentProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.RawMessage; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RlpUtils; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.development.DevelopmentProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RlpUtils; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockBodiesMessageTest.java index e9e2e904b6..34c5bf7a3b 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockBodiesMessageTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockBodiesMessageTest.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.RawMessage; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RlpUtils; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RlpUtils; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockHeadersMessageTest.java index 27d3286cfa..b3d967238a 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockHeadersMessageTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetBlockHeadersMessageTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.RawMessage; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/eth/messages/GetNodeDataMessageTest.java index ff6391dc3d..6b616b9ec4 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetNodeDataMessageTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetNodeDataMessageTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.RawMessage; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; import java.io.IOException; import java.util.ArrayList; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetReceiptsMessageTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetReceiptsMessageTest.java index fa991ed0d3..c39da2b97b 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetReceiptsMessageTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/GetReceiptsMessageTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.RawMessage; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; import java.io.IOException; import java.util.ArrayList; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockHashesMessageTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockHashesMessageTest.java index 4457add353..1546b315a5 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockHashesMessageTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockHashesMessageTest.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.RawMessage; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RlpUtils; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RlpUtils; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockMessageTest.java index 10491d2197..cded60d804 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockMessageTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NewBlockMessageTest.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.wire.RawMessage; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.core.Block; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import io.netty.buffer.Unpooled; 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/tech/pegasys/pantheon/ethereum/eth/messages/NodeDataMessageTest.java index bbb7807a11..cb4a4684f2 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NodeDataMessageTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/NodeDataMessageTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.RawMessage; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.io.IOException; import java.util.ArrayList; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/ReceiptsMessageTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/ReceiptsMessageTest.java index b16715dd58..aba2548b44 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/ReceiptsMessageTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/ReceiptsMessageTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.RawMessage; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; import java.io.IOException; import java.util.ArrayList; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/StatusMessageTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/StatusMessageTest.java index 838643b3e4..773b94f07d 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/StatusMessageTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/StatusMessageTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.eth.EthProtocol.EthVersion; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.eth.EthProtocol.EthVersion; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.Random; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/TransactionsMessageTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/TransactionsMessageTest.java index c052e104f6..265927f8d3 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/TransactionsMessageTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/messages/TransactionsMessageTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.eth.messages; +package tech.pegasys.pantheon.ethereum.eth.messages; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.RawMessage; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; import java.io.IOException; import java.util.ArrayList; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManagerTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManagerTest.java index 2dd98c1512..8f90a92047 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManagerTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/BlockPropagationManagerTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.sync; +package tech.pegasys.pantheon.ethereum.eth.sync; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -6,24 +6,24 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManager; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import net.consensys.pantheon.ethereum.eth.manager.ethtaskutils.BlockchainSetupUtil; -import net.consensys.pantheon.ethereum.eth.messages.NewBlockHashesMessage; -import net.consensys.pantheon.ethereum.eth.messages.NewBlockHashesMessage.NewBlockHash; -import net.consensys.pantheon.ethereum.eth.messages.NewBlockMessage; -import net.consensys.pantheon.ethereum.eth.sync.state.PendingBlocks; -import net.consensys.pantheon.ethereum.eth.sync.state.SyncState; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator.BlockOptions; -import net.consensys.pantheon.util.uint.UInt256; +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.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.ethtaskutils.BlockchainSetupUtil; +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.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator.BlockOptions; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.Collections; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainHeadTrackerTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainHeadTrackerTest.java index c84da731ff..10f85e2692 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainHeadTrackerTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainHeadTrackerTest.java @@ -1,19 +1,19 @@ -package net.consensys.pantheon.ethereum.eth.sync; +package tech.pegasys.pantheon.ethereum.eth.sync; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.eth.manager.ChainState; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManager; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import net.consensys.pantheon.ethereum.eth.manager.ethtaskutils.BlockchainSetupUtil; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; +import tech.pegasys.pantheon.ethereum.core.Hash; +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.eth.manager.ethtaskutils.BlockchainSetupUtil; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.util.uint.UInt256; import org.junit.Test; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/DownloaderTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/DownloaderTest.java index 501d153b12..1e505e195a 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/DownloaderTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/DownloaderTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.sync; +package tech.pegasys.pantheon.ethereum.eth.sync; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -7,31 +7,31 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.internal.verification.VerificationModeFactory.times; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManager; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import net.consensys.pantheon.ethereum.eth.manager.ethtaskutils.BlockchainSetupUtil; -import net.consensys.pantheon.ethereum.eth.messages.EthPV62; -import net.consensys.pantheon.ethereum.eth.messages.GetBlockHeadersMessage; -import net.consensys.pantheon.ethereum.eth.sync.state.PendingBlocks; -import net.consensys.pantheon.ethereum.eth.sync.state.SyncState; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.util.uint.UInt256; +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.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +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.manager.ethtaskutils.BlockchainSetupUtil; +import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; +import tech.pegasys.pantheon.ethereum.eth.messages.GetBlockHeadersMessage; +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.ScheduleBasedBlockHashFunction; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.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/TrailingPeerLimiterTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/TrailingPeerLimiterTest.java index 04ca856fc2..c8c180cf2e 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/TrailingPeerLimiterTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/TrailingPeerLimiterTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.sync; +package tech.pegasys.pantheon.ethereum.eth.sync; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; @@ -8,17 +8,17 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.chain.BlockAddedEvent; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.eth.manager.ChainState; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.manager.EthPeers; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.util.uint.UInt256; +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.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.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/state/PendingBlocksTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/state/PendingBlocksTest.java index 829ff34265..e162aa91da 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/state/PendingBlocksTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/state/PendingBlocksTest.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.eth.sync.state; +package tech.pegasys.pantheon.ethereum.eth.sync.state; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.ethereum.core.Block; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; import java.util.Arrays; import java.util.Collections; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/CompleteBlocksTaskTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/CompleteBlocksTaskTest.java index 2603442b11..f83b61a791 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/CompleteBlocksTaskTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/CompleteBlocksTaskTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.eth.manager.EthTask; -import net.consensys.pantheon.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskWithResultsTest; +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.EthTask; +import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskWithResultsTest; 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/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskParameterizedTest.java index ec3309c391..6646e259aa 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskParameterizedTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskParameterizedTest.java @@ -1,26 +1,26 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; -import static net.consensys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; import static org.assertj.core.api.Assertions.assertThat; - -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManager; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import net.consensys.pantheon.ethereum.eth.manager.EthTask; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.uint.UInt256; +import static tech.pegasys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; + +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.TransactionReceipt; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +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.EthTask; +import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskTest.java index 2adfb52418..b7fb6c4a89 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskTest.java @@ -1,6 +1,5 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; -import static net.consensys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -9,29 +8,30 @@ 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 net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManager; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import net.consensys.pantheon.ethereum.eth.manager.EthTask; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.EthTaskException; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.EthTaskException.FailureReason; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.ExceptionUtils; -import net.consensys.pantheon.util.uint.UInt256; +import static tech.pegasys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; + +import tech.pegasys.pantheon.ethereum.ProtocolContext; +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.db.DefaultMutableBlockchain; +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.EthTask; +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.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.util.ExceptionUtils; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DownloadHeaderSequenceTaskTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DownloadHeaderSequenceTaskTest.java index 60ca53e60f..bcddeb0e75 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DownloadHeaderSequenceTaskTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/DownloadHeaderSequenceTaskTest.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.eth.manager.EthTask; -import net.consensys.pantheon.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskWithResultsTest; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.eth.manager.EthTask; +import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskWithResultsTest; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetBlockFromPeerTaskTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetBlockFromPeerTaskTest.java index a810c43de8..416fa0b551 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetBlockFromPeerTaskTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetBlockFromPeerTaskTest.java @@ -1,20 +1,20 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.eth.manager.AbstractPeerTask.PeerTaskResult; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import net.consensys.pantheon.ethereum.eth.manager.EthTask; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import net.consensys.pantheon.ethereum.eth.manager.ethtaskutils.AbstractMessageTaskTest; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.EthTaskException; -import net.consensys.pantheon.ethereum.eth.manager.exceptions.EthTaskException.FailureReason; -import net.consensys.pantheon.util.ExceptionUtils; +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.AbstractPeerTask.PeerTaskResult; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; +import tech.pegasys.pantheon.ethereum.eth.manager.EthTask; +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.util.ExceptionUtils; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetBodiesFromPeerTaskTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetBodiesFromPeerTaskTest.java index 0ee6247c02..fc800e71c6 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetBodiesFromPeerTaskTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetBodiesFromPeerTaskTest.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.eth.manager.AbstractPeerTask.PeerTaskResult; -import net.consensys.pantheon.ethereum.eth.manager.EthTask; -import net.consensys.pantheon.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest; +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.AbstractPeerTask.PeerTaskResult; +import tech.pegasys.pantheon.ethereum.eth.manager.EthTask; +import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetHeadersFromPeerByHashTaskTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetHeadersFromPeerByHashTaskTest.java index d54445630d..683f008c1c 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetHeadersFromPeerByHashTaskTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetHeadersFromPeerByHashTaskTest.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.eth.manager.AbstractPeerTask.PeerTaskResult; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import net.consensys.pantheon.ethereum.eth.manager.EthTask; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import net.consensys.pantheon.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.eth.manager.AbstractPeerTask.PeerTaskResult; +import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; +import tech.pegasys.pantheon.ethereum.eth.manager.EthTask; +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 java.util.ArrayList; import java.util.List; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetHeadersFromPeerByNumberTaskTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetHeadersFromPeerByNumberTaskTest.java index 9d26bce219..1c50160556 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetHeadersFromPeerByNumberTaskTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/GetHeadersFromPeerByNumberTaskTest.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.eth.manager.AbstractPeerTask; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import net.consensys.pantheon.ethereum.eth.manager.EthTask; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import net.consensys.pantheon.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.eth.manager.AbstractPeerTask; +import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; +import tech.pegasys.pantheon.ethereum.eth.manager.EthTask; +import tech.pegasys.pantheon.ethereum.eth.manager.RespondingEthPeer; +import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/ImportBlocksTaskTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/ImportBlocksTaskTest.java index 2d0f4cb31b..5527266a51 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/ImportBlocksTaskTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/ImportBlocksTaskTest.java @@ -1,27 +1,27 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.eth.manager.AbstractPeerTask.PeerTaskResult; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import net.consensys.pantheon.ethereum.eth.manager.EthTask; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import net.consensys.pantheon.ethereum.eth.manager.ethtaskutils.AbstractMessageTaskTest; -import net.consensys.pantheon.ethereum.eth.messages.BlockHeadersMessage; -import net.consensys.pantheon.ethereum.eth.messages.EthPV62; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; +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.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.eth.manager.AbstractPeerTask.PeerTaskResult; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; +import tech.pegasys.pantheon.ethereum.eth.manager.EthTask; +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.messages.BlockHeadersMessage; +import tech.pegasys.pantheon.ethereum.eth.messages.EthPV62; +import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PersistBlockTaskTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PersistBlockTaskTest.java index ad8668aa6b..4c260e74a9 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PersistBlockTaskTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PersistBlockTaskTest.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.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 net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.eth.manager.ethtaskutils.BlockchainSetupUtil; -import net.consensys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; +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.eth.manager.ethtaskutils.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.ethereum.testutil.BlockDataGenerator; import java.util.Arrays; import java.util.Collections; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PipelinedImportChainSegmentTaskTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PipelinedImportChainSegmentTaskTest.java index 0314bbc642..4e6394dcdf 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PipelinedImportChainSegmentTaskTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/PipelinedImportChainSegmentTaskTest.java @@ -1,29 +1,29 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import net.consensys.pantheon.ethereum.eth.manager.EthTask; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer; -import net.consensys.pantheon.ethereum.eth.manager.RespondingEthPeer.Responder; -import net.consensys.pantheon.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskTest; -import net.consensys.pantheon.ethereum.eth.messages.EthPV62; -import net.consensys.pantheon.ethereum.eth.messages.EthPV63; -import net.consensys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator.BlockOptions; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; +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.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; +import tech.pegasys.pantheon.ethereum.eth.manager.EthTask; +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.messages.EthPV62; +import tech.pegasys.pantheon.ethereum.eth.messages.EthPV63; +import tech.pegasys.pantheon.ethereum.eth.sync.tasks.exceptions.InvalidBlockException; +import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator.BlockOptions; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/WaitForPeerTaskTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/WaitForPeerTaskTest.java index e6cd68b104..0873877524 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/WaitForPeerTaskTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/WaitForPeerTaskTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManager; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import net.consensys.pantheon.ethereum.eth.manager.EthTask; +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.EthTask; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/WaitForPeersTaskTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/WaitForPeersTaskTest.java index 182659aeb4..2b3b116dfa 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/WaitForPeersTaskTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/WaitForPeersTaskTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.eth.sync.tasks; +package tech.pegasys.pantheon.ethereum.eth.sync.tasks; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManager; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManagerTestUtil; -import net.consensys.pantheon.ethereum.eth.manager.EthTask; +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.EthTask; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/PeerTransactionTrackerTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/PeerTransactionTrackerTest.java index 06519ed9f2..f15f065d21 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/PeerTransactionTrackerTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/PeerTransactionTrackerTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.eth.transactions; +package tech.pegasys.pantheon.ethereum.eth.transactions; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; import com.google.common.collect.ImmutableSet; import org.junit.Test; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TestNode.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TestNode.java index 97a00eced0..28e2e6cb4a 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TestNode.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TestNode.java @@ -1,38 +1,38 @@ -package net.consensys.pantheon.ethereum.eth.transactions; +package tech.pegasys.pantheon.ethereum.eth.transactions; import static java.util.Collections.singletonList; -import static net.consensys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; import static org.assertj.core.util.Preconditions.checkNotNull; - -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.BlockHashFunction; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.eth.EthProtocol; -import net.consensys.pantheon.ethereum.eth.manager.EthContext; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManager; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; -import net.consensys.pantheon.ethereum.p2p.NetworkRunner; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import net.consensys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import net.consensys.pantheon.ethereum.p2p.config.RlpxConfiguration; -import net.consensys.pantheon.ethereum.p2p.netty.NettyP2PNetwork; -import net.consensys.pantheon.ethereum.p2p.peers.DefaultPeer; -import net.consensys.pantheon.ethereum.p2p.peers.Endpoint; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; -import net.consensys.pantheon.ethereum.p2p.peers.PeerBlacklist; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.bytes.BytesValue; +import static tech.pegasys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; + +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; +import tech.pegasys.pantheon.ethereum.core.BlockHashFunction; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.eth.EthProtocol; +import tech.pegasys.pantheon.ethereum.eth.manager.EthContext; +import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; +import tech.pegasys.pantheon.ethereum.p2p.NetworkRunner; +import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +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.netty.NettyP2PNetwork; +import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; +import tech.pegasys.pantheon.ethereum.p2p.peers.Endpoint; +import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; +import tech.pegasys.pantheon.ethereum.p2p.peers.PeerBlacklist; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/eth/transactions/TestNodeList.java index 685c8b0896..0b0f827fdd 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TestNodeList.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TestNodeList.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.eth.transactions; +package tech.pegasys.pantheon.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 net.consensys.pantheon.ethereum.eth.transactions.TestNode.shortId; 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 net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; +import tech.pegasys.pantheon.ethereum.p2p.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/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolPropagationTest.java index 05a0a4c1f1..c979aff4df 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolPropagationTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPoolPropagationTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.eth.transactions; - -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.crypto.SECP256K1.PrivateKey; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionTestFixture; -import net.consensys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.util.bytes.Bytes32; +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.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.util.bytes.Bytes32; import java.util.concurrent.TimeUnit; diff --git a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageProcessorTest.java b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageProcessorTest.java index 0c37990159..f7b5a2a805 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageProcessorTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageProcessorTest.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.eth.transactions; +package tech.pegasys.pantheon.ethereum.eth.transactions; import static java.util.Arrays.asList; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.messages.TransactionsMessage; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.eth.manager.EthPeer; +import tech.pegasys.pantheon.ethereum.eth.messages.TransactionsMessage; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; 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/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageSenderTest.java index 0fa051ba2e..9bd61afa70 100644 --- a/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageSenderTest.java +++ b/ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionsMessageSenderTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.eth.transactions; +package tech.pegasys.pantheon.ethereum.eth.transactions; import static com.google.common.collect.Sets.newHashSet; import static java.util.stream.Collectors.toSet; @@ -9,12 +9,12 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.eth.manager.EthPeer; -import net.consensys.pantheon.ethereum.eth.messages.EthPV62; -import net.consensys.pantheon.ethereum.eth.messages.TransactionsMessage; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.testutil.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.api.MessageData; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; import java.util.List; import java.util.Set; diff --git a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/BlockchainImporter.java b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/BlockchainImporter.java index 8bacbeb4d7..b5e2b4f914 100644 --- a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/BlockchainImporter.java +++ b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/BlockchainImporter.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc; - -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.util.RawBlockIterator; +package tech.pegasys.pantheon.ethereum.jsonrpc; + +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +import tech.pegasys.pantheon.ethereum.core.Block; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.util.RawBlockIterator; import java.net.URL; import java.nio.file.Paths; diff --git a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcResponseKey.java b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcResponseKey.java index 3258cf3306..5dd1ad9885 100644 --- a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcResponseKey.java +++ b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcResponseKey.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc; +package tech.pegasys.pantheon.ethereum.jsonrpc; public enum JsonRpcResponseKey { COINBASE, diff --git a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcResponseUtils.java b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcResponseUtils.java index 4d52350cdc..4000ac3187 100644 --- a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcResponseUtils.java +++ b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcResponseUtils.java @@ -1,42 +1,42 @@ -package net.consensys.pantheon.ethereum.jsonrpc; - -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.COINBASE; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.DIFFICULTY; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.EXTRA_DATA; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_LIMIT; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_USED; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.LOGS_BLOOM; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.MIX_HASH; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NONCE; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NUMBER; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.OMMERS_HASH; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.PARENT_HASH; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.RECEIPTS_ROOT; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.SIZE; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.STATE_ROOT; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TIMESTAMP; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT; +package tech.pegasys.pantheon.ethereum.jsonrpc; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHashFunction; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.LogsBloomFilter; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.TransactionCompleteResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.TransactionHashResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.TransactionResult; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.COINBASE; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.DIFFICULTY; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.EXTRA_DATA; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_LIMIT; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_USED; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.LOGS_BLOOM; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.MIX_HASH; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NONCE; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NUMBER; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.OMMERS_HASH; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.PARENT_HASH; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.RECEIPTS_ROOT; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.SIZE; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.STATE_ROOT; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TIMESTAMP; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT; + +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.BlockHashFunction; +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.Wei; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.TransactionCompleteResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.TransactionHashResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.TransactionResult; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.math.BigInteger; import java.util.ArrayList; diff --git a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcTestMethodsFactory.java b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcTestMethodsFactory.java index 10895ca0d6..9295976dc7 100644 --- a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcTestMethodsFactory.java +++ b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcTestMethodsFactory.java @@ -1,30 +1,30 @@ -package net.consensys.pantheon.ethereum.jsonrpc; +package tech.pegasys.pantheon.ethereum.jsonrpc; import static org.mockito.Mockito.mock; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockImporter; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Synchronizer; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterIdGenerator; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; -import net.consensys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +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.Hash; +import tech.pegasys.pantheon.ethereum.core.Synchronizer; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterIdGenerator; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +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.api.P2PNetwork; +import tech.pegasys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; import java.util.HashSet; import java.util.Map; diff --git a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthCallIntegrationTest.java b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthCallIntegrationTest.java index da3e266e06..357dbc95ca 100644 --- a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthCallIntegrationTest.java +++ b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthCallIntegrationTest.java @@ -1,18 +1,18 @@ -package net.consensys.pantheon.ethereum.jsonrpc.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import net.consensys.pantheon.ethereum.jsonrpc.BlockchainImporter; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcTestMethodsFactory; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.CallParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.BlockchainImporter; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcTestMethodsFactory; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.CallParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.net.URL; import java.util.Map; @@ -35,12 +35,12 @@ public class EthCallIntegrationTest { final URL blocksUrl = EthGetBlockByNumberIntegrationTest.class .getClassLoader() - .getResource("net/consensys/pantheon/ethereum/jsonrpc/jsonRpcTestBlockchain.blocks"); + .getResource("tech/pegasys/pantheon/ethereum/jsonrpc/jsonRpcTestBlockchain.blocks"); final URL genesisJsonUrl = EthGetBlockByNumberIntegrationTest.class .getClassLoader() - .getResource("net/consensys/pantheon/ethereum/jsonrpc/jsonRpcTestGenesis.json"); + .getResource("tech/pegasys/pantheon/ethereum/jsonrpc/jsonRpcTestGenesis.json"); assertThat(blocksUrl).isNotNull(); assertThat(genesisJsonUrl).isNotNull(); diff --git a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthEstimateGasIntegrationTest.java b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthEstimateGasIntegrationTest.java index 10f4e56ed5..247ad4047f 100644 --- a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthEstimateGasIntegrationTest.java +++ b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthEstimateGasIntegrationTest.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.jsonrpc.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.methods; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.jsonrpc.BlockchainImporter; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcTestMethodsFactory; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.CallParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.BlockchainImporter; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcTestMethodsFactory; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.CallParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.net.URL; import java.util.Map; @@ -31,12 +31,12 @@ public class EthEstimateGasIntegrationTest { final URL blocksUrl = EthGetBlockByNumberIntegrationTest.class .getClassLoader() - .getResource("net/consensys/pantheon/ethereum/jsonrpc/jsonRpcTestBlockchain.blocks"); + .getResource("tech/pegasys/pantheon/ethereum/jsonrpc/jsonRpcTestBlockchain.blocks"); final URL genesisJsonUrl = EthGetBlockByNumberIntegrationTest.class .getClassLoader() - .getResource("net/consensys/pantheon/ethereum/jsonrpc/jsonRpcTestGenesis.json"); + .getResource("tech/pegasys/pantheon/ethereum/jsonrpc/jsonRpcTestGenesis.json"); assertThat(blocksUrl).isNotNull(); assertThat(genesisJsonUrl).isNotNull(); diff --git a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetBlockByHashIntegrationTest.java b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetBlockByHashIntegrationTest.java index 905c597222..14f085a8d6 100644 --- a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetBlockByHashIntegrationTest.java +++ b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetBlockByHashIntegrationTest.java @@ -1,34 +1,34 @@ -package net.consensys.pantheon.ethereum.jsonrpc.methods; - -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.COINBASE; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.DIFFICULTY; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.EXTRA_DATA; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_LIMIT; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_USED; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.LOGS_BLOOM; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.MIX_HASH; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NONCE; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NUMBER; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.OMMERS_HASH; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.PARENT_HASH; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.RECEIPTS_ROOT; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.SIZE; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.STATE_ROOT; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TIMESTAMP; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT; -import static org.assertj.core.api.Assertions.assertThat; +package tech.pegasys.pantheon.ethereum.jsonrpc.methods; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.BlockchainImporter; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseUtils; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcTestMethodsFactory; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.TransactionResult; +import static org.assertj.core.api.Assertions.assertThat; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.COINBASE; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.DIFFICULTY; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.EXTRA_DATA; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_LIMIT; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_USED; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.LOGS_BLOOM; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.MIX_HASH; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NONCE; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NUMBER; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.OMMERS_HASH; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.PARENT_HASH; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.RECEIPTS_ROOT; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.SIZE; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.STATE_ROOT; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TIMESTAMP; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT; + +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.jsonrpc.BlockchainImporter; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseUtils; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcTestMethodsFactory; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.TransactionResult; import java.net.URL; import java.util.EnumMap; @@ -56,12 +56,12 @@ public class EthGetBlockByHashIntegrationTest { final URL blocksUrl = EthGetBlockByNumberIntegrationTest.class .getClassLoader() - .getResource("net/consensys/pantheon/ethereum/jsonrpc/jsonRpcTestBlockchain.blocks"); + .getResource("tech/pegasys/pantheon/ethereum/jsonrpc/jsonRpcTestBlockchain.blocks"); final URL genesisJsonUrl = EthGetBlockByNumberIntegrationTest.class .getClassLoader() - .getResource("net/consensys/pantheon/ethereum/jsonrpc/jsonRpcTestGenesis.json"); + .getResource("tech/pegasys/pantheon/ethereum/jsonrpc/jsonRpcTestGenesis.json"); assertThat(blocksUrl).isNotNull(); assertThat(genesisJsonUrl).isNotNull(); diff --git a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetBlockByNumberIntegrationTest.java b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetBlockByNumberIntegrationTest.java index be7aaf8f8b..1b9118e819 100644 --- a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetBlockByNumberIntegrationTest.java +++ b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetBlockByNumberIntegrationTest.java @@ -1,35 +1,35 @@ -package net.consensys.pantheon.ethereum.jsonrpc.methods; - -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.COINBASE; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.DIFFICULTY; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.EXTRA_DATA; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_LIMIT; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_USED; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.LOGS_BLOOM; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.MIX_HASH; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NONCE; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NUMBER; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.OMMERS_HASH; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.PARENT_HASH; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.RECEIPTS_ROOT; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.SIZE; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.STATE_ROOT; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TIMESTAMP; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT; +package tech.pegasys.pantheon.ethereum.jsonrpc.methods; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; - -import net.consensys.pantheon.ethereum.jsonrpc.BlockchainImporter; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseUtils; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcTestMethodsFactory; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.TransactionResult; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.COINBASE; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.DIFFICULTY; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.EXTRA_DATA; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_LIMIT; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_USED; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.LOGS_BLOOM; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.MIX_HASH; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NONCE; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NUMBER; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.OMMERS_HASH; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.PARENT_HASH; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.RECEIPTS_ROOT; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.SIZE; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.STATE_ROOT; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TIMESTAMP; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT; + +import tech.pegasys.pantheon.ethereum.jsonrpc.BlockchainImporter; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseUtils; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcTestMethodsFactory; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.TransactionResult; import java.net.URL; import java.util.EnumMap; @@ -60,12 +60,12 @@ public class EthGetBlockByNumberIntegrationTest { final URL blocksUrl = EthGetBlockByNumberIntegrationTest.class .getClassLoader() - .getResource("net/consensys/pantheon/ethereum/jsonrpc/jsonRpcTestBlockchain.blocks"); + .getResource("tech/pegasys/pantheon/ethereum/jsonrpc/jsonRpcTestBlockchain.blocks"); final URL genesisJsonUrl = EthGetBlockByNumberIntegrationTest.class .getClassLoader() - .getResource("net/consensys/pantheon/ethereum/jsonrpc/jsonRpcTestGenesis.json"); + .getResource("tech/pegasys/pantheon/ethereum/jsonrpc/jsonRpcTestGenesis.json"); assertThat(blocksUrl).isNotNull(); assertThat(genesisJsonUrl).isNotNull(); diff --git a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetFilterChangesIntegrationTest.java b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetFilterChangesIntegrationTest.java index 1fe7aac6b2..357b8b8603 100644 --- a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetFilterChangesIntegrationTest.java +++ b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetFilterChangesIntegrationTest.java @@ -1,43 +1,43 @@ -package net.consensys.pantheon.ethereum.jsonrpc.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.methods; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.core.TransactionPool.TransactionBatchAddedListener; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterIdGenerator; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetFilterChanges; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +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.PendingTransactions; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.core.TransactionPool.TransactionBatchAddedListener; +import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterIdGenerator; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetFilterChanges; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.List; diff --git a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetUncleByBlockHashAndIndexIntegrationTest.java b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetUncleByBlockHashAndIndexIntegrationTest.java index 68065e1b13..7e0043b2e6 100644 --- a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetUncleByBlockHashAndIndexIntegrationTest.java +++ b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetUncleByBlockHashAndIndexIntegrationTest.java @@ -1,32 +1,32 @@ -package net.consensys.pantheon.ethereum.jsonrpc.methods; - -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.COINBASE; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.DIFFICULTY; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.EXTRA_DATA; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_LIMIT; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_USED; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.LOGS_BLOOM; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.MIX_HASH; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NONCE; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NUMBER; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.OMMERS_HASH; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.PARENT_HASH; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.RECEIPTS_ROOT; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.SIZE; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.STATE_ROOT; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TIMESTAMP; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT; -import static org.assertj.core.api.Assertions.assertThat; +package tech.pegasys.pantheon.ethereum.jsonrpc.methods; -import net.consensys.pantheon.ethereum.jsonrpc.BlockchainImporter; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseUtils; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcTestMethodsFactory; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import static org.assertj.core.api.Assertions.assertThat; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.COINBASE; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.DIFFICULTY; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.EXTRA_DATA; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_LIMIT; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_USED; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.LOGS_BLOOM; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.MIX_HASH; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NONCE; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NUMBER; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.OMMERS_HASH; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.PARENT_HASH; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.RECEIPTS_ROOT; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.SIZE; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.STATE_ROOT; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TIMESTAMP; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT; + +import tech.pegasys.pantheon.ethereum.jsonrpc.BlockchainImporter; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseUtils; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcTestMethodsFactory; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.net.URL; import java.util.EnumMap; @@ -51,12 +51,12 @@ public class EthGetUncleByBlockHashAndIndexIntegrationTest { final URL blocksUrl = EthGetUncleByBlockHashAndIndexIntegrationTest.class .getClassLoader() - .getResource("net/consensys/pantheon/ethereum/jsonrpc/jsonRpcTestBlockchain.blocks"); + .getResource("tech/pegasys/pantheon/ethereum/jsonrpc/jsonRpcTestBlockchain.blocks"); final URL genesisJsonUrl = EthGetUncleByBlockHashAndIndexIntegrationTest.class .getClassLoader() - .getResource("net/consensys/pantheon/ethereum/jsonrpc/jsonRpcTestGenesis.json"); + .getResource("tech/pegasys/pantheon/ethereum/jsonrpc/jsonRpcTestGenesis.json"); assertThat(blocksUrl).isNotNull(); assertThat(genesisJsonUrl).isNotNull(); diff --git a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetUncleByBlockNumberAndIndexIntegrationTest.java b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetUncleByBlockNumberAndIndexIntegrationTest.java index f63aa2e23e..7de0eace79 100644 --- a/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetUncleByBlockNumberAndIndexIntegrationTest.java +++ b/ethereum/jsonrpc/src/integration-test/java/tech/pegasys/pantheon/ethereum/jsonrpc/methods/EthGetUncleByBlockNumberAndIndexIntegrationTest.java @@ -1,32 +1,32 @@ -package net.consensys.pantheon.ethereum.jsonrpc.methods; - -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.COINBASE; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.DIFFICULTY; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.EXTRA_DATA; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_LIMIT; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_USED; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.LOGS_BLOOM; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.MIX_HASH; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NONCE; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NUMBER; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.OMMERS_HASH; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.PARENT_HASH; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.RECEIPTS_ROOT; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.SIZE; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.STATE_ROOT; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TIMESTAMP; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT; -import static org.assertj.core.api.Assertions.assertThat; +package tech.pegasys.pantheon.ethereum.jsonrpc.methods; -import net.consensys.pantheon.ethereum.jsonrpc.BlockchainImporter; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcResponseUtils; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcTestMethodsFactory; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import static org.assertj.core.api.Assertions.assertThat; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.COINBASE; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.DIFFICULTY; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.EXTRA_DATA; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_LIMIT; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.GAS_USED; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.LOGS_BLOOM; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.MIX_HASH; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NONCE; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.NUMBER; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.OMMERS_HASH; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.PARENT_HASH; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.RECEIPTS_ROOT; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.SIZE; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.STATE_ROOT; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TIMESTAMP; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT; + +import tech.pegasys.pantheon.ethereum.jsonrpc.BlockchainImporter; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseKey; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcResponseUtils; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcTestMethodsFactory; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.net.URL; import java.util.EnumMap; @@ -51,12 +51,12 @@ public class EthGetUncleByBlockNumberAndIndexIntegrationTest { final URL blocksUrl = EthGetBlockByNumberIntegrationTest.class .getClassLoader() - .getResource("net/consensys/pantheon/ethereum/jsonrpc/jsonRpcTestBlockchain.blocks"); + .getResource("tech/pegasys/pantheon/ethereum/jsonrpc/jsonRpcTestBlockchain.blocks"); final URL genesisJsonUrl = EthGetBlockByNumberIntegrationTest.class .getClassLoader() - .getResource("net/consensys/pantheon/ethereum/jsonrpc/jsonRpcTestGenesis.json"); + .getResource("tech/pegasys/pantheon/ethereum/jsonrpc/jsonRpcTestGenesis.json"); assertThat(blocksUrl).isNotNull(); assertThat(genesisJsonUrl).isNotNull(); diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcConfiguration.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcConfiguration.java index fb56a27f23..02dcafd0a8 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcConfiguration.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcConfiguration.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc; +package tech.pegasys.pantheon.ethereum.jsonrpc; import java.util.Arrays; import java.util.Collection; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcErrorConverter.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcErrorConverter.java index 3ad0285877..188efe737c 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcErrorConverter.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcErrorConverter.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc; +package tech.pegasys.pantheon.ethereum.jsonrpc; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; public class JsonRpcErrorConverter { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpService.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpService.java index f11fb02548..b7d1d888e5 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpService.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpService.java @@ -1,19 +1,19 @@ -package net.consensys.pantheon.ethereum.jsonrpc; +package tech.pegasys.pantheon.ethereum.jsonrpc; import static com.google.common.base.Preconditions.checkArgument; import static java.util.stream.Collectors.toList; -import static net.consensys.pantheon.util.NetworkUtility.urlForSocketAddress; - -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequestId; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcNoResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponseType; -import net.consensys.pantheon.util.NetworkUtility; +import static tech.pegasys.pantheon.util.NetworkUtility.urlForSocketAddress; + +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequestId; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcNoResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponseType; +import tech.pegasys.pantheon.util.NetworkUtility; import java.net.BindException; import java.net.InetSocketAddress; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcMethodsFactory.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcMethodsFactory.java index 3921fa1f55..3267101efa 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcMethodsFactory.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcMethodsFactory.java @@ -1,68 +1,68 @@ -package net.consensys.pantheon.ethereum.jsonrpc; +package tech.pegasys.pantheon.ethereum.jsonrpc; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Synchronizer; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterIdGenerator; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.AdminPeers; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.DebugStorageRangeAt; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.DebugTraceTransaction; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthAccounts; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthBlockNumber; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthCall; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthCoinbase; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthEstimateGas; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGasPrice; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetBalance; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetBlockByHash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetBlockByNumber; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetBlockTransactionCountByHash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetBlockTransactionCountByNumber; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetCode; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetFilterChanges; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetFilterLogs; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetLogs; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetStorageAt; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionByBlockHashAndIndex; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionByBlockNumberAndIndex; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionByHash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionCount; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionReceipt; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetUncleByBlockHashAndIndex; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetUncleByBlockNumberAndIndex; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetUncleCountByBlockHash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetUncleCountByBlockNumber; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthMining; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthNewBlockFilter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthNewFilter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthNewPendingTransactionFilter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthProtocolVersion; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthSendRawTransaction; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthSyncing; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthUninstallFilter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.NetListening; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.NetPeerCount; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.NetVersion; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.Web3ClientVersion; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.Web3Sha3; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.miner.MinerSetCoinbase; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.miner.MinerSetEtherbase; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.miner.MinerStart; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.miner.MinerStop; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.BlockReplay; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.TransactionTracer; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessor; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.BlockResultFactory; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; +import tech.pegasys.pantheon.ethereum.chain.Blockchain; +import tech.pegasys.pantheon.ethereum.core.Synchronizer; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterIdGenerator; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.AdminPeers; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.DebugStorageRangeAt; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.DebugTraceTransaction; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthAccounts; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthBlockNumber; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthCall; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthCoinbase; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthEstimateGas; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGasPrice; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetBalance; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetBlockByHash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetBlockByNumber; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetBlockTransactionCountByHash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetBlockTransactionCountByNumber; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetCode; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetFilterChanges; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetFilterLogs; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetLogs; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetStorageAt; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionByBlockHashAndIndex; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionByBlockNumberAndIndex; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionByHash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionCount; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionReceipt; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetUncleByBlockHashAndIndex; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetUncleByBlockNumberAndIndex; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetUncleCountByBlockHash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetUncleCountByBlockNumber; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthMining; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthNewBlockFilter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthNewFilter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthNewPendingTransactionFilter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthProtocolVersion; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthSendRawTransaction; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthSyncing; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthUninstallFilter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.NetListening; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.NetPeerCount; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.NetVersion; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.Web3ClientVersion; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.Web3Sha3; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.miner.MinerSetCoinbase; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.miner.MinerSetEtherbase; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.miner.MinerStart; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.miner.MinerStop; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.BlockReplay; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.TransactionTracer; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessor; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.BlockResultFactory; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; import java.util.Collection; import java.util.HashMap; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcServiceException.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcServiceException.java index 960db63839..78d48ad50f 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcServiceException.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcServiceException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc; +package tech.pegasys.pantheon.ethereum.jsonrpc; public class JsonRpcServiceException extends RuntimeException { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/JsonRpcRequest.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/JsonRpcRequest.java index 4d13f29fa1..6b8fed41dc 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/JsonRpcRequest.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/JsonRpcRequest.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcRequestException; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcRequestException; import java.util.Arrays; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/JsonRpcRequestId.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/JsonRpcRequestId.java index 3430d30113..c724fde3a8 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/JsonRpcRequestId.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/JsonRpcRequestId.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcRequestException; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcRequestException; import java.math.BigInteger; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/exception/InvalidJsonRpcParameters.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/exception/InvalidJsonRpcParameters.java index 869eb8edf6..4d1b5a85d5 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/exception/InvalidJsonRpcParameters.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/exception/InvalidJsonRpcParameters.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.exception; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception; public class InvalidJsonRpcParameters extends InvalidJsonRpcRequestException { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/exception/InvalidJsonRpcRequestException.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/exception/InvalidJsonRpcRequestException.java index 705beb040a..e717515038 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/exception/InvalidJsonRpcRequestException.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/exception/InvalidJsonRpcRequestException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.exception; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception; public class InvalidJsonRpcRequestException extends IllegalArgumentException { public InvalidJsonRpcRequestException(final String message) { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterIdGenerator.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterIdGenerator.java index fcd0acb945..cd9ede2fe5 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterIdGenerator.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterIdGenerator.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.filter; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter; import java.util.UUID; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterManager.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterManager.java index 233bb7372a..c3b627ea2d 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterManager.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterManager.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.filter; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter; import static com.google.common.base.Preconditions.checkNotNull; -import net.consensys.pantheon.ethereum.chain.BlockAddedEvent; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; +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.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/LogsQuery.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/LogsQuery.java index 6b2e07f928..c30fd0e838 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/LogsQuery.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/LogsQuery.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.filter; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Log; -import net.consensys.pantheon.ethereum.core.LogTopic; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.TopicsParameter; +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.ethereum.jsonrpc.internal.parameters.TopicsParameter; import java.util.Arrays; import java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/AbstractBlockParameterMethod.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/AbstractBlockParameterMethod.java index a1d5377836..4acf5bc0ed 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/AbstractBlockParameterMethod.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/AbstractBlockParameterMethod.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.util.OptionalLong; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/AdminPeers.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/AdminPeers.java index 00173c6b2d..801f4d79ed 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/AdminPeers.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/AdminPeers.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.PeerResult; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.PeerResult; +import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; import java.util.List; import java.util.stream.Collectors; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/DebugStorageRangeAt.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/DebugStorageRangeAt.java index e5fa6684ff..17f56c0e19 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/DebugStorageRangeAt.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/DebugStorageRangeAt.java @@ -1,19 +1,19 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.BlockReplay; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.DebugStorageRangeAtResult; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +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.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.BlockReplay; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.DebugStorageRangeAtResult; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.NavigableMap; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/DebugTraceTransaction.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/DebugTraceTransaction.java index 6929c70533..89d30cd8c2 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/DebugTraceTransaction.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/DebugTraceTransaction.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; - -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.debug.TraceOptions; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.TransactionTraceParams; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.TransactionTracer; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.DebugTraceTransactionResult; -import net.consensys.pantheon.ethereum.vm.DebugOperationTracer; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; + +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.debug.TraceOptions; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.TransactionTraceParams; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.TransactionTracer; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.DebugTraceTransactionResult; +import tech.pegasys.pantheon.ethereum.vm.DebugOperationTracer; import java.util.Optional; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthAccounts.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthAccounts.java index bc38fc282c..6cda234a78 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthAccounts.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthAccounts.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; public class EthAccounts implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthBlockNumber.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthBlockNumber.java index 48d373aa8e..204f5c92b7 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthBlockNumber.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthBlockNumber.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.Quantity; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity; public class EthBlockNumber implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthCall.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthCall.java index 53bcd19cfb..160241dc89 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthCall.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthCall.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcErrorConverter.convertTransactionInvalidReason; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcErrorConverter.convertTransactionInvalidReason; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.CallParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessor; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.CallParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessor; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; public class EthCall extends AbstractBlockParameterMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthCoinbase.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthCoinbase.java index eb21d2a3f0..bdcf4491b0 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthCoinbase.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthCoinbase.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.util.Optional; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthEstimateGas.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthEstimateGas.java index a0bff4a24c..3d08ff1b8e 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthEstimateGas.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthEstimateGas.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.CallParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessingResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessor; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.Quantity; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.CallParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessingResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessor; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity; import java.util.function.Function; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGasPrice.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGasPrice.java index fa4b23a74a..85890ac9cd 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGasPrice.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGasPrice.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.blockcreation.AbstractBlockCreator; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; -import net.consensys.pantheon.ethereum.blockcreation.BlockMiner; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.Quantity; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractBlockCreator; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; +import tech.pegasys.pantheon.ethereum.blockcreation.BlockMiner; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity; public class EthGasPrice>> implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBalance.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBalance.java index 98dcbb09f8..4f4f1fac79 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBalance.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBalance.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.Quantity; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity; public class EthGetBalance extends AbstractBlockParameterMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockByHash.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockByHash.java index 29a326c2f1..57a1cefde9 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockByHash.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockByHash.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; - -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.BlockResultFactory; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; + +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.BlockResultFactory; public class EthGetBlockByHash implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockByNumber.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockByNumber.java index 0d15fb7a8e..4d7850d6b1 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockByNumber.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockByNumber.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; - -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.BlockResultFactory; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; + +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.BlockResultFactory; public class EthGetBlockByNumber extends AbstractBlockParameterMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockTransactionCountByHash.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockTransactionCountByHash.java index 4fbdfde8e7..ccfcbe7f89 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockTransactionCountByHash.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockTransactionCountByHash.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.Quantity; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity; public class EthGetBlockTransactionCountByHash implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockTransactionCountByNumber.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockTransactionCountByNumber.java index 2e847fbff0..55884b001e 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockTransactionCountByNumber.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockTransactionCountByNumber.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.Quantity; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity; public class EthGetBlockTransactionCountByNumber extends AbstractBlockParameterMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetCode.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetCode.java index 0aaf7ce1f3..2415ed0984 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetCode.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetCode.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.util.bytes.BytesValue; public class EthGetCode extends AbstractBlockParameterMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetFilterChanges.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetFilterChanges.java index 83f4de2db1..e778aa9bc2 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetFilterChanges.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetFilterChanges.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; - -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.LogsResult; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; + +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.LogsResult; import java.util.List; import java.util.stream.Collectors; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetFilterLogs.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetFilterLogs.java index 0b68878f7a..8977baeedb 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetFilterLogs.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetFilterLogs.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; - -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.LogsResult; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; + +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.LogsResult; import java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetLogs.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetLogs.java index 8183894789..1907ccefd7 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetLogs.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetLogs.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; - -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.LogsQuery; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.LogsResult; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; + +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.LogsQuery; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.LogsResult; public class EthGetLogs implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetStorageAt.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetStorageAt.java index 8e38f5254d..d000698789 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetStorageAt.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetStorageAt.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.UInt256Parameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.UInt256Parameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.util.uint.UInt256; public class EthGetStorageAt extends AbstractBlockParameterMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndex.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndex.java index 7efaf276a9..5693c98af8 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndex.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndex.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.UnsignedIntParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.TransactionCompleteResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.TransactionResult; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.UnsignedIntParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.TransactionCompleteResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.TransactionResult; public class EthGetTransactionByBlockHashAndIndex implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionByBlockNumberAndIndex.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionByBlockNumberAndIndex.java index 1813eb4524..f81369e746 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionByBlockNumberAndIndex.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionByBlockNumberAndIndex.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.UnsignedIntParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.TransactionCompleteResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.UnsignedIntParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.TransactionCompleteResult; public class EthGetTransactionByBlockNumberAndIndex extends AbstractBlockParameterMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionByHash.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionByHash.java index 37df8dae0e..3952413c4f 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionByHash.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionByHash.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; - -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.TransactionCompleteResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.TransactionPendingResult; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; + +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.PendingTransactions; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.TransactionCompleteResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.TransactionPendingResult; import java.util.Optional; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionCount.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionCount.java index afce1983d5..bf689e7c69 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionCount.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionCount.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; - -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.Quantity; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; + +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.PendingTransactions; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity; import java.util.Optional; import java.util.OptionalLong; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionReceipt.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionReceipt.java index a589be6ddb..ae63e7c6b2 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionReceipt.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionReceipt.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionReceiptWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.TransactionReceiptResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.TransactionReceiptRootResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.TransactionReceiptStatusResult; -import net.consensys.pantheon.ethereum.mainnet.TransactionReceiptType; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionReceiptWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.TransactionReceiptResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.TransactionReceiptRootResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.TransactionReceiptStatusResult; +import tech.pegasys.pantheon.ethereum.mainnet.TransactionReceiptType; public class EthGetTransactionReceipt implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndex.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndex.java index 3a4204a73f..1f68994b2f 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndex.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndex.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; - -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.UnsignedIntParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.UncleBlockResult; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; + +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.UnsignedIntParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.UncleBlockResult; public class EthGetUncleByBlockHashAndIndex implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndex.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndex.java index 7620163ab5..863cb8b783 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndex.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndex.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.UnsignedIntParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.UncleBlockResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.UnsignedIntParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.UncleBlockResult; public class EthGetUncleByBlockNumberAndIndex extends AbstractBlockParameterMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleCountByBlockHash.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleCountByBlockHash.java index 57e06a5ef9..e43fbbb871 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleCountByBlockHash.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleCountByBlockHash.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.Quantity; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity; public class EthGetUncleCountByBlockHash implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleCountByBlockNumber.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleCountByBlockNumber.java index 9ac56e57de..72902e3be9 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleCountByBlockNumber.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleCountByBlockNumber.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.Quantity; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity; public class EthGetUncleCountByBlockNumber extends AbstractBlockParameterMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthMining.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthMining.java index 9c562eb662..163ce5fd1c 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthMining.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthMining.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.blockcreation.AbstractBlockCreator; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; -import net.consensys.pantheon.ethereum.blockcreation.BlockMiner; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractBlockCreator; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; +import tech.pegasys.pantheon.ethereum.blockcreation.BlockMiner; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; public class EthMining>> implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewBlockFilter.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewBlockFilter.java index c52923adb6..36b973c25d 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewBlockFilter.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewBlockFilter.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; public class EthNewBlockFilter implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewFilter.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewFilter.java index 209f69d0e9..23ca3af4dc 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewFilter.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewFilter.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; - -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.LogsQuery; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; + +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.LogsQuery; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; public class EthNewFilter implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewPendingTransactionFilter.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewPendingTransactionFilter.java index ffeff5f7f3..a3b21cdc42 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewPendingTransactionFilter.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewPendingTransactionFilter.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; public class EthNewPendingTransactionFilter implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthProtocolVersion.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthProtocolVersion.java index f2077b944d..b00e5dbc2b 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthProtocolVersion.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthProtocolVersion.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.eth.EthProtocol; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.eth.EthProtocol; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; import java.util.OptionalInt; import java.util.Set; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthSendRawTransaction.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthSendRawTransaction.java index fb6e9a9ad4..8b26dbb670 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthSendRawTransaction.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthSendRawTransaction.java @@ -1,21 +1,21 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import static net.consensys.pantheon.ethereum.jsonrpc.JsonRpcErrorConverter.convertTransactionInvalidReason; +import static tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcErrorConverter.convertTransactionInvalidReason; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcRequestException; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import net.consensys.pantheon.ethereum.mainnet.ValidationResult; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.rlp.RLPException; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcRequestException; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +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.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthSyncing.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthSyncing.java index 497835a3f7..4b029e0504 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthSyncing.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthSyncing.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.core.Synchronizer; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.SyncingResult; +import tech.pegasys.pantheon.ethereum.core.Synchronizer; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.SyncingResult; /* * SyncProgress retrieves the current progress of the syncing algorithm. If there's no sync diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthUninstallFilter.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthUninstallFilter.java index 1cd7ff1a75..07df62d898 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthUninstallFilter.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthUninstallFilter.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; public class EthUninstallFilter implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/JsonRpcMethod.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/JsonRpcMethod.java index 2719a85306..2da01e7278 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/JsonRpcMethod.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/JsonRpcMethod.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; public interface JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetListening.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetListening.java index 0cc7049acc..b485387a94 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetListening.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetListening.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; public class NetListening implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetPeerCount.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetPeerCount.java index 0da6b2f1af..2c794c1faf 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetPeerCount.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetPeerCount.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.Quantity; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity; +import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; public class NetPeerCount implements JsonRpcMethod { private final P2PNetwork p2pNetwork; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetVersion.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetVersion.java index d0826cec7d..45cd45cf4a 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetVersion.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetVersion.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; /** * In Consensys' client, net_version maps to the network id, as specified in * diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/Web3ClientVersion.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/Web3ClientVersion.java index 0521f6d5f1..1058e436cf 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/Web3ClientVersion.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/Web3ClientVersion.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; public class Web3ClientVersion implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/Web3Sha3.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/Web3Sha3.java index 1a87861b0b..e1923d3623 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/Web3Sha3.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/Web3Sha3.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; - -import net.consensys.pantheon.crypto.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.util.bytes.BytesValue; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; + +import tech.pegasys.pantheon.crypto.Hash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.util.bytes.BytesValue; public class Web3Sha3 implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerSetCoinbase.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerSetCoinbase.java index eb63a13a12..49163c4198 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerSetCoinbase.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerSetCoinbase.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods.miner; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.miner; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; public class MinerSetCoinbase implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerSetEtherbase.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerSetEtherbase.java index 30d64a0f58..47e1de084c 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerSetEtherbase.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerSetEtherbase.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods.miner; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.miner; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; public class MinerSetEtherbase implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerStart.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerStart.java index ff4ae34ea7..789226b698 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerStart.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerStart.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods.miner; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.miner; -import net.consensys.pantheon.ethereum.blockcreation.AbstractBlockCreator; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; -import net.consensys.pantheon.ethereum.blockcreation.BlockMiner; -import net.consensys.pantheon.ethereum.blockcreation.CoinbaseNotSetException; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractBlockCreator; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; +import tech.pegasys.pantheon.ethereum.blockcreation.BlockMiner; +import tech.pegasys.pantheon.ethereum.blockcreation.CoinbaseNotSetException; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; public class MinerStart>> implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerStop.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerStop.java index f16d5a62fd..339a2a34ed 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerStop.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerStop.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods.miner; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.miner; -import net.consensys.pantheon.ethereum.blockcreation.AbstractBlockCreator; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; -import net.consensys.pantheon.ethereum.blockcreation.BlockMiner; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractBlockCreator; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; +import tech.pegasys.pantheon.ethereum.blockcreation.BlockMiner; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; public class MinerStop>> implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/BlockParameter.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/BlockParameter.java index bc7a67f7fd..1f55155dcf 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/BlockParameter.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/BlockParameter.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.parameters; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters; -import net.consensys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; import java.util.Objects; import java.util.OptionalLong; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/CallParameter.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/CallParameter.java index 9cbd46dd8c..b664cac4f6 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/CallParameter.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/CallParameter.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.parameters; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.util.bytes.BytesValue; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/FilterParameter.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/FilterParameter.java index 95150b3e96..9ca37da3bf 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/FilterParameter.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/FilterParameter.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.parameters; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.Hash; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/JsonRpcParameter.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/JsonRpcParameter.java index 20de07aca6..c122197eb1 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/JsonRpcParameter.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/JsonRpcParameter.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.parameters; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/TopicsParameter.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/TopicsParameter.java index a3c1198f63..b524e8cdf8 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/TopicsParameter.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/TopicsParameter.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.parameters; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters; -import net.consensys.pantheon.ethereum.core.LogTopic; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.LogTopic; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/UInt256Parameter.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/UInt256Parameter.java index 92389fb598..1284d85c75 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/UInt256Parameter.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/UInt256Parameter.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.parameters; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.util.uint.UInt256; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/UnsignedIntParameter.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/UnsignedIntParameter.java index a384b034f6..5c5fa332be 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/UnsignedIntParameter.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/UnsignedIntParameter.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.parameters; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters; import static com.google.common.base.Preconditions.checkArgument; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/UnsignedLongParameter.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/UnsignedLongParameter.java index 2a0c0c94a2..074a69ca0b 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/UnsignedLongParameter.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/UnsignedLongParameter.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.parameters; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters; import static com.google.common.base.Preconditions.checkArgument; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/BlockReplay.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/BlockReplay.java index 2352c239aa..abb72b2e6e 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/BlockReplay.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/BlockReplay.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.processor; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor; -import net.consensys.pantheon.ethereum.vm.BlockHashLookup; +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.MutableWorldState; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +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.vm.BlockHashLookup; import java.util.Optional; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransactionTrace.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransactionTrace.java index f61f801d72..9bad34edcd 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransactionTrace.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransactionTrace.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.processor; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.debug.TraceFrame; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor.Result; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.debug.TraceFrame; +import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor.Result; import java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransactionTraceParams.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransactionTraceParams.java index 0920b10666..77efadd81d 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransactionTraceParams.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransactionTraceParams.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.processor; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor; -import net.consensys.pantheon.ethereum.debug.TraceOptions; +import tech.pegasys.pantheon.ethereum.debug.TraceOptions; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransactionTracer.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransactionTracer.java index 2714b2e656..00d07a092c 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransactionTracer.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransactionTracer.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.processor; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor.Result; -import net.consensys.pantheon.ethereum.vm.BlockHashLookup; -import net.consensys.pantheon.ethereum.vm.DebugOperationTracer; +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 java.util.Optional; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransientTransactionProcessingResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransientTransactionProcessingResult.java index 7d9006d63a..8848cc1547 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransientTransactionProcessingResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransientTransactionProcessingResult.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.processor; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor.Result; -import net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import net.consensys.pantheon.ethereum.mainnet.ValidationResult; -import net.consensys.pantheon.util.bytes.BytesValue; +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 com.google.common.base.Objects; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransientTransactionProcessor.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransientTransactionProcessor.java index c5688ba931..4c833b6760 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransientTransactionProcessor.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransientTransactionProcessor.java @@ -1,20 +1,20 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.processor; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.CallParameter; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor; -import net.consensys.pantheon.ethereum.vm.BlockHashLookup; -import net.consensys.pantheon.util.bytes.BytesValue; +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.MutableWorldState; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.CallParameter; +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.vm.BlockHashLookup; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/BlockWithMetadata.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/BlockWithMetadata.java index 68f0f3204d..f70913fdcf 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/BlockWithMetadata.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/BlockWithMetadata.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.queries; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/BlockchainQueries.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/BlockchainQueries.java index 4ef03fab00..d04581430e 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/BlockchainQueries.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/BlockchainQueries.java @@ -1,23 +1,23 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.queries; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.chain.TransactionLocation; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.LogsQuery; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.LogsQuery; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/LogWithMetadata.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/LogWithMetadata.java index cfa7296cee..951686e1d6 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/LogWithMetadata.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/LogWithMetadata.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.queries; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.LogTopic; -import net.consensys.pantheon.util.bytes.BytesValue; +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 java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/TransactionReceiptWithMetadata.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/TransactionReceiptWithMetadata.java index c3bbde9bd9..8f893e44fa 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/TransactionReceiptWithMetadata.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/TransactionReceiptWithMetadata.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.queries; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; public class TransactionReceiptWithMetadata { private final TransactionReceipt receipt; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/TransactionWithMetadata.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/TransactionWithMetadata.java index d95d35cbbf..63c3258e30 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/TransactionWithMetadata.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/TransactionWithMetadata.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.queries; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.Transaction; public class TransactionWithMetadata { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcError.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcError.java index 9fc8675254..c0c0bf698a 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcError.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcError.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.response; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.response; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcErrorResponse.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcErrorResponse.java index 96422caa1d..95ac82b3fe 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcErrorResponse.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcErrorResponse.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.response; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.response; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcNoResponse.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcNoResponse.java index c90e67d8e6..3a242338f3 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcNoResponse.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcNoResponse.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.response; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.response; public class JsonRpcNoResponse implements JsonRpcResponse { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcResponse.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcResponse.java index 5fc0b7ec0b..1f2eddcb4e 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcResponse.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcResponse.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.response; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.response; import com.fasterxml.jackson.annotation.JsonGetter; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcResponseType.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcResponseType.java index b96095e3f2..5c169485e0 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcResponseType.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcResponseType.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.response; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.response; /** Various types of responses that the JSON-RPC component may produce. */ public enum JsonRpcResponseType { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcSuccessResponse.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcSuccessResponse.java index 6ba174a350..8fb7c4a1ee 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcSuccessResponse.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/response/JsonRpcSuccessResponse.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.response; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.response; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/BlockResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/BlockResult.java index 4ba0f32aca..59df537a8a 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/BlockResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/BlockResult.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/BlockResultFactory.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/BlockResultFactory.java index 18868689e4..1f6baf5df0 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/BlockResultFactory.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/BlockResultFactory.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; import java.util.List; import java.util.stream.Collectors; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/DebugStorageRangeAtResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/DebugStorageRangeAtResult.java index b7f588cf1a..ba95b26682 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/DebugStorageRangeAtResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/DebugStorageRangeAtResult.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.HashMap; import java.util.Map; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/DebugTraceTransactionResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/DebugTraceTransactionResult.java index be72d0d991..c307f682fc 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/DebugTraceTransactionResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/DebugTraceTransactionResult.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.ethereum.debug.TraceFrame; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.TransactionTrace; +import tech.pegasys.pantheon.ethereum.debug.TraceFrame; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.TransactionTrace; import java.util.List; import java.util.stream.Collectors; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/JsonRpcResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/JsonRpcResult.java index a6c2feaba6..5369a5cd92 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/JsonRpcResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/JsonRpcResult.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/LogResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/LogResult.java index 5b473b4fbe..e3d2d76e89 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/LogResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/LogResult.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.ethereum.core.LogTopic; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; +import tech.pegasys.pantheon.ethereum.core.LogTopic; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/LogsResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/LogsResult.java index 344983341d..7306f0f474 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/LogsResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/LogsResult.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/NetworkResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/NetworkResult.java index 096cdaba91..92ede58eb6 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/NetworkResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/NetworkResult.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; import java.net.SocketAddress; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/PeerResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/PeerResult.java index 8649463198..728875d491 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/PeerResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/PeerResult.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; import java.util.List; import java.util.stream.Collectors; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/Quantity.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/Quantity.java index 6cf55c8346..d1981909ec 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/Quantity.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/Quantity.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.util.uint.UInt256; -import net.consensys.pantheon.util.uint.UInt256Value; +import tech.pegasys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.util.uint.UInt256Value; import java.math.BigInteger; import java.util.Objects; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/StructLog.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/StructLog.java index c2ee0d22fc..7e1d3417d6 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/StructLog.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/StructLog.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.debug.TraceFrame; -import net.consensys.pantheon.util.bytes.Bytes32s; -import net.consensys.pantheon.util.uint.UInt256; +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.uint.UInt256; import java.util.Arrays; import java.util.Map; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/StructLogWithError.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/StructLogWithError.java index 4cdde8f9af..c990af239d 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/StructLogWithError.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/StructLogWithError.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.ethereum.debug.TraceFrame; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; +import tech.pegasys.pantheon.ethereum.debug.TraceFrame; +import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; import com.fasterxml.jackson.annotation.JsonGetter; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/SyncingResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/SyncingResult.java index 35475f8ca2..c361599831 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/SyncingResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/SyncingResult.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.ethereum.core.SyncStatus; +import tech.pegasys.pantheon.ethereum.core.SyncStatus; import java.util.Objects; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionCompleteResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionCompleteResult.java index 59844c7cea..a198887d3e 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionCompleteResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionCompleteResult.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; +import tech.pegasys.pantheon.util.bytes.BytesValue; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionHashResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionHashResult.java index 6fc1a7de97..7b1a461dde 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionHashResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionHashResult.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionPendingResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionPendingResult.java index 66963ae0e5..c1c5162170 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionPendingResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionPendingResult.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.util.bytes.BytesValue; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionReceiptLogResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionReceiptLogResult.java index 7fd55a1185..de176e98ab 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionReceiptLogResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionReceiptLogResult.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Log; -import net.consensys.pantheon.ethereum.core.LogTopic; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.Log; +import tech.pegasys.pantheon.ethereum.core.LogTopic; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionReceiptResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionReceiptResult.java index eb766fa016..f4ea69a440 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionReceiptResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionReceiptResult.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; - -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Log; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionReceiptWithMetadata; -import net.consensys.pantheon.util.bytes.BytesValue; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; + +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.ethereum.jsonrpc.internal.queries.TransactionReceiptWithMetadata; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionReceiptRootResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionReceiptRootResult.java index 5114513356..a48b208b4d 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionReceiptRootResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionReceiptRootResult.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionReceiptWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionReceiptWithMetadata; import com.fasterxml.jackson.annotation.JsonGetter; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionReceiptStatusResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionReceiptStatusResult.java index 98322b8676..074abab89f 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionReceiptStatusResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionReceiptStatusResult.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionReceiptWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionReceiptWithMetadata; import com.fasterxml.jackson.annotation.JsonGetter; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionResult.java index 9d6061395d..81dd2342d8 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/TransactionResult.java @@ -1,3 +1,3 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; public interface TransactionResult {} diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/UncleBlockResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/UncleBlockResult.java index 118fcbc9d6..bbde114f32 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/UncleBlockResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/UncleBlockResult.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.util.uint.UInt256; +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 java.util.Collections; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketConfiguration.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketConfiguration.java index c557b28b09..87c24b7873 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketConfiguration.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketConfiguration.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; import java.util.Arrays; import java.util.Collection; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketRequestHandler.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketRequestHandler.java index 7d6eb212aa..d898ffc555 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketRequestHandler.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketRequestHandler.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.methods.WebSocketRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods.WebSocketRpcRequest; import java.util.Map; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketService.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketService.java index 56ce0e56d2..03663c498f 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketService.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketService.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; import java.net.InetSocketAddress; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/AbstractSubscriptionMethod.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/AbstractSubscriptionMethod.java index d9c0d98d12..828bd5b6ec 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/AbstractSubscriptionMethod.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/AbstractSubscriptionMethod.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; abstract class AbstractSubscriptionMethod implements JsonRpcMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthSubscribe.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthSubscribe.java index 271e62aec4..7aaea78b32 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthSubscribe.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthSubscribe.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.Quantity; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscribeRequest; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscribeRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; public class EthSubscribe extends AbstractSubscriptionMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthUnsubscribe.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthUnsubscribe.java index 70be489ce9..8892fddbc8 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthUnsubscribe.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthUnsubscribe.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionNotFoundException; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.UnsubscribeRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionNotFoundException; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.UnsubscribeRequest; public class EthUnsubscribe extends AbstractSubscriptionMethod { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/WebSocketMethodsFactory.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/WebSocketMethodsFactory.java index 20e95737de..37a03e43fd 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/WebSocketMethodsFactory.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/WebSocketMethodsFactory.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; import java.util.HashMap; import java.util.Map; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/WebSocketRpcRequest.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/WebSocketRpcRequest.java index 9b8eec3874..329f1b8735 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/WebSocketRpcRequest.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/WebSocketRpcRequest.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonGetter; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/Subscription.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/Subscription.java index 6c97e824e8..0a30432056 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/Subscription.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/Subscription.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionBuilder.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionBuilder.java index 041347a28a..0ba743c311 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionBuilder.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionBuilder.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.blockheaders.NewBlockHeadersSubscription; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.logs.LogsSubscription; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscribeRequest; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.syncing.SyncingSubscription; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.blockheaders.NewBlockHeadersSubscription; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.logs.LogsSubscription; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscribeRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.syncing.SyncingSubscription; import java.util.Optional; import java.util.function.Function; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionManager.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionManager.java index ee595901f9..40a273fc6c 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionManager.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionManager.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.JsonRpcResult; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscribeRequest; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.UnsubscribeRequest; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.response.SubscriptionResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.JsonRpcResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscribeRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.UnsubscribeRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.response.SubscriptionResponse; import java.util.HashMap; import java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionNotFoundException.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionNotFoundException.java index a91343cdff..7746560548 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionNotFoundException.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionNotFoundException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription; public class SubscriptionNotFoundException extends RuntimeException { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscription.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscription.java index aa6be15e2b..fe0e1a08e4 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscription.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscription.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.blockheaders; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.blockheaders; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.Subscription; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.Subscription; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; public class NewBlockHeadersSubscription extends Subscription { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionService.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionService.java index b38a0ac875..d89c62adfe 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionService.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionService.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.blockheaders; - -import net.consensys.pantheon.ethereum.chain.BlockAddedEvent; -import net.consensys.pantheon.ethereum.chain.BlockAddedObserver; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.BlockResultFactory; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.blockheaders; + +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 tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.BlockResultFactory; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; import java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/logs/LogsSubscription.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/logs/LogsSubscription.java index 17a23ebda8..fbe08e3acf 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/logs/LogsSubscription.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/logs/LogsSubscription.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.logs; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.logs; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.LogsQuery; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.Subscription; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.LogsQuery; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.Subscription; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; public class LogsSubscription extends Subscription { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/logs/LogsSubscriptionService.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/logs/LogsSubscriptionService.java index 94a60a71c3..b676abbe64 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/logs/LogsSubscriptionService.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/logs/LogsSubscriptionService.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.logs; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.logs; -import net.consensys.pantheon.ethereum.chain.BlockAddedEvent; -import net.consensys.pantheon.ethereum.chain.BlockAddedObserver; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Log; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionReceiptWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.LogResult; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; -import net.consensys.pantheon.ethereum.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 tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionReceiptWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.LogResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; import java.util.List; import java.util.Optional; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/pending/PendingTransactionResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/pending/PendingTransactionResult.java index ae2cf2f437..26b3e37121 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/pending/PendingTransactionResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/pending/PendingTransactionResult.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.pending; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.pending; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.JsonRpcResult; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.JsonRpcResult; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionService.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionService.java index 38faff5e50..d1b73b23e5 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionService.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionService.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.pending; - -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.PendingTransactionListener; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.Subscription; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.pending; + +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.PendingTransactionListener; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.Subscription; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; import java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/InvalidRequestException.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/InvalidRequestException.java index c49d53579f..c827fadd8f 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/InvalidRequestException.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/InvalidRequestException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request; public class InvalidRequestException extends RuntimeException { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/InvalidSubscriptionRequestException.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/InvalidSubscriptionRequestException.java index 08435195ec..69f7221466 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/InvalidSubscriptionRequestException.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/InvalidSubscriptionRequestException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request; public class InvalidSubscriptionRequestException extends RuntimeException { diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/LogsSubscriptionParam.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/LogsSubscriptionParam.java index 22057e3bc2..510aaaaf85 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/LogsSubscriptionParam.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/LogsSubscriptionParam.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request; import java.util.List; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/NewBlockHeadersSubscriptionParam.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/NewBlockHeadersSubscriptionParam.java index 381fb419a5..43a9b845f1 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/NewBlockHeadersSubscriptionParam.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/NewBlockHeadersSubscriptionParam.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/SubscribeRequest.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/SubscribeRequest.java index 2eaf4b186e..e680058abd 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/SubscribeRequest.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/SubscribeRequest.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; import com.google.common.base.Objects; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/SubscriptionRequestMapper.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/SubscriptionRequestMapper.java index 7aa13ff353..bd0b6dac21 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/SubscriptionRequestMapper.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/SubscriptionRequestMapper.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.UnsignedLongParameter; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.methods.WebSocketRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.UnsignedLongParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods.WebSocketRpcRequest; import java.util.Arrays; import java.util.Collections; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/SubscriptionType.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/SubscriptionType.java index b174d1033a..9fa8b0046b 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/SubscriptionType.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/SubscriptionType.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/UnsubscribeRequest.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/UnsubscribeRequest.java index fb55eee51f..d41a49cc53 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/UnsubscribeRequest.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/UnsubscribeRequest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request; import com.google.common.base.Objects; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/response/SubscriptionResponse.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/response/SubscriptionResponse.java index 404ae42ccf..fd9783b262 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/response/SubscriptionResponse.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/response/SubscriptionResponse.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.response; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.response; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.JsonRpcResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.Quantity; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.JsonRpcResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/response/SubscriptionResponseResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/response/SubscriptionResponseResult.java index e77c67f888..5bb53181db 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/response/SubscriptionResponseResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/response/SubscriptionResponseResult.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.response; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.response; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.JsonRpcResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.JsonRpcResult; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/syncing/NotSynchronisingResult.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/syncing/NotSynchronisingResult.java index d9d5f13a98..a8cd2add29 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/syncing/NotSynchronisingResult.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/syncing/NotSynchronisingResult.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.syncing; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.syncing; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.JsonRpcResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.JsonRpcResult; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/syncing/SyncingSubscription.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/syncing/SyncingSubscription.java index 8aa98d36db..590f4fd4b9 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/syncing/SyncingSubscription.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/syncing/SyncingSubscription.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.syncing; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.syncing; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.Subscription; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.Subscription; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; public class SyncingSubscription extends Subscription { private boolean firstMessageHasBeenSent = false; diff --git a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionService.java b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionService.java index 46839f1cd8..071c2c3a2d 100644 --- a/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionService.java +++ b/ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionService.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.syncing; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.syncing; -import net.consensys.pantheon.ethereum.core.SyncStatus; -import net.consensys.pantheon.ethereum.core.Synchronizer; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.JsonRpcResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.SyncingResult; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.Subscription; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; +import tech.pegasys.pantheon.ethereum.core.SyncStatus; +import tech.pegasys.pantheon.ethereum.core.Synchronizer; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.JsonRpcResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.SyncingResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.Subscription; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; import java.util.List; import java.util.Optional; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/AbstractEthJsonRpcHttpServiceTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/AbstractEthJsonRpcHttpServiceTest.java index 898b8e8eb5..22a83b27e5 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/AbstractEthJsonRpcHttpServiceTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/AbstractEthJsonRpcHttpServiceTest.java @@ -1,42 +1,42 @@ -package net.consensys.pantheon.ethereum.jsonrpc; +package tech.pegasys.pantheon.ethereum.jsonrpc; -import static net.consensys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; 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 net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockImporter; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.core.Synchronizer; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.eth.EthProtocol; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterIdGenerator; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.mainnet.ValidationResult; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.util.RawBlockIterator; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; +import static tech.pegasys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; + +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +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.Hash; +import tech.pegasys.pantheon.ethereum.core.PendingTransactions; +import tech.pegasys.pantheon.ethereum.core.Synchronizer; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.eth.EthProtocol; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterIdGenerator; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.mainnet.HeaderValidationMode; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +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.ValidationResult; +import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.util.RawBlockIterator; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; import java.net.URL; import java.nio.file.Paths; @@ -99,12 +99,12 @@ public abstract class AbstractEthJsonRpcHttpServiceTest { final URL blocksUrl = EthJsonRpcHttpBySpecTest.class .getClassLoader() - .getResource("net/consensys/pantheon/ethereum/jsonrpc/jsonRpcTestBlockchain.blocks"); + .getResource("tech/pegasys/pantheon/ethereum/jsonrpc/jsonRpcTestBlockchain.blocks"); final URL genesisJsonUrl = EthJsonRpcHttpBySpecTest.class .getClassLoader() - .getResource("net/consensys/pantheon/ethereum/jsonrpc/jsonRpcTestGenesis.json"); + .getResource("tech/pegasys/pantheon/ethereum/jsonrpc/jsonRpcTestGenesis.json"); assertThat(blocksUrl).isNotNull(); assertThat(genesisJsonUrl).isNotNull(); diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/AdminJsonRpcHttpServiceTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/AdminJsonRpcHttpServiceTest.java index 78ffc81631..3af4ead8f1 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/AdminJsonRpcHttpServiceTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/AdminJsonRpcHttpServiceTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc; +package tech.pegasys.pantheon.ethereum.jsonrpc; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.net.InetSocketAddress; import java.util.ArrayList; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/EthJsonRpcHttpBySpecTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/EthJsonRpcHttpBySpecTest.java index 476702aaa7..467234944e 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/EthJsonRpcHttpBySpecTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/EthJsonRpcHttpBySpecTest.java @@ -1,28 +1,28 @@ -package net.consensys.pantheon.ethereum.jsonrpc; +package tech.pegasys.pantheon.ethereum.jsonrpc; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthBlockNumber; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthCall; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthEstimateGas; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetBalance; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetBlockTransactionCountByHash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetBlockTransactionCountByNumber; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetCode; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetFilterChanges; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetLogs; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetStorageAt; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionByBlockHashAndIndex; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionByBlockNumberAndIndex; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionByHash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionCount; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionReceipt; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthNewBlockFilter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthNewFilter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthNewPendingTransactionFilter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthSendRawTransaction; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.EthUninstallFilter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthBlockNumber; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthCall; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthEstimateGas; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetBalance; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetBlockTransactionCountByHash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetBlockTransactionCountByNumber; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetCode; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetFilterChanges; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetLogs; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetStorageAt; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionByBlockHashAndIndex; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionByBlockNumberAndIndex; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionByHash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionCount; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthGetTransactionReceipt; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthNewBlockFilter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthNewFilter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthNewPendingTransactionFilter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthSendRawTransaction; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.EthUninstallFilter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; import java.io.IOException; import java.util.Collection; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcConfigurationTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcConfigurationTest.java index 47318c5ba1..28650810e3 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcConfigurationTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcConfigurationTest.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.jsonrpc; +package tech.pegasys.pantheon.ethereum.jsonrpc; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; import com.google.common.collect.Lists; import org.junit.Test; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceCorsTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceCorsTest.java index 87ddf578c2..564efb795a 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceCorsTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceCorsTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc; +package tech.pegasys.pantheon.ethereum.jsonrpc; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceRpcApisTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceRpcApisTest.java index a068109702..7026d7212b 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceRpcApisTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceRpcApisTest.java @@ -1,22 +1,22 @@ -package net.consensys.pantheon.ethereum.jsonrpc; +package tech.pegasys.pantheon.ethereum.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 net.consensys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import net.consensys.pantheon.ethereum.core.Synchronizer; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.eth.EthProtocol; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; +import tech.pegasys.pantheon.ethereum.core.Synchronizer; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.eth.EthProtocol; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; +import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; import java.util.HashSet; import java.util.Map; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceTest.java index fc5bcc8e4c..b150e9f501 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpServiceTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc; +package tech.pegasys.pantheon.ethereum.jsonrpc; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; @@ -7,32 +7,32 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.LogsBloomFilter; -import net.consensys.pantheon.ethereum.core.SyncStatus; -import net.consensys.pantheon.ethereum.core.Synchronizer; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.eth.EthProtocol; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; -import net.consensys.pantheon.util.uint.UInt256; +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.BlockHeader; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.LogsBloomFilter; +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.TransactionPool; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.ethereum.eth.EthProtocol; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; +import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValues; +import tech.pegasys.pantheon.util.uint.UInt256; import java.math.BigInteger; import java.net.InetSocketAddress; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcTestHelper.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcTestHelper.java index 5fc46e4146..23720f8a7e 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcTestHelper.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcTestHelper.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc; +package tech.pegasys.pantheon.ethereum.jsonrpc; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/MockPeerConnection.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/MockPeerConnection.java index ba94479f0f..7121fffd88 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/MockPeerConnection.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/MockPeerConnection.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.jsonrpc; +package tech.pegasys.pantheon.ethereum.jsonrpc; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; import java.net.InetSocketAddress; import java.net.SocketAddress; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/EthJsonRpcHttpServiceTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/EthJsonRpcHttpServiceTest.java index 23b7193bb8..1a32762987 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/EthJsonRpcHttpServiceTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/EthJsonRpcHttpServiceTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.filter; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.jsonrpc.AbstractEthJsonRpcHttpServiceTest; +import tech.pegasys.pantheon.ethereum.core.Block; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.jsonrpc.AbstractEthJsonRpcHttpServiceTest; import java.io.IOException; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterIdGeneratorTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterIdGeneratorTest.java index 6cee361fa7..331cbfaef7 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterIdGeneratorTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterIdGeneratorTest.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.filter; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter; import static org.junit.Assert.assertEquals; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValue; import org.junit.Test; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterManagerLogFilterTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterManagerLogFilterTest.java index 456c1f7edd..4c66a472c4 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterManagerLogFilterTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterManagerLogFilterTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.filter; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -9,17 +9,17 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.chain.BlockAddedEvent; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.Quantity; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; -import net.consensys.pantheon.util.bytes.BytesValue; +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.Hash; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.List; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterManagerTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterManagerTest.java index 15cc5cda54..0a374788ef 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterManagerTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/FilterManagerTest.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.filter; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.chain.BlockAddedEvent; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; +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.Hash; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; import java.util.List; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/LogsQueryTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/LogsQueryTest.java index d6bb23834b..b3c08adc57 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/LogsQueryTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/filter/LogsQueryTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.filter; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Log; -import net.consensys.pantheon.ethereum.core.LogTopic; -import net.consensys.pantheon.util.bytes.BytesValue; +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 java.util.ArrayList; import java.util.List; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/AdminPeersTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/AdminPeersTest.java index 593385f710..e6a84021c2 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/AdminPeersTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/AdminPeersTest.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.jsonrpc.MockPeerConnection; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.PeerResult; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.jsonrpc.MockPeerConnection; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.PeerResult; +import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.net.InetSocketAddress; import java.util.Collection; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/DebugStorageRangeAtTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/DebugStorageRangeAtTest.java index 8319a4d9f8..3ea808215c 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/DebugStorageRangeAtTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/DebugStorageRangeAtTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; @@ -8,25 +8,25 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.BlockReplay; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.BlockReplay.Action; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.DebugStorageRangeAtResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.DebugStorageRangeAtResult.StorageEntry; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.uint.UInt256; +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.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.BlockReplay; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.BlockReplay.Action; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.DebugStorageRangeAtResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.DebugStorageRangeAtResult.StorageEntry; +import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.NavigableMap; import java.util.Optional; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/DebugTraceTransactionTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/DebugTraceTransactionTest.java index 66b7e6e2c1..dee2d0d85b 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/DebugTraceTransactionTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/DebugTraceTransactionTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; @@ -6,23 +6,23 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Gas; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.debug.TraceFrame; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.TransactionTrace; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.TransactionTracer; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.DebugTraceTransactionResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.StructLog; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor.Result; -import net.consensys.pantheon.ethereum.vm.ExceptionalHaltReason; -import net.consensys.pantheon.util.bytes.BytesValue; +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.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.TransactionTrace; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.TransactionTracer; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.DebugTraceTransactionResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.StructLog; +import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor.Result; +import tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Collections; import java.util.EnumSet; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthCallTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthCallTest.java index ba01455eb3..332701d930 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthCallTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthCallTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; @@ -9,18 +9,18 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.CallParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessingResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessor; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.Quantity; -import net.consensys.pantheon.ethereum.mainnet.ValidationResult; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.CallParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessingResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessor; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity; +import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthCoinbaseTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthCoinbaseTest.java index 7db19534e9..fafa493d9c 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthCoinbaseTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthCoinbaseTest.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.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 net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.util.Optional; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthEstimateGasTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthEstimateGasTest.java index a8808debcf..a1dfef22d3 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthEstimateGasTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthEstimateGasTest.java @@ -1,23 +1,23 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.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 net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.CallParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessingResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessor; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.Quantity; +import tech.pegasys.pantheon.ethereum.chain.Blockchain; +import tech.pegasys.pantheon.ethereum.core.BlockHeader; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.CallParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessingResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessor; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity; import java.util.Optional; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGasPriceTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGasPriceTest.java index fea12e6cc8..806f2a0068 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGasPriceTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGasPriceTest.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.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 net.consensys.pantheon.ethereum.blockcreation.EthHashBlockMiner; -import net.consensys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.blockcreation.EthHashBlockMiner; +import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockByHashTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockByHashTest.java index fa0ac4718f..883c9e56db 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockByHashTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetBlockByHashTest.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verifyNoMoreInteractions; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.BlockResultFactory; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.BlockResultFactory; import org.junit.Before; import org.junit.Rule; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetFilterChangesTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetFilterChangesTest.java index 9565aece1b..d03f01aa45 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetFilterChangesTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetFilterChangesTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; @@ -8,19 +8,19 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.LogsResult; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.LogsResult; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.List; import java.util.stream.Collectors; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetFilterLogsTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetFilterLogsTest.java index c542ec080f..371f46e0b4 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetFilterLogsTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetFilterLogsTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; @@ -6,19 +6,19 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.LogsResult; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.LogsResult; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Arrays; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionCountTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionCountTest.java index b8f52c319d..ab3323f0ae 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionCountTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionCountTest.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.PendingTransactions; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.PendingTransactions; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.util.OptionalLong; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java index 4e9d3b7b28..e5402d632c 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java @@ -1,27 +1,27 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionReceiptWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.TransactionReceiptRootResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.TransactionReceiptStatusResult; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.mainnet.TransactionReceiptType; -import net.consensys.pantheon.util.bytes.BytesValue; +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.Transaction; +import tech.pegasys.pantheon.ethereum.core.TransactionReceipt; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionReceiptWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.TransactionReceiptRootResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.TransactionReceiptStatusResult; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec; +import tech.pegasys.pantheon.ethereum.mainnet.TransactionReceiptType; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.math.BigInteger; import java.util.Collections; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java index c13739a57a..13649925f4 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java @@ -1,28 +1,28 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.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 net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionTestFixture; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +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.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java index 8e81c3177e..dcd3fb9433 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java @@ -1,28 +1,28 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.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 net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionTestFixture; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +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.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthMiningTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthMiningTest.java index b827fce211..7f4538a04b 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthMiningTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthMiningTest.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.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 net.consensys.pantheon.ethereum.blockcreation.EthHashBlockMiner; -import net.consensys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.blockcreation.EthHashBlockMiner; +import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewBlockFilterTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewBlockFilterTest.java index 05b69eee06..f3b9d7c563 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewBlockFilterTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewBlockFilterTest.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.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 net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewFilterTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewFilterTest.java index c729b4ef40..642877f9a6 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewFilterTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthNewFilterTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -6,16 +6,16 @@ import static org.mockito.ArgumentMatchers.refEq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.LogsQuery; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.TopicsParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.FilterManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.LogsQuery; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.BlockParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.TopicsParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import java.util.Arrays; import java.util.List; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthProtocolVersionTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthProtocolVersionTest.java index 5b9f242c18..29b110d45e 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthProtocolVersionTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthProtocolVersionTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.eth.EthProtocol; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.eth.EthProtocol; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; import java.util.HashSet; import java.util.Set; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthSendRawTransactionTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthSendRawTransactionTest.java index 47071f7d37..d80d7d5331 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthSendRawTransactionTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthSendRawTransactionTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -6,16 +6,16 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; -import net.consensys.pantheon.ethereum.mainnet.ValidationResult; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.mainnet.TransactionValidator.TransactionInvalidReason; +import tech.pegasys.pantheon.ethereum.mainnet.ValidationResult; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthSyncingTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthSyncingTest.java index 4e9554d922..7d0d50b33d 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthSyncingTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/EthSyncingTest.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.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 net.consensys.pantheon.ethereum.core.SyncStatus; -import net.consensys.pantheon.ethereum.core.Synchronizer; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.SyncingResult; +import tech.pegasys.pantheon.ethereum.core.SyncStatus; +import tech.pegasys.pantheon.ethereum.core.Synchronizer; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.SyncingResult; import java.util.Optional; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetListeningTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetListeningTest.java index 5f04be3429..6de2398df9 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetListeningTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/NetListeningTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/TransientTransactionProcessorTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/TransientTransactionProcessorTest.java index d292ae127d..d951f97a7a 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/TransientTransactionProcessorTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/TransientTransactionProcessorTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -7,25 +7,25 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.CallParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessingResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessor; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor.Result; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor.Result.Status; -import net.consensys.pantheon.util.bytes.BytesValue; +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.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.CallParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessingResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor.TransientTransactionProcessor; +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.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/Web3Sha3Test.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/Web3Sha3Test.java index 62700a0e84..298dadd256 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/Web3Sha3Test.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/Web3Sha3Test.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import org.junit.Test; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java index 1d25ec6f9b..8b1f208460 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods.miner; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.miner; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; @@ -7,15 +7,15 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.verify; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java index 61aad7e180..e4c19eacab 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods.miner; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.miner; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerStartTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerStartTest.java index 66aaec6473..52096e65eb 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerStartTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerStartTest.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods.miner; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.miner; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doThrow; -import net.consensys.pantheon.ethereum.blockcreation.CoinbaseNotSetException; -import net.consensys.pantheon.ethereum.blockcreation.EthHashBlockMiner; -import net.consensys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.blockcreation.CoinbaseNotSetException; +import tech.pegasys.pantheon.ethereum.blockcreation.EthHashBlockMiner; +import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerStopTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerStopTest.java index 49e2c04f27..fc5902d783 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerStopTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/methods/miner/MinerStopTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.methods.miner; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.miner; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.blockcreation.EthHashBlockMiner; -import net.consensys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.blockcreation.EthHashBlockMiner; +import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/FilterParameterTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/FilterParameterTest.java index 4fd4427236..1ee0913619 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/FilterParameterTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/parameters/FilterParameterTest.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.parameters; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; import java.util.Arrays; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransactionTracerTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransactionTracerTest.java index 89f95e7282..548c321897 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransactionTracerTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransactionTracerTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.processor; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; @@ -6,21 +6,21 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.debug.TraceFrame; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor.Result; -import net.consensys.pantheon.ethereum.vm.DebugOperationTracer; +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.db.WorldStateArchive; +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 java.util.Arrays; import java.util.Collections; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransientTransactionProcessingResultTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransientTransactionProcessingResultTest.java index 9a3240afa8..1a28dc7095 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransientTransactionProcessingResultTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/processor/TransientTransactionProcessingResultTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.processor; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.processor; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.mainnet.TransactionProcessor.Result; +import tech.pegasys.pantheon.ethereum.core.Transaction; +import tech.pegasys.pantheon.ethereum.mainnet.TransactionProcessor.Result; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/BlockchainQueriesTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/BlockchainQueriesTest.java index 73746989aa..f5489927fe 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/BlockchainQueriesTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/queries/BlockchainQueriesTest.java @@ -1,31 +1,31 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.queries; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries; import static com.google.common.base.Preconditions.checkArgument; -import static net.consensys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Account; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldState; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.jsonrpc.internal.filter.LogsQuery.Builder; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator; -import net.consensys.pantheon.ethereum.testutil.BlockDataGenerator.BlockOptions; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.uint.UInt256; +import static tech.pegasys.pantheon.ethereum.core.InMemoryWorldState.createInMemoryWorldStateArchive; + +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.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.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.filter.LogsQuery.Builder; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHashFunction; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator; +import tech.pegasys.pantheon.ethereum.testutil.BlockDataGenerator.BlockOptions; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.ArrayList; import java.util.Arrays; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/NetworkResultTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/NetworkResultTest.java index b3dd7da93c..6eba035681 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/NetworkResultTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/internal/results/NetworkResultTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.internal.results; +package tech.pegasys.pantheon.ethereum.jsonrpc.internal.results; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketConfigurationTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketConfigurationTest.java index 52d619ac86..8363931c1b 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketConfigurationTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketConfigurationTest.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; import org.junit.Test; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketRequestHandlerTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketRequestHandlerTest.java index 5925432185..43f13d1c08 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketRequestHandlerTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketRequestHandlerTest.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket; +package tech.pegasys.pantheon.ethereum.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 net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.methods.WebSocketRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods.WebSocketRpcRequest; import java.util.HashMap; import java.util.Map; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketServiceTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketServiceTest.java index 4a01c84dc7..19c9d01af3 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketServiceTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketServiceTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.methods.WebSocketMethodsFactory; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods.WebSocketMethodsFactory; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; import java.util.Arrays; import java.util.HashMap; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthSubscribeIntegrationTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthSubscribeIntegrationTest.java index 6a32b062d3..588a8ddda5 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthSubscribeIntegrationTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthSubscribeIntegrationTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.WebSocketRequestHandler; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.WebSocketRequestHandler; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; import java.util.HashMap; import java.util.List; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthSubscribeTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthSubscribeTest.java index 17a4546838..9071bbb3f6 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthSubscribeTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthSubscribeTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -6,15 +6,15 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.Quantity; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscribeRequest; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.Quantity; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscribeRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; import io.vertx.core.json.Json; import org.junit.Before; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthUnsubscribeIntegrationTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthUnsubscribeIntegrationTest.java index 29f311b4d8..633a395530 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthUnsubscribeIntegrationTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthUnsubscribeIntegrationTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.WebSocketRequestHandler; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscribeRequest; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.WebSocketRequestHandler; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscribeRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; import java.util.HashMap; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthUnsubscribeTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthUnsubscribeTest.java index 7dca9b7bc7..78141b0c2c 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthUnsubscribeTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/EthUnsubscribeTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -6,15 +6,15 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; -import net.consensys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionNotFoundException; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.UnsubscribeRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcError; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcErrorResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.response.JsonRpcSuccessResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionNotFoundException; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.UnsubscribeRequest; import io.vertx.core.json.Json; import org.junit.Before; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/WebSocketMethodsFactoryTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/WebSocketMethodsFactoryTest.java index 0f0df9b810..12ddcfe1eb 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/WebSocketMethodsFactoryTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/methods/WebSocketMethodsFactoryTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.methods; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; import java.util.HashMap; import java.util.Map; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java index fa4acf0143..b94b7008a8 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.blockheaders.NewBlockHeadersSubscription; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.logs.LogsSubscription; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscribeRequest; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.syncing.SyncingSubscription; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.blockheaders.NewBlockHeadersSubscription; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.logs.LogsSubscription; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscribeRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.syncing.SyncingSubscription; import java.util.function.Function; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionManagerSendMessageTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionManagerSendMessageTest.java index 1d282b3f5e..4e95911599 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionManagerSendMessageTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionManagerSendMessageTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription; import static junit.framework.TestCase.fail; import static org.mockito.Mockito.mock; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.JsonRpcResult; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscribeRequest; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.response.SubscriptionResponse; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.JsonRpcResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscribeRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.response.SubscriptionResponse; import java.util.UUID; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionManagerTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionManagerTest.java index e4715e4961..9be74b7b47 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionManagerTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/SubscriptionManagerTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.both; @@ -6,11 +6,11 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.blockheaders.NewBlockHeadersSubscription; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscribeRequest; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.UnsubscribeRequest; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.syncing.SyncingSubscription; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.blockheaders.NewBlockHeadersSubscription; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscribeRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.UnsubscribeRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.syncing.SyncingSubscription; import java.util.List; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionServiceTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionServiceTest.java index 34b5ae15cd..37e05a5d4a 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionServiceTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionServiceTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.blockheaders; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.blockheaders; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -6,22 +6,22 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.chain.BlockAddedEvent; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.TransactionTestFixture; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.BlockResultFactory; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.JsonRpcResult; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +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.ethereum.jsonrpc.internal.queries.BlockWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.BlockResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.BlockResultFactory; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.JsonRpcResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.util.uint.UInt256; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/logs/LogsSubscriptionServiceTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/logs/LogsSubscriptionServiceTest.java index e128b204fc..36ccde85a3 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/logs/LogsSubscriptionServiceTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/logs/LogsSubscriptionServiceTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.logs; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.logs; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -8,25 +8,25 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.chain.BlockAddedEvent; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.BlockHeaderTestFixture; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Log; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.core.TransactionTestFixture; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.TransactionReceiptWithMetadata; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.LogResult; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +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.ethereum.jsonrpc.internal.parameters.FilterParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.LogWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.TransactionReceiptWithMetadata; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.LogResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionServiceTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionServiceTest.java index 5968f00fe7..300b55ff8a 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionServiceTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionServiceTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.pending; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.pending; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -9,13 +9,13 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.Subscription; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; -import net.consensys.pantheon.ethereum.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 tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.Subscription; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; import java.util.Arrays; import java.util.HashMap; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java index c38bd06cc4..95649bfe26 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.both; @@ -6,11 +6,11 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage; -import net.consensys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; -import net.consensys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; -import net.consensys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.methods.WebSocketRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.JsonRpcRequest; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.exception.InvalidJsonRpcParameters; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.FilterParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.parameters.JsonRpcParameter; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods.WebSocketRpcRequest; import java.util.Arrays; import java.util.Collections; diff --git a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionServiceTest.java b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionServiceTest.java index dcb7bd900a..47b64dc806 100644 --- a/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionServiceTest.java +++ b/ethereum/jsonrpc/src/test/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/subscription/syncing/SyncingSubscriptionServiceTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.syncing; +package tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.syncing; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -6,11 +6,11 @@ import static org.mockito.ArgumentMatchers.refEq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.core.SyncStatus; -import net.consensys.pantheon.ethereum.core.Synchronizer; -import net.consensys.pantheon.ethereum.jsonrpc.internal.results.SyncingResult; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; +import tech.pegasys.pantheon.ethereum.core.SyncStatus; +import tech.pegasys.pantheon.ethereum.core.Synchronizer; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.SyncingResult; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.request.SubscriptionType; import java.util.Optional; diff --git a/ethereum/mock-p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/testing/MockNetwork.java b/ethereum/mock-p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/testing/MockNetwork.java index ee58bea0b3..548c2cc190 100644 --- a/ethereum/mock-p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/testing/MockNetwork.java +++ b/ethereum/mock-p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/testing/MockNetwork.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.p2p.testing; - -import net.consensys.pantheon.ethereum.p2p.api.DisconnectCallback; -import net.consensys.pantheon.ethereum.p2p.api.Message; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.DefaultMessage; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.util.Subscribers; +package tech.pegasys.pantheon.ethereum.p2p.testing; + +import tech.pegasys.pantheon.ethereum.p2p.api.DisconnectCallback; +import tech.pegasys.pantheon.ethereum.p2p.api.Message; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.DefaultMessage; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.util.Subscribers; import java.net.InetSocketAddress; import java.net.SocketAddress; diff --git a/ethereum/mock-p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/testing/MockNetworkTest.java b/ethereum/mock-p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/testing/MockNetworkTest.java index 1088edb6a5..9ee08bfabc 100644 --- a/ethereum/mock-p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/testing/MockNetworkTest.java +++ b/ethereum/mock-p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/testing/MockNetworkTest.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.p2p.testing; +package tech.pegasys.pantheon.ethereum.p2p.testing; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.Message; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.peers.DefaultPeer; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.RawMessage; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.Message; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; +import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Arrays; import java.util.Optional; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/NetworkMemoryPool.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/NetworkMemoryPool.java index a7d295869e..ea0d5a073d 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/NetworkMemoryPool.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/NetworkMemoryPool.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p; +package tech.pegasys.pantheon.ethereum.p2p; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/NetworkRunner.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/NetworkRunner.java index 2e2a55fc44..559eceff98 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/NetworkRunner.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/NetworkRunner.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.p2p; - -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; -import net.consensys.pantheon.ethereum.p2p.api.ProtocolManager; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +package tech.pegasys.pantheon.ethereum.p2p; + +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; +import tech.pegasys.pantheon.ethereum.p2p.api.ProtocolManager; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; import java.util.ArrayList; import java.util.Arrays; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/DisconnectCallback.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/DisconnectCallback.java index 50460ce439..7d32237642 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/DisconnectCallback.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/DisconnectCallback.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.p2p.api; +package tech.pegasys.pantheon.ethereum.p2p.api; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; @FunctionalInterface public interface DisconnectCallback { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/Message.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/Message.java index 3ab0446598..bee1014ef2 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/Message.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/Message.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.api; +package tech.pegasys.pantheon.ethereum.p2p.api; /** A P2P network message received from another peer. */ public interface Message { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/MessageData.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/MessageData.java index 000916a580..4aac134772 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/MessageData.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/MessageData.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.api; +package tech.pegasys.pantheon.ethereum.p2p.api; import io.netty.buffer.ByteBuf; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/P2PNetwork.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/P2PNetwork.java index 6b9529a7a2..884b9b8bd8 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/P2PNetwork.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/P2PNetwork.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.p2p.api; +package tech.pegasys.pantheon.ethereum.p2p.api; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; import java.io.Closeable; import java.net.InetSocketAddress; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/PeerConnection.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/PeerConnection.java index 0b1e085e97..38072ec610 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/PeerConnection.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/PeerConnection.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.p2p.api; +package tech.pegasys.pantheon.ethereum.p2p.api; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; import java.io.IOException; import java.net.SocketAddress; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/ProtocolManager.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/ProtocolManager.java index 380c69127f..25ea0e86fe 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/ProtocolManager.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/api/ProtocolManager.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.p2p.api; +package tech.pegasys.pantheon.ethereum.p2p.api; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PeerRequirement; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerRequirement; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; import java.util.List; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/DiscoveryConfiguration.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/DiscoveryConfiguration.java index dd11dab994..b8d3a28dd5 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/DiscoveryConfiguration.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/DiscoveryConfiguration.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.p2p.config; +package tech.pegasys.pantheon.ethereum.p2p.config; import static java.util.stream.Collectors.toList; -import net.consensys.pantheon.ethereum.p2p.peers.DefaultPeer; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; +import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; +import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; import java.util.ArrayList; import java.util.Collection; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/NetworkingConfiguration.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/NetworkingConfiguration.java index 30b48c1011..8a526932b1 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/NetworkingConfiguration.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/NetworkingConfiguration.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.p2p.config; +package tech.pegasys.pantheon.ethereum.p2p.config; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; import java.util.Arrays; import java.util.Collections; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/RlpxConfiguration.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/RlpxConfiguration.java index 2212e7edb6..f16eea33f8 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/RlpxConfiguration.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/RlpxConfiguration.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.config; +package tech.pegasys.pantheon.ethereum.p2p.config; import java.util.Objects; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/SubProtocolConfiguration.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/SubProtocolConfiguration.java index 75c6b78ea8..da6ebeab7d 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/SubProtocolConfiguration.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/SubProtocolConfiguration.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.p2p.config; +package tech.pegasys.pantheon.ethereum.p2p.config; -import net.consensys.pantheon.ethereum.p2p.api.ProtocolManager; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; +import tech.pegasys.pantheon.ethereum.p2p.api.ProtocolManager; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/WireProtocolConfig.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/WireProtocolConfig.java index 4f0452cfa4..ea3d08b585 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/WireProtocolConfig.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/config/WireProtocolConfig.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.config; +package tech.pegasys.pantheon.ethereum.p2p.config; import java.util.Objects; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/DiscoveryPeer.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/DiscoveryPeer.java index 004e349642..44e7c38641 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/DiscoveryPeer.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/DiscoveryPeer.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.p2p.discovery; +package tech.pegasys.pantheon.ethereum.p2p.discovery; -import net.consensys.pantheon.ethereum.p2p.peers.DefaultPeer; -import net.consensys.pantheon.ethereum.p2p.peers.Endpoint; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; -import net.consensys.pantheon.ethereum.p2p.peers.PeerId; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; +import tech.pegasys.pantheon.ethereum.p2p.peers.Endpoint; +import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; +import tech.pegasys.pantheon.ethereum.p2p.peers.PeerId; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.OptionalInt; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryAgent.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryAgent.java index 0c5b3b8749..dd79102d93 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryAgent.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryAgent.java @@ -1,29 +1,29 @@ -package net.consensys.pantheon.ethereum.p2p.discovery; +package tech.pegasys.pantheon.ethereum.p2p.discovery; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static net.consensys.pantheon.util.Preconditions.checkGuard; -import static net.consensys.pantheon.util.bytes.BytesValue.wrapBuffer; - -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.p2p.api.DisconnectCallback; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerDroppedEvent; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.Packet; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PacketData; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PacketType; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PeerDiscoveryController; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PeerRequirement; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PeerTable; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PingPacketData; -import net.consensys.pantheon.ethereum.p2p.peers.DefaultPeerId; -import net.consensys.pantheon.ethereum.p2p.peers.PeerBlacklist; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage; -import net.consensys.pantheon.util.NetworkUtility; -import net.consensys.pantheon.util.bytes.BytesValue; +import static tech.pegasys.pantheon.util.Preconditions.checkGuard; +import static tech.pegasys.pantheon.util.bytes.BytesValue.wrapBuffer; + +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.ethereum.p2p.api.DisconnectCallback; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; +import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent; +import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerDroppedEvent; +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.p2p.discovery.internal.PeerDiscoveryController; +import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerRequirement; +import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerTable; +import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PingPacketData; +import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeerId; +import tech.pegasys.pantheon.ethereum.p2p.peers.PeerBlacklist; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage; +import tech.pegasys.pantheon.util.NetworkUtility; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.net.BindException; import java.net.InetSocketAddress; @@ -92,7 +92,7 @@ public class PeerDiscoveryAgent implements DisconnectCallback { private final PeerTable peerTable; private final DiscoveryConfiguration config; - /* This is the {@link net.consensys.pantheon.ethereum.p2p.Peer} object holding who we are. */ + /* This is the {@link tech.pegasys.pantheon.ethereum.p2p.Peer} object holding who we are. */ private DiscoveryPeer advertisedPeer; /* The vert.x UDP socket. */ private DatagramSocket socket; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryEvent.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryEvent.java index 9d188c9489..f4952e374a 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryEvent.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryEvent.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.discovery; +package tech.pegasys.pantheon.ethereum.p2p.discovery; import com.google.common.base.MoreObjects; @@ -32,7 +32,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 net.consensys.pantheon.ethereum.p2p.discovery.internal.PeerDiscoveryController} + *

{@link tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerDiscoveryController} */ public static class PeerBondedEvent extends PeerDiscoveryEvent { public PeerBondedEvent(final DiscoveryPeer peer, final long timestamp) { @@ -44,7 +44,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 net.consensys.pantheon.ethereum.p2p.discovery.internal.PeerDiscoveryController} + *

{@link tech.pegasys.pantheon.ethereum.p2p.discovery.internal.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/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketDecodingException.java index bc5f7a5650..ef1021d018 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketDecodingException.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketDecodingException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.discovery; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryServiceException.java index 07d7eedba5..643b5cdd93 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryServiceException.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryServiceException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.discovery; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryStatus.java index c7670476a9..94f7b45256 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryStatus.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryStatus.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.discovery; +package tech.pegasys.pantheon.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/internal/Bucket.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/Bucket.java index 926bcbc4df..76b69f786b 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/Bucket.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/Bucket.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; import static java.lang.System.arraycopy; import static java.util.Arrays.asList; import static java.util.Arrays.copyOf; import static java.util.Collections.unmodifiableList; -import net.consensys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import net.consensys.pantheon.ethereum.p2p.peers.PeerId; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; +import tech.pegasys.pantheon.ethereum.p2p.peers.PeerId; +import tech.pegasys.pantheon.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/FindNeighborsPacketData.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/FindNeighborsPacketData.java index ff687fcd51..dbad8e1a4e 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/FindNeighborsPacketData.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/FindNeighborsPacketData.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/NeighborsPacketData.java index c3b6f42cd3..6e1eb33041 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/NeighborsPacketData.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/NeighborsPacketData.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import net.consensys.pantheon.ethereum.p2p.peers.DefaultPeer; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; +import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; +import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; +import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; import java.util.List; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/Packet.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/Packet.java index a56dcbd28b..0958bdec5e 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/Packet.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/Packet.java @@ -1,20 +1,20 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; import static com.google.common.base.Preconditions.checkArgument; -import static net.consensys.pantheon.crypto.Hash.keccak256; -import static net.consensys.pantheon.util.Preconditions.checkGuard; -import static net.consensys.pantheon.util.bytes.BytesValues.asUnsignedBigInteger; - -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.crypto.SECP256K1.PublicKey; -import net.consensys.pantheon.crypto.SECP256K1.Signature; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryPacketDecodingException; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.rlp.RLPException; -import net.consensys.pantheon.ethereum.rlp.VertxBufferRLPOutput; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytesValue; -import net.consensys.pantheon.util.uint.UInt256Bytes; +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.RLP; +import tech.pegasys.pantheon.ethereum.rlp.RLPException; +import tech.pegasys.pantheon.ethereum.rlp.VertxBufferRLPOutput; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.MutableBytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketData.java index 23d2169657..f5f027250e 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketData.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketData.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketType.java index 35d33cadf2..9d8b7c4a2c 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketType.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketType.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryController.java index ff19ee5363..009df5ec35 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryController.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryController.java @@ -1,21 +1,21 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; import static com.google.common.base.Preconditions.checkNotNull; import static java.util.Collections.emptyList; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import static net.consensys.pantheon.ethereum.p2p.discovery.internal.PeerTable.AddResult.Outcome; - -import net.consensys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryAgent; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerDroppedEvent; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryStatus; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; -import net.consensys.pantheon.ethereum.p2p.peers.PeerBlacklist; -import net.consensys.pantheon.util.Subscribers; -import net.consensys.pantheon.util.bytes.BytesValue; +import static tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PeerTable.AddResult.Outcome; + +import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; +import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryAgent; +import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent; +import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent; +import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerDroppedEvent; +import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryStatus; +import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; +import tech.pegasys.pantheon.ethereum.p2p.peers.PeerBlacklist; +import tech.pegasys.pantheon.util.Subscribers; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Collection; import java.util.List; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerRequirement.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerRequirement.java index dceac5dc32..46b4d5efd0 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerRequirement.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerRequirement.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerTable.java index a8ee8e1002..1e0ea44cbb 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerTable.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerTable.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; import static java.util.Collections.unmodifiableList; import static java.util.Comparator.comparingInt; import static java.util.stream.Collectors.toList; -import net.consensys.pantheon.crypto.Hash; -import net.consensys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryStatus; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; -import net.consensys.pantheon.ethereum.p2p.peers.PeerId; -import net.consensys.pantheon.util.bytes.BytesValue; +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.peers.Peer; +import tech.pegasys.pantheon.ethereum.p2p.peers.PeerId; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Arrays; import java.util.Collection; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PingPacketData.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PingPacketData.java index 8a2ce4a177..674a714aab 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PingPacketData.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PingPacketData.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; import static com.google.common.base.Preconditions.checkArgument; -import static net.consensys.pantheon.util.Preconditions.checkGuard; +import static tech.pegasys.pantheon.util.Preconditions.checkGuard; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryPacketDecodingException; -import net.consensys.pantheon.ethereum.p2p.peers.Endpoint; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; +import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryPacketDecodingException; +import tech.pegasys.pantheon.ethereum.p2p.peers.Endpoint; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; import java.math.BigInteger; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PongPacketData.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PongPacketData.java index 295c728f49..785ca7fd74 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PongPacketData.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PongPacketData.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; -import net.consensys.pantheon.ethereum.p2p.peers.Endpoint; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.p2p.peers.Endpoint; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import tech.pegasys.pantheon.util.bytes.BytesValue; public class PongPacketData implements PacketData { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/RetryDelayFunction.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/RetryDelayFunction.java index 407dc39f3b..b8f5b8e669 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/RetryDelayFunction.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/RetryDelayFunction.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; import java.util.function.UnaryOperator; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/AbstractHandshakeHandler.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/AbstractHandshakeHandler.java index 05ec13c46c..fe1ac35cf7 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/AbstractHandshakeHandler.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/AbstractHandshakeHandler.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.p2p.netty; - -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.rlpx.framing.Framer; -import net.consensys.pantheon.ethereum.p2p.rlpx.handshake.Handshaker; -import net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.ethereum.p2p.wire.messages.HelloMessage; -import net.consensys.pantheon.ethereum.p2p.wire.messages.WireMessageCodes; -import net.consensys.pantheon.util.bytes.BytesValue; +package tech.pegasys.pantheon.ethereum.p2p.netty; + +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +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.wire.PeerInfo; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.HelloMessage; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.WireMessageCodes; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/ApiHandler.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/ApiHandler.java index 5af7098ad3..2e2c655d88 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/ApiHandler.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/ApiHandler.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.p2p.netty; +package tech.pegasys.pantheon.ethereum.p2p.netty; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.ethereum.p2p.wire.messages.PongMessage; -import net.consensys.pantheon.ethereum.p2p.wire.messages.WireMessageCodes; -import net.consensys.pantheon.ethereum.rlp.RLPException; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.PongMessage; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.WireMessageCodes; +import tech.pegasys.pantheon.ethereum.rlp.RLPException; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/Callbacks.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/Callbacks.java index aed89bc8fa..03e12c62ea 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/Callbacks.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/Callbacks.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.p2p.netty; - -import net.consensys.pantheon.ethereum.p2p.api.DisconnectCallback; -import net.consensys.pantheon.ethereum.p2p.api.Message; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.DefaultMessage; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.util.Subscribers; +package tech.pegasys.pantheon.ethereum.p2p.netty; + +import tech.pegasys.pantheon.ethereum.p2p.api.DisconnectCallback; +import tech.pegasys.pantheon.ethereum.p2p.api.Message; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.DefaultMessage; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.util.Subscribers; import java.util.Map; import java.util.function.Consumer; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/CapabilityMultiplexer.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/CapabilityMultiplexer.java index c28020ceae..da75e5b350 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/CapabilityMultiplexer.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/CapabilityMultiplexer.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.p2p.netty; +package tech.pegasys.pantheon.ethereum.p2p.netty; import static java.util.Comparator.comparing; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; import java.util.ArrayList; import java.util.Comparator; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/DeFramer.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/DeFramer.java index 4a2071ae86..f4eb620a57 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/DeFramer.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/DeFramer.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.p2p.netty; +package tech.pegasys.pantheon.ethereum.p2p.netty; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.netty.exceptions.IncompatiblePeerException; -import net.consensys.pantheon.ethereum.p2p.rlpx.framing.Framer; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.ethereum.p2p.wire.messages.HelloMessage; -import net.consensys.pantheon.ethereum.p2p.wire.messages.WireMessageCodes; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.netty.exceptions.IncompatiblePeerException; +import tech.pegasys.pantheon.ethereum.p2p.rlpx.framing.Framer; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.HelloMessage; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.WireMessageCodes; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/HandshakeHandlerInbound.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/HandshakeHandlerInbound.java index 984d87bf37..cde8289cd6 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/HandshakeHandlerInbound.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/HandshakeHandlerInbound.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.p2p.netty; +package tech.pegasys.pantheon.ethereum.p2p.netty; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.rlpx.handshake.Handshaker; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.Handshaker; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; import java.util.List; import java.util.Optional; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/HandshakeHandlerOutbound.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/HandshakeHandlerOutbound.java index 3f93998d1c..2299793090 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/HandshakeHandlerOutbound.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/HandshakeHandlerOutbound.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.p2p.netty; - -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.rlpx.handshake.Handshaker; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; -import net.consensys.pantheon.util.bytes.BytesValue; +package tech.pegasys.pantheon.ethereum.p2p.netty; + +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.Handshaker; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.List; import java.util.Optional; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/MessageFramer.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/MessageFramer.java index 4da463b290..24ff3f3ea6 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/MessageFramer.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/MessageFramer.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.p2p.netty; +package tech.pegasys.pantheon.ethereum.p2p.netty; -import net.consensys.pantheon.ethereum.p2p.rlpx.framing.Framer; +import tech.pegasys.pantheon.ethereum.p2p.rlpx.framing.Framer; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/NettyP2PNetwork.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/NettyP2PNetwork.java index 5338fe414f..3d283b5862 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/NettyP2PNetwork.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/NettyP2PNetwork.java @@ -1,22 +1,22 @@ -package net.consensys.pantheon.ethereum.p2p.netty; - -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.p2p.api.DisconnectCallback; -import net.consensys.pantheon.ethereum.p2p.api.Message; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import net.consensys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryAgent; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PeerRequirement; -import net.consensys.pantheon.ethereum.p2p.peers.Endpoint; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; -import net.consensys.pantheon.ethereum.p2p.peers.PeerBlacklist; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.util.Subscribers; +package tech.pegasys.pantheon.ethereum.p2p.netty; + +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.ethereum.p2p.api.DisconnectCallback; +import tech.pegasys.pantheon.ethereum.p2p.api.Message; +import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +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.internal.PeerRequirement; +import tech.pegasys.pantheon.ethereum.p2p.peers.Endpoint; +import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; +import tech.pegasys.pantheon.ethereum.p2p.peers.PeerBlacklist; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.util.Subscribers; import java.net.InetSocketAddress; import java.util.Collection; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/NettyPeerConnection.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/NettyPeerConnection.java index 58e20943ca..99fcc4e192 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/NettyPeerConnection.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/NettyPeerConnection.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.p2p.netty; +package tech.pegasys.pantheon.ethereum.p2p.netty; import static java.util.concurrent.TimeUnit.SECONDS; -import static net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason.TCP_SUBSYSTEM_ERROR; - -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import static tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason.TCP_SUBSYSTEM_ERROR; + +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; import java.net.SocketAddress; import java.util.HashMap; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/OutboundMessage.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/OutboundMessage.java index c6f843eee5..87d7648ed9 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/OutboundMessage.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/OutboundMessage.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.p2p.netty; +package tech.pegasys.pantheon.ethereum.p2p.netty; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; final class OutboundMessage { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/PeerConnectionRegistry.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/PeerConnectionRegistry.java index 02a7e9d19a..7d89f74f7e 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/PeerConnectionRegistry.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/PeerConnectionRegistry.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.p2p.netty; +package tech.pegasys.pantheon.ethereum.p2p.netty; import static java.util.Collections.unmodifiableCollection; -import net.consensys.pantheon.ethereum.p2p.api.DisconnectCallback; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.p2p.api.DisconnectCallback; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/TimeoutHandler.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/TimeoutHandler.java index 6ce89a04aa..9f6bcd4604 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/TimeoutHandler.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/TimeoutHandler.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.netty; +package tech.pegasys.pantheon.ethereum.p2p.netty; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/WireKeepAlive.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/WireKeepAlive.java index b922cc9387..9c69f994ba 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/WireKeepAlive.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/WireKeepAlive.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.p2p.netty; +package tech.pegasys.pantheon.ethereum.p2p.netty; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.ethereum.p2p.wire.messages.PingMessage; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.PingMessage; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/exceptions/IncompatiblePeerException.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/exceptions/IncompatiblePeerException.java index 0407138cb4..eb3e4f1a38 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/exceptions/IncompatiblePeerException.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/netty/exceptions/IncompatiblePeerException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.netty.exceptions; +package tech.pegasys.pantheon.ethereum.p2p.netty.exceptions; public class IncompatiblePeerException extends RuntimeException { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultPeer.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultPeer.java index 9bbefff2c1..837bdfc76f 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultPeer.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultPeer.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.p2p.peers; +package tech.pegasys.pantheon.ethereum.p2p.peers; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import static net.consensys.pantheon.util.Preconditions.checkGuard; +import static tech.pegasys.pantheon.util.Preconditions.checkGuard; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryPacketDecodingException; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.NetworkUtility; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryPacketDecodingException; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.util.NetworkUtility; +import tech.pegasys.pantheon.util.bytes.BytesValue; 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/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultPeerId.java index 9e7d9df03a..3b03d97cc1 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultPeerId.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/DefaultPeerId.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.p2p.peers; +package tech.pegasys.pantheon.ethereum.p2p.peers; -import net.consensys.pantheon.crypto.Hash; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.crypto.Hash; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Objects; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/Endpoint.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/Endpoint.java index f46e94ed48..8584076f29 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/Endpoint.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/Endpoint.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.p2p.peers; +package tech.pegasys.pantheon.ethereum.p2p.peers; import static com.google.common.base.Preconditions.checkArgument; -import static net.consensys.pantheon.util.Preconditions.checkGuard; +import static tech.pegasys.pantheon.util.Preconditions.checkGuard; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryPacketDecodingException; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; -import net.consensys.pantheon.util.NetworkUtility; +import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryPacketDecodingException; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import tech.pegasys.pantheon.util.NetworkUtility; import java.net.InetAddress; import java.util.Objects; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/Peer.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/Peer.java index 34abb48d3f..d0c99f4879 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/Peer.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/Peer.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.p2p.peers; +package tech.pegasys.pantheon.ethereum.p2p.peers; -import net.consensys.pantheon.crypto.SecureRandomProvider; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.crypto.SecureRandomProvider; +import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import tech.pegasys.pantheon.util.bytes.BytesValue; public interface Peer extends PeerId { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerBlacklist.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerBlacklist.java index d656f6d1fb..44a73fb343 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerBlacklist.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerBlacklist.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.p2p.peers; +package tech.pegasys.pantheon.ethereum.p2p.peers; -import net.consensys.pantheon.ethereum.p2p.api.DisconnectCallback; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.p2p.api.DisconnectCallback; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerId.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerId.java index 7abfccd7e1..2c20139462 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerId.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerId.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.p2p.peers; +package tech.pegasys.pantheon.ethereum.p2p.peers; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; public interface PeerId { /** diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/CompressionException.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/CompressionException.java index b8e9c278da..67b94fc417 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/CompressionException.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/CompressionException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.framing; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.framing; /** Thrown when an error occurs during compression and decompression of payloads. */ public class CompressionException extends RuntimeException { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/Compressor.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/Compressor.java index 58984d8668..76786d1060 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/Compressor.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/Compressor.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.framing; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.framing; /** A strategy for compressing and decompressing devp2p subprotocol messages. */ public interface Compressor { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/Framer.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/Framer.java index eb3f21e8f9..22846963ff 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/Framer.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/Framer.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.framing; +package tech.pegasys.pantheon.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 net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.rlpx.handshake.HandshakeSecrets; -import net.consensys.pantheon.ethereum.p2p.utils.ByteBufUtils; -import net.consensys.pantheon.ethereum.p2p.wire.RawMessage; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.rlp.RlpUtils; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.HandshakeSecrets; +import tech.pegasys.pantheon.ethereum.p2p.utils.ByteBufUtils; +import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage; +import tech.pegasys.pantheon.ethereum.rlp.RLP; +import tech.pegasys.pantheon.ethereum.rlp.RlpUtils; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Arrays; @@ -30,7 +30,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 net.consensys.pantheon.ethereum.p2p.rlpx.handshake.Handshaker}. + * cryptographic handshake ({@link tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.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/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/FramingException.java index a351297e22..8d54fc05b8 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/FramingException.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/FramingException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.framing; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/SnappyCompressor.java index c40b3ff8f2..eddd4bcdb6 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/SnappyCompressor.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/SnappyCompressor.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.framing; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/HandshakeException.java index 82e0b831ac..6536f3d7f6 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/HandshakeException.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/HandshakeException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.handshake; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/HandshakeSecrets.java index 30c2321812..e57952bcc1 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/HandshakeSecrets.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/HandshakeSecrets.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.handshake; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/Handshaker.java index a3c5356ef6..6eb291808d 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/Handshaker.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/Handshaker.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.handshake; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker; +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESEncryptionEngine.java index 2b58cf86d9..e514b78467 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESEncryptionEngine.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESEncryptionEngine.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshaker.java index 127f3d4f33..00bde14273 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshaker.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshaker.java @@ -1,18 +1,18 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; import static com.google.common.base.Preconditions.checkState; -import static net.consensys.pantheon.crypto.Hash.keccak256; -import static net.consensys.pantheon.util.bytes.Bytes32s.xor; -import static net.consensys.pantheon.util.bytes.BytesValues.concatenate; - -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.crypto.SECP256K1.PublicKey; -import net.consensys.pantheon.crypto.SecureRandomProvider; -import net.consensys.pantheon.ethereum.p2p.rlpx.handshake.HandshakeException; -import net.consensys.pantheon.ethereum.p2p.rlpx.handshake.HandshakeSecrets; -import net.consensys.pantheon.ethereum.p2p.rlpx.handshake.Handshaker; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +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 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/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessage.java index c1bff21b62..31860c9ddf 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessage.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessage.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.crypto.SecureRandomProvider; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytesValue; +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 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/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessage.java index 8f8b8dd567..d134a7fe5a 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessage.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessage.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV1.java index cc52dede8a..b5c6976095 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV1.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV1.java @@ -1,20 +1,20 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; import static com.google.common.base.Preconditions.checkState; -import static net.consensys.pantheon.crypto.SECP256K1.calculateKeyAgreement; -import static net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker.HASH_EPH_PUBKEY_LENGTH; -import static net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker.NONCE_LENGTH; -import static net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker.PUBKEY_LENGTH; -import static net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker.SIGNATURE_LENGTH; -import static net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker.TOKEN_FLAG_LENGTH; - -import net.consensys.pantheon.crypto.Hash; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.Bytes32s; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytes32; -import net.consensys.pantheon.util.bytes.MutableBytesValue; +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; /** * The initiator's handshake message. diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4.java index c2d6da3f06..67d512b94f 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; -import net.consensys.pantheon.crypto.Hash; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.Bytes32s; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytes32; +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; 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/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessage.java index 9939b5353f..36423847e5 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessage.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessage.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV1.java index c6cd6148c1..20c6175c1a 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV1.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV1.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; import static com.google.common.base.Preconditions.checkArgument; -import static net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker.NONCE_LENGTH; -import static net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker.PUBKEY_LENGTH; -import static net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker.TOKEN_FLAG_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.TOKEN_FLAG_LENGTH; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytesValue; +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; /** * The responder's handshake message. diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV4.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV4.java index 49a7678f1c..bb68a31ee1 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV4.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV4.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies; - -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPInput; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +package tech.pegasys.pantheon.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; public class ResponderHandshakeMessageV4 implements ResponderHandshakeMessage { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/utils/ByteBufUtils.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/utils/ByteBufUtils.java index 36f235e6ec..d4589618bd 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/utils/ByteBufUtils.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/utils/ByteBufUtils.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.p2p.utils; +package tech.pegasys.pantheon.ethereum.p2p.utils; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +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 io.netty.buffer.ByteBuf; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/AbstractMessageData.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/AbstractMessageData.java index 3c249dbbe2..56d0c25a1c 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/AbstractMessageData.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/AbstractMessageData.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.p2p.wire; +package tech.pegasys.pantheon.ethereum.p2p.wire; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; import io.netty.buffer.ByteBuf; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/Capability.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/Capability.java index 30e43bce99..8d46fb10f2 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/Capability.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/Capability.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.p2p.wire; +package tech.pegasys.pantheon.ethereum.p2p.wire; -import static net.consensys.pantheon.util.bytes.BytesValue.wrap; +import static tech.pegasys.pantheon.util.bytes.BytesValue.wrap; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; -import net.consensys.pantheon.util.bytes.BytesValues; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; +import tech.pegasys.pantheon.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/wire/DefaultMessage.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/DefaultMessage.java index b273173ede..5452405a97 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/DefaultMessage.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/DefaultMessage.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.p2p.wire; +package tech.pegasys.pantheon.ethereum.p2p.wire; -import net.consensys.pantheon.ethereum.p2p.api.Message; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.api.Message; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.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/wire/PeerInfo.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/PeerInfo.java index a306c0639b..d800da8501 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/PeerInfo.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/PeerInfo.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.p2p.wire; +package tech.pegasys.pantheon.ethereum.p2p.wire; -import static net.consensys.pantheon.util.bytes.BytesValue.wrap; +import static tech.pegasys.pantheon.util.bytes.BytesValue.wrap; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +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 tech.pegasys.pantheon.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/wire/RawMessage.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/RawMessage.java index 598122b453..e4c39ad08f 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/RawMessage.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/RawMessage.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.wire; +package tech.pegasys.pantheon.ethereum.p2p.wire; import io.netty.buffer.ByteBuf; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/SubProtocol.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/SubProtocol.java index c0ffe339a9..7e46726245 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/SubProtocol.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/SubProtocol.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.wire; +package tech.pegasys.pantheon.ethereum.p2p.wire; public interface SubProtocol { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/WireProtocolException.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/WireProtocolException.java index bd577c52ee..5669db2185 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/WireProtocolException.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/WireProtocolException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.wire; +package tech.pegasys.pantheon.ethereum.p2p.wire; /** Signals that an exception occurred in the Wire protocol layer of the RLPx stack. */ public class WireProtocolException extends RuntimeException { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/DisconnectMessage.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/DisconnectMessage.java index 5126c5b172..d0c053b93d 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/DisconnectMessage.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/DisconnectMessage.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.ethereum.p2p.wire.messages; +package tech.pegasys.pantheon.ethereum.p2p.wire.messages; import static com.google.common.base.Preconditions.checkArgument; -import static net.consensys.pantheon.util.Preconditions.checkGuard; - -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.utils.ByteBufUtils; -import net.consensys.pantheon.ethereum.p2p.wire.AbstractMessageData; -import net.consensys.pantheon.ethereum.p2p.wire.WireProtocolException; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPOutput; +import static tech.pegasys.pantheon.util.Preconditions.checkGuard; + +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.utils.ByteBufUtils; +import tech.pegasys.pantheon.ethereum.p2p.wire.AbstractMessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.WireProtocolException; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPOutput; import java.util.stream.Stream; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/EmptyMessage.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/EmptyMessage.java index 441d47749e..95a886df3a 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/EmptyMessage.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/EmptyMessage.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.p2p.wire.messages; +package tech.pegasys.pantheon.ethereum.p2p.wire.messages; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; import io.netty.buffer.ByteBuf; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/HelloMessage.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/HelloMessage.java index 0fc89fe6f7..2a8f9c1285 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/HelloMessage.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/HelloMessage.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.p2p.wire.messages; - -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.utils.ByteBufUtils; -import net.consensys.pantheon.ethereum.p2p.wire.AbstractMessageData; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; +package tech.pegasys.pantheon.ethereum.p2p.wire.messages; + +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.utils.ByteBufUtils; +import tech.pegasys.pantheon.ethereum.p2p.wire.AbstractMessageData; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput; import io.netty.buffer.ByteBuf; diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/PingMessage.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/PingMessage.java index 2aa42839ab..227530980e 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/PingMessage.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/PingMessage.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.wire.messages; +package tech.pegasys.pantheon.ethereum.p2p.wire.messages; public final class PingMessage extends EmptyMessage { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/PongMessage.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/PongMessage.java index 74455b15ef..6a68ecd05f 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/PongMessage.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/PongMessage.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.wire.messages; +package tech.pegasys.pantheon.ethereum.p2p.wire.messages; public final class PongMessage extends EmptyMessage { diff --git a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/WireMessageCodes.java b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/WireMessageCodes.java index c906fd7908..7d47f1f360 100644 --- a/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/WireMessageCodes.java +++ b/ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/wire/messages/WireMessageCodes.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.wire.messages; +package tech.pegasys.pantheon.ethereum.p2p.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/NettyP2PNetworkTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/NettyP2PNetworkTest.java index 69b0b9cc50..7b502c4ff5 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/NettyP2PNetworkTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/NettyP2PNetworkTest.java @@ -1,25 +1,25 @@ -package net.consensys.pantheon.ethereum.p2p; +package tech.pegasys.pantheon.ethereum.p2p; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import net.consensys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import net.consensys.pantheon.ethereum.p2p.config.RlpxConfiguration; -import net.consensys.pantheon.ethereum.p2p.netty.NettyP2PNetwork; -import net.consensys.pantheon.ethereum.p2p.netty.exceptions.IncompatiblePeerException; -import net.consensys.pantheon.ethereum.p2p.peers.DefaultPeer; -import net.consensys.pantheon.ethereum.p2p.peers.Endpoint; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; -import net.consensys.pantheon.ethereum.p2p.peers.PeerBlacklist; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +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.netty.NettyP2PNetwork; +import tech.pegasys.pantheon.ethereum.p2p.netty.exceptions.IncompatiblePeerException; +import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; +import tech.pegasys.pantheon.ethereum.p2p.peers.Endpoint; +import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; +import tech.pegasys.pantheon.ethereum.p2p.peers.PeerBlacklist; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.net.InetAddress; import java.util.List; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/NetworkingServiceLifecycleTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/NetworkingServiceLifecycleTest.java index b31a53d5ec..ca45249627 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/NetworkingServiceLifecycleTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/NetworkingServiceLifecycleTest.java @@ -1,18 +1,18 @@ -package net.consensys.pantheon.ethereum.p2p; +package tech.pegasys.pantheon.ethereum.p2p; import static java.util.Collections.emptyList; -import static net.consensys.pantheon.ethereum.p2p.NetworkingTestHelper.configWithRandomPorts; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static tech.pegasys.pantheon.ethereum.p2p.NetworkingTestHelper.configWithRandomPorts; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.p2p.api.P2PNetwork; -import net.consensys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import net.consensys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryServiceException; -import net.consensys.pantheon.ethereum.p2p.netty.NettyP2PNetwork; -import net.consensys.pantheon.ethereum.p2p.peers.PeerBlacklist; +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.ethereum.p2p.api.P2PNetwork; +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.netty.NettyP2PNetwork; +import tech.pegasys.pantheon.ethereum.p2p.peers.PeerBlacklist; import java.io.IOException; @@ -160,7 +160,7 @@ public class NetworkingServiceLifecycleTest { assertThat(e.getCause()).hasCauseExactlyInstanceOf(PeerDiscoveryServiceException.class); assertThat(e.getCause()) .hasMessageStartingWith( - "net.consensys.pantheon.ethereum.p2p.discovery." + "tech.pegasys.pantheon.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/NetworkingTestHelper.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/NetworkingTestHelper.java index 37b7a808a0..6ec2f1b526 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/NetworkingTestHelper.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/NetworkingTestHelper.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.p2p; +package tech.pegasys.pantheon.ethereum.p2p; -import net.consensys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import net.consensys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import net.consensys.pantheon.ethereum.p2p.config.RlpxConfiguration; +import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; +import tech.pegasys.pantheon.ethereum.p2p.config.NetworkingConfiguration; +import tech.pegasys.pantheon.ethereum.p2p.config.RlpxConfiguration; public class NetworkingTestHelper { diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/AbstractPeerDiscoveryTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/AbstractPeerDiscoveryTest.java index bc2156b104..f913d6af56 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/AbstractPeerDiscoveryTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/AbstractPeerDiscoveryTest.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.p2p.discovery; +package tech.pegasys.pantheon.ethereum.p2p.discovery; import static io.vertx.core.Vertx.vertx; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.Packet; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PacketType; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PingPacketData; -import net.consensys.pantheon.ethereum.p2p.peers.Endpoint; -import net.consensys.pantheon.ethereum.p2p.peers.PeerBlacklist; -import net.consensys.pantheon.util.bytes.BytesValue; +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.PacketType; +import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PingPacketData; +import tech.pegasys.pantheon.ethereum.p2p.peers.Endpoint; +import tech.pegasys.pantheon.ethereum.p2p.peers.PeerBlacklist; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.List; import java.util.concurrent.ArrayBlockingQueue; @@ -130,7 +130,7 @@ public abstract class AbstractPeerDiscoveryTest { * *

A test socket allows you to send messages to a discovery agent, as well as to react to * received messages. A test socket encapsulates: (1) a {@link DiscoveryPeer} and its {@link - * net.consensys.pantheon.crypto.SECP256K1.KeyPair}, (2) an {@link ArrayBlockingQueue} where + * tech.pegasys.pantheon.crypto.SECP256K1.KeyPair}, (2) an {@link ArrayBlockingQueue} where * received messages are placed automatically, and (3) the socket itself. * * @param count the number of test sockets to start. diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryAgentTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryAgentTest.java index a84605b3b8..5199cadc2b 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryAgentTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryAgentTest.java @@ -1,24 +1,24 @@ -package net.consensys.pantheon.ethereum.p2p.discovery; +package tech.pegasys.pantheon.ethereum.p2p.discovery; -import static net.consensys.pantheon.util.bytes.BytesValue.fromHexString; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; - -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.FindNeighborsPacketData; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.NeighborsPacketData; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.Packet; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PacketType; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PingPacketData; -import net.consensys.pantheon.ethereum.p2p.peers.DefaultPeer; -import net.consensys.pantheon.ethereum.p2p.peers.PeerBlacklist; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.util.bytes.BytesValue; +import static tech.pegasys.pantheon.util.bytes.BytesValue.fromHexString; + +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; +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.PacketType; +import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.PingPacketData; +import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; +import tech.pegasys.pantheon.ethereum.p2p.peers.PeerBlacklist; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.net.SocketAddress; import java.util.Arrays; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryBondingTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryBondingTest.java index 1c7a196f28..d3acca6656 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryBondingTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryBondingTest.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.p2p.discovery; +package tech.pegasys.pantheon.ethereum.p2p.discovery; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.FindNeighborsPacketData; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.Packet; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PacketType; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PingPacketData; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PongPacketData; +import tech.pegasys.pantheon.ethereum.p2p.discovery.internal.FindNeighborsPacketData; +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.discovery.internal.PongPacketData; import java.util.Collections; import java.util.concurrent.TimeUnit; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryBootstrappingTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryBootstrappingTest.java index b569dee333..51149e97d5 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryBootstrappingTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryBootstrappingTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.discovery; +package tech.pegasys.pantheon.ethereum.p2p.discovery; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; @@ -6,11 +6,11 @@ import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.Packet; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PacketType; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PingPacketData; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; -import net.consensys.pantheon.util.bytes.BytesValue; +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 java.util.List; import java.util.concurrent.TimeUnit; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryObserversTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryObserversTest.java index 64438455fd..058e269fd4 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryObserversTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryObserversTest.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.p2p.discovery; +package tech.pegasys.pantheon.ethereum.p2p.discovery; import static io.vertx.core.Vertx.vertx; -import static net.consensys.pantheon.ethereum.p2p.NetworkingTestHelper.configWithRandomPorts; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.awaitility.Awaitility.await; +import static tech.pegasys.pantheon.ethereum.p2p.NetworkingTestHelper.configWithRandomPorts; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; -import net.consensys.pantheon.ethereum.p2p.peers.PeerBlacklist; +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent; +import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; +import tech.pegasys.pantheon.ethereum.p2p.peers.PeerBlacklist; import java.util.ArrayList; import java.util.Collections; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java index dc51473600..127dacd802 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.ethereum.p2p.discovery; +package tech.pegasys.pantheon.ethereum.p2p.discovery; import static com.google.common.net.InetAddresses.isInetAddress; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.FindNeighborsPacketData; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.NeighborsPacketData; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.Packet; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PingPacketData; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PongPacketData; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; -import net.consensys.pantheon.util.NetworkUtility; +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.ethereum.p2p.peers.Peer; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketSedesTest.java index ce9afce323..213db64c6c 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketSedesTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryPacketSedesTest.java @@ -1,21 +1,21 @@ -package net.consensys.pantheon.ethereum.p2p.discovery; +package tech.pegasys.pantheon.ethereum.p2p.discovery; -import static net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper.generateKeyPairs; -import static net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper.generatePeers; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.data.Offset.offset; import static org.junit.Assert.assertNotNull; - -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.FindNeighborsPacketData; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.NeighborsPacketData; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.Packet; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PacketData; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PacketType; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.rlp.RLPException; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytesValue; +import static tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper.generateKeyPairs; +import static tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper.generatePeers; + +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 java.util.Arrays; import java.util.List; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryTestHelper.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryTestHelper.java index ecbf1d7c82..357364f707 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryTestHelper.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryTestHelper.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.p2p.discovery; +package tech.pegasys.pantheon.ethereum.p2p.discovery; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.p2p.peers.Endpoint; +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.ethereum.p2p.peers.Endpoint; import java.util.OptionalInt; import java.util.stream.Stream; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryTimestampsTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryTimestampsTest.java index ac6d8bdc71..d8e67b4179 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryTimestampsTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/PeerDiscoveryTimestampsTest.java @@ -1,17 +1,17 @@ -package net.consensys.pantheon.ethereum.p2p.discovery; +package tech.pegasys.pantheon.ethereum.p2p.discovery; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.Packet; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PacketType; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PeerDiscoveryController; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PeerTable; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PingPacketData; -import net.consensys.pantheon.ethereum.p2p.peers.PeerBlacklist; +import tech.pegasys.pantheon.crypto.SECP256K1; +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.ethereum.p2p.peers.PeerBlacklist; import java.util.Collections; import java.util.concurrent.TimeUnit; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/BucketTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/BucketTest.java index f4b7fae5fa..5020b80648 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/BucketTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/BucketTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; import static junit.framework.TestCase.assertFalse; -import static net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper.generateDiscoveryPeers; -import static net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper.generateKeyPairs; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper.generateDiscoveryPeers; +import static tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper.generateKeyPairs; -import net.consensys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; +import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; import java.util.Optional; import java.util.stream.Stream; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/MockPacketDataFactory.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/MockPacketDataFactory.java index f0dcedc066..c299b31656 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/MockPacketDataFactory.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/MockPacketDataFactory.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +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 java.util.Arrays; import java.util.Optional; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketTest.java index 8f83950bce..585f4cb93e 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PacketTest.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.p2p.peers.Endpoint; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.p2p.peers.Endpoint; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.OptionalInt; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryControllerDistanceCalculatorTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryControllerDistanceCalculatorTest.java index 30d1117a4c..4b3cec92da 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryControllerDistanceCalculatorTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryControllerDistanceCalculatorTest.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryControllerTest.java index 57452fd6ec..103d63d1e1 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryControllerTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryControllerTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -15,19 +15,19 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryAgent; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryStatus; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper; -import net.consensys.pantheon.ethereum.p2p.peers.Endpoint; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; -import net.consensys.pantheon.ethereum.p2p.peers.PeerBlacklist; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytesValue; -import net.consensys.pantheon.util.uint.UInt256; -import net.consensys.pantheon.util.uint.UInt256Value; +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; +import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryAgent; +import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryStatus; +import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper; +import tech.pegasys.pantheon.ethereum.p2p.peers.Endpoint; +import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; +import tech.pegasys.pantheon.ethereum.p2p.peers.PeerBlacklist; +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 java.util.Arrays; import java.util.Collections; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryTableRefreshTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryTableRefreshTest.java index 9552a1fd99..90876c9f4c 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryTableRefreshTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerDiscoveryTableRefreshTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; @@ -10,12 +10,12 @@ import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryAgent; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper; -import net.consensys.pantheon.ethereum.p2p.peers.PeerBlacklist; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; +import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryAgent; +import tech.pegasys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper; +import tech.pegasys.pantheon.ethereum.p2p.peers.PeerBlacklist; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.ArrayList; import java.util.HashSet; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerTableTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerTableTest.java index 747f429017..64b790d7ac 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerTableTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/discovery/internal/PeerTableTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.p2p.discovery.internal; +package tech.pegasys.pantheon.ethereum.p2p.discovery.internal; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryTestHelper; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PeerTable.AddResult.Outcome; -import net.consensys.pantheon.ethereum.p2p.peers.Peer; +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.Outcome; +import tech.pegasys.pantheon.ethereum.p2p.peers.Peer; import org.junit.Test; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/netty/CapabilityMultiplexerTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/netty/CapabilityMultiplexerTest.java index 5e5feab06e..7495523762 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/netty/CapabilityMultiplexerTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/netty/CapabilityMultiplexerTest.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.p2p.netty; +package tech.pegasys.pantheon.ethereum.p2p.netty; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.p2p.NetworkMemoryPool; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.netty.CapabilityMultiplexer.ProtocolMessage; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.RawMessage; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; +import tech.pegasys.pantheon.ethereum.p2p.NetworkMemoryPool; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.netty.CapabilityMultiplexer.ProtocolMessage; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; import java.util.Arrays; import java.util.HashSet; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/netty/NettyPeerConnectionTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/netty/NettyPeerConnectionTest.java index ae2a0b8d1d..d36f8d035d 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/netty/NettyPeerConnectionTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/netty/NettyPeerConnectionTest.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.p2p.netty; +package tech.pegasys.pantheon.ethereum.p2p.netty; import static java.util.Collections.emptyList; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.ethereum.p2p.wire.messages.HelloMessage; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection.PeerNotConnected; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.HelloMessage; +import tech.pegasys.pantheon.util.bytes.BytesValue; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/netty/PeerConnectionRegistryTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/netty/PeerConnectionRegistryTest.java index b56aa96cb4..3ff5540484 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/netty/PeerConnectionRegistryTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/netty/PeerConnectionRegistryTest.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.p2p.netty; +package tech.pegasys.pantheon.ethereum.p2p.netty; 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 net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.util.bytes.BytesValue; import org.junit.Before; import org.junit.Test; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerBlacklistTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerBlacklistTest.java index d8699710ec..52e474b411 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerBlacklistTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerBlacklistTest.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.p2p.peers; +package tech.pegasys.pantheon.ethereum.p2p.peers; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import net.consensys.pantheon.ethereum.p2p.api.PeerConnection; -import net.consensys.pantheon.ethereum.p2p.wire.PeerInfo; -import net.consensys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.p2p.api.PeerConnection; +import tech.pegasys.pantheon.ethereum.p2p.wire.PeerInfo; +import tech.pegasys.pantheon.ethereum.p2p.wire.messages.DisconnectMessage.DisconnectReason; +import tech.pegasys.pantheon.util.bytes.BytesValue; import org.junit.Test; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerTest.java index 748406b03e..e6bf893054 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/peers/PeerTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.p2p.peers; +package tech.pegasys.pantheon.ethereum.p2p.peers; -import static net.consensys.pantheon.util.bytes.BytesValue.fromHexString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; +import static tech.pegasys.pantheon.util.bytes.BytesValue.fromHexString; -import net.consensys.pantheon.ethereum.p2p.discovery.DiscoveryPeer; -import net.consensys.pantheon.ethereum.p2p.discovery.PeerDiscoveryStatus; -import net.consensys.pantheon.util.bytes.BytesValue; +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.junit.Test; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/FramerTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/FramerTest.java index 9ff5c17307..da88faffc6 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/FramerTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/FramerTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.framing; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.framing; import static io.netty.buffer.ByteBufUtil.decodeHexDump; import static io.netty.buffer.Unpooled.buffer; @@ -9,9 +9,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import net.consensys.pantheon.ethereum.p2p.api.MessageData; -import net.consensys.pantheon.ethereum.p2p.rlpx.handshake.HandshakeSecrets; -import net.consensys.pantheon.ethereum.p2p.wire.RawMessage; +import tech.pegasys.pantheon.ethereum.p2p.api.MessageData; +import tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.HandshakeSecrets; +import tech.pegasys.pantheon.ethereum.p2p.wire.RawMessage; 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/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/SnappyCompressorTest.java index cf768cd457..3b664834e3 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/SnappyCompressorTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/framing/SnappyCompressorTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.framing; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.framing; import static io.netty.buffer.ByteBufUtil.decodeHexDump; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshakeTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshakeTest.java index cb81961478..de7bb42528 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshakeTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshakeTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.crypto.SECP256K1.PrivateKey; -import net.consensys.pantheon.ethereum.p2p.rlpx.handshake.Handshaker.HandshakeStatus; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +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 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/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessageTest.java index 8d3c17e5f6..d75aa35ca6 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessageTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessageTest.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4Test.java index 420231748c..46affadb2d 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4Test.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4Test.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.p2p.rlpx.handshake.ecies; +package tech.pegasys.pantheon.ethereum.p2p.rlpx.handshake.ecies; -import net.consensys.pantheon.crypto.SECP256K1; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.io.File; import java.io.IOException; diff --git a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/wire/WireMessagesSedesTest.java b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/wire/WireMessagesSedesTest.java index 4d9e3de6bb..4941985f0d 100644 --- a/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/wire/WireMessagesSedesTest.java +++ b/ethereum/p2p/src/test/java/tech/pegasys/pantheon/ethereum/p2p/wire/WireMessagesSedesTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.p2p.wire; +package tech.pegasys.pantheon.ethereum.p2p.wire; import static io.netty.buffer.ByteBufUtil.decodeHexDump; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.rlp.RLP; +import tech.pegasys.pantheon.util.bytes.BytesValue; import io.netty.buffer.ByteBuf; import org.junit.Test; diff --git a/ethereum/rlp/src/jmh/java/tech/pegasys/pantheon/ethereum/rlp/RLPBench.java b/ethereum/rlp/src/jmh/java/tech/pegasys/pantheon/ethereum/rlp/RLPBench.java index 38222eef1d..083fcdb545 100644 --- a/ethereum/rlp/src/jmh/java/tech/pegasys/pantheon/ethereum/rlp/RLPBench.java +++ b/ethereum/rlp/src/jmh/java/tech/pegasys/pantheon/ethereum/rlp/RLPBench.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/rlp/AbstractRLPInput.java index 10131b988c..74c4626409 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/AbstractRLPInput.java +++ b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/AbstractRLPInput.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; import static com.google.common.base.Preconditions.checkState; -import net.consensys.pantheon.ethereum.rlp.RLPDecodingHelpers.Kind; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytes32; -import net.consensys.pantheon.util.uint.UInt256; -import net.consensys.pantheon.util.uint.UInt256Value; +import tech.pegasys.pantheon.ethereum.rlp.RLPDecodingHelpers.Kind; +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 java.math.BigInteger; import java.net.InetAddress; diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/AbstractRLPOutput.java b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/AbstractRLPOutput.java index bba9caf4bf..b1ada29d7c 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/AbstractRLPOutput.java +++ b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/AbstractRLPOutput.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; import static com.google.common.base.Preconditions.checkState; -import static net.consensys.pantheon.ethereum.rlp.RLPEncodingHelpers.elementSize; -import static net.consensys.pantheon.ethereum.rlp.RLPEncodingHelpers.listSize; -import static net.consensys.pantheon.ethereum.rlp.RLPEncodingHelpers.writeElement; -import static net.consensys.pantheon.ethereum.rlp.RLPEncodingHelpers.writeListHeader; +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 net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.MutableBytesValue; import java.util.ArrayList; import java.util.Arrays; diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPInput.java b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPInput.java index 487ef709ae..2d116318de 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPInput.java +++ b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPInput.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPOutput.java index ae185e06f1..ec6c33c311 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPOutput.java +++ b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPOutput.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/rlp/CorruptedRLPInputException.java index 7889cd104b..bfc8903c2e 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/CorruptedRLPInputException.java +++ b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/CorruptedRLPInputException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.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/FileRLPInput.java b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/FileRLPInput.java index 5a94e432e6..2858e6e405 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/FileRLPInput.java +++ b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/FileRLPInput.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValues; import java.io.File; import java.io.IOException; diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/MalformedRLPInputException.java b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/MalformedRLPInputException.java index 37c27df309..22c0acbf92 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/MalformedRLPInputException.java +++ b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/MalformedRLPInputException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/rlp/RLP.java index 0fdf808431..9151d12cde 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLP.java +++ b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLP.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; import static java.lang.String.format; -import static net.consensys.pantheon.ethereum.rlp.RLPDecodingHelpers.extractSize; -import static net.consensys.pantheon.ethereum.rlp.RLPEncodingHelpers.elementSize; -import static net.consensys.pantheon.ethereum.rlp.RLPEncodingHelpers.isSingleRLPByte; -import static net.consensys.pantheon.ethereum.rlp.RLPEncodingHelpers.writeElement; +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 net.consensys.pantheon.ethereum.rlp.RLPDecodingHelpers.Kind; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytesValue; +import tech.pegasys.pantheon.ethereum.rlp.RLPDecodingHelpers.Kind; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.MutableBytesValue; import java.util.ArrayList; import java.util.List; diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPDecodingHelpers.java b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPDecodingHelpers.java index e253ae3f05..2115b6901b 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPDecodingHelpers.java +++ b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPDecodingHelpers.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/rlp/RLPEncodingHelpers.java index 7dc97079d6..f3f013d579 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPEncodingHelpers.java +++ b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPEncodingHelpers.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/rlp/RLPException.java index 5b264e2ff2..13b61d131f 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPException.java +++ b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/rlp/RLPInput.java index 26deb73ede..38978eb8e2 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPInput.java +++ b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPInput.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; -import net.consensys.pantheon.util.uint.UInt256Value; +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 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/tech/pegasys/pantheon/ethereum/rlp/RLPOutput.java index b4e874484b..6ae405d2d7 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPOutput.java +++ b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RLPOutput.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; -import net.consensys.pantheon.util.bytes.MutableBytesValue; -import net.consensys.pantheon.util.uint.UInt256Value; +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 java.math.BigInteger; import java.net.InetAddress; diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RlpUtils.java b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RlpUtils.java index 8e6dc356c0..0dbc4d9c15 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RlpUtils.java +++ b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/RlpUtils.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; import java.nio.ByteBuffer; diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/VertxBufferRLPInput.java b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/VertxBufferRLPInput.java index fd4daa3ad3..539155d558 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/VertxBufferRLPInput.java +++ b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/VertxBufferRLPInput.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValues; import java.math.BigInteger; diff --git a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/VertxBufferRLPOutput.java b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/VertxBufferRLPOutput.java index a3794744ba..1f6ad8673e 100644 --- a/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/VertxBufferRLPOutput.java +++ b/ethereum/rlp/src/main/java/tech/pegasys/pantheon/ethereum/rlp/VertxBufferRLPOutput.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; -import net.consensys.pantheon.util.bytes.MutableBytesValue; +import tech.pegasys.pantheon.util.bytes.MutableBytesValue; import io.vertx.core.buffer.Buffer; 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 index e751123a53..170a4cebca 100644 --- 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 @@ -2,11 +2,11 @@ * 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 net.consensys.pantheon.ethereum.rlp.RLPOutput} (for - * instance {@link net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput}, which then exposes the - * encoded output as a {@link net.consensys.pantheon.util.bytes.BytesValue} through {@link - * net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput#encoded()}). Decoding is done by wrapping - * encoded data in a {@link net.consensys.pantheon.ethereum.rlp.RLPInput} (using, for instance, - * {@link net.consensys.pantheon.ethereum.rlp.RLP#input}) and reading from it. + * 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 net.consensys.pantheon.ethereum.rlp; +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/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPInputTest.java index 9a178581f6..14599826f5 100644 --- a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPInputTest.java +++ b/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPInputTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValue; import org.junit.Test; diff --git a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPOutputTest.java b/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPOutputTest.java index 986da0e5ca..23002cf3cb 100644 --- a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPOutputTest.java +++ b/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/BytesValueRLPOutputTest.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; import static org.junit.Assert.assertEquals; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/rlp/InvalidRLPRefTest.java index 6e8f56c3fc..1b58b28fde 100644 --- a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/InvalidRLPRefTest.java +++ b/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/InvalidRLPRefTest.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; -import net.consensys.pantheon.testutil.JsonTestParameters; +import tech.pegasys.pantheon.testutil.JsonTestParameters; import java.util.Collection; @@ -15,7 +15,7 @@ public class InvalidRLPRefTest { private static final String[] TEST_CONFIG_FILES = { // TODO: upstream these additional tests to the ethereum tests repo - "net/consensys/pantheon/ethereum/rlp/invalidRLPTest.json", "RLPTests/invalidRLPTest.json" + "tech/pegasys/pantheon/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/tech/pegasys/pantheon/ethereum/rlp/InvalidRLPRefTestCaseSpec.java index f9b0109349..b6636ecb0c 100644 --- a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/InvalidRLPRefTestCaseSpec.java +++ b/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/InvalidRLPRefTestCaseSpec.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/rlp/RLPRefTest.java index 73f80895fb..a422e0330f 100644 --- a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/RLPRefTest.java +++ b/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/RLPRefTest.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; import static org.junit.Assert.assertEquals; -import net.consensys.pantheon.testutil.JsonTestParameters; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/rlp/RLPRefTestCaseSpec.java index 9873b8c65f..b3598c449b 100644 --- a/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/RLPRefTestCaseSpec.java +++ b/ethereum/rlp/src/test/java/tech/pegasys/pantheon/ethereum/rlp/RLPRefTestCaseSpec.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.rlp; +package tech.pegasys.pantheon.ethereum.rlp; import static java.nio.charset.StandardCharsets.UTF_8; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValues; import java.math.BigInteger; import java.util.Arrays; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/BranchNode.java b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/BranchNode.java index cd99630c09..9ad8e5233f 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/BranchNode.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/BranchNode.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import static net.consensys.pantheon.crypto.Hash.keccak256; +import static tech.pegasys.pantheon.crypto.Hash.keccak256; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytesValue; +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 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/tech/pegasys/pantheon/ethereum/trie/CommitVisitor.java index bb2cf8e462..627a6907f8 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/CommitVisitor.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/CommitVisitor.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/trie/CompactEncoding.java index 57186abfed..b0b155c649 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/CompactEncoding.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/CompactEncoding.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.MutableBytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/trie/DefaultNodeFactory.java index 4deb635179..7b81d543c7 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/DefaultNodeFactory.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/DefaultNodeFactory.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/trie/ExtensionNode.java index 1f0b5fd217..ca5d20b614 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/ExtensionNode.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/ExtensionNode.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import static net.consensys.pantheon.crypto.Hash.keccak256; +import static tech.pegasys.pantheon.crypto.Hash.keccak256; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; +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 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/tech/pegasys/pantheon/ethereum/trie/GetVisitor.java index 3d628db071..d03dc56ba4 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/GetVisitor.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/GetVisitor.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/trie/KeyValueMerkleStorage.java index c65f4322b5..92b07905dd 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/KeyValueMerkleStorage.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/KeyValueMerkleStorage.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/trie/LeafNode.java index 96a029efaa..fb63b911b9 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/LeafNode.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/LeafNode.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import static net.consensys.pantheon.crypto.Hash.keccak256; +import static tech.pegasys.pantheon.crypto.Hash.keccak256; -import net.consensys.pantheon.ethereum.rlp.BytesValueRLPOutput; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +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 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/tech/pegasys/pantheon/ethereum/trie/MerklePatriciaTrie.java index c9636e5462..32065873e5 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerklePatriciaTrie.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerklePatriciaTrie.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import static net.consensys.pantheon.crypto.Hash.keccak256; +import static tech.pegasys.pantheon.crypto.Hash.keccak256; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.ethereum.rlp.RLP; +import tech.pegasys.pantheon.util.bytes.Bytes32; 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/tech/pegasys/pantheon/ethereum/trie/MerkleStorage.java index ea54c84b99..08d24c20c6 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerkleStorage.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerkleStorage.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerkleStorageException.java b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerkleStorageException.java index 2a04a41d84..a997e9edb0 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerkleStorageException.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/MerkleStorageException.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/trie/Node.java index ddff301dd7..742229cd27 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/Node.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/Node.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; 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/tech/pegasys/pantheon/ethereum/trie/NodeFactory.java index 1adfa22e0c..f38b7d903c 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeFactory.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeFactory.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/trie/NodeLoader.java index a07251b787..2ecf0da3b2 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeLoader.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeLoader.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/trie/NodeUpdater.java index 91839e13e0..83292b444c 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeUpdater.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeUpdater.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/trie/NodeVisitor.java index e5c16d4e4f..efbaf9682e 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeVisitor.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NodeVisitor.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/trie/NullNode.java index 9da10bde41..ebfdd20cf6 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NullNode.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/NullNode.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import static net.consensys.pantheon.crypto.Hash.keccak256; +import static tech.pegasys.pantheon.crypto.Hash.keccak256; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.rlp.RLP; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Optional; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/PathNodeVisitor.java b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/PathNodeVisitor.java index 0708715a8f..a43d88721f 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/PathNodeVisitor.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/PathNodeVisitor.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValue; interface PathNodeVisitor { diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/PutVisitor.java b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/PutVisitor.java index b77bfab958..da30d5ab5a 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/PutVisitor.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/PutVisitor.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/trie/RemoveVisitor.java index ac72f8633b..20527948c4 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/RemoveVisitor.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/RemoveVisitor.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/trie/SimpleMerklePatriciaTrie.java index ea04b31517..a84d2d8a3b 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/SimpleMerklePatriciaTrie.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/SimpleMerklePatriciaTrie.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; import static com.google.common.base.Preconditions.checkNotNull; -import static net.consensys.pantheon.ethereum.trie.CompactEncoding.bytesToPath; +import static tech.pegasys.pantheon.ethereum.trie.CompactEncoding.bytesToPath; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Map; import java.util.Optional; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StorageEntriesCollector.java b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StorageEntriesCollector.java index 25cd5991f0..51796ac9e2 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StorageEntriesCollector.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StorageEntriesCollector.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import net.consensys.pantheon.ethereum.trie.TrieIterator.State; -import net.consensys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.ethereum.trie.TrieIterator.State; +import tech.pegasys.pantheon.util.bytes.Bytes32; import java.util.Map; import java.util.TreeMap; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredMerklePatriciaTrie.java b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredMerklePatriciaTrie.java index 506c1611b2..54eabfc8fc 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredMerklePatriciaTrie.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredMerklePatriciaTrie.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; import static com.google.common.base.Preconditions.checkNotNull; -import static net.consensys.pantheon.ethereum.trie.CompactEncoding.bytesToPath; +import static tech.pegasys.pantheon.ethereum.trie.CompactEncoding.bytesToPath; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Map; import java.util.Optional; diff --git a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredNode.java b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredNode.java index a135361c43..8a38b179b0 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredNode.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredNode.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.ethereum.rlp.RLP; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; 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/tech/pegasys/pantheon/ethereum/trie/StoredNodeFactory.java index 3390d9be68..da13b43b84 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredNodeFactory.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/StoredNodeFactory.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; import static java.lang.String.format; -import net.consensys.pantheon.ethereum.rlp.RLP; -import net.consensys.pantheon.ethereum.rlp.RLPException; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +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 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/tech/pegasys/pantheon/ethereum/trie/TrieIterator.java index 8bf30190dd..15fd518f02 100644 --- a/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/TrieIterator.java +++ b/ethereum/trie/src/main/java/tech/pegasys/pantheon/ethereum/trie/TrieIterator.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.ArrayDeque; import java.util.Deque; diff --git a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/CompactEncodingTest.java b/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/CompactEncodingTest.java index 6083567256..30af421561 100644 --- a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/CompactEncodingTest.java +++ b/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/CompactEncodingTest.java @@ -1,11 +1,11 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.crypto.Hash; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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 java.util.Random; diff --git a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/SimpleMerklePatriciaTrieTest.java b/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/SimpleMerklePatriciaTrieTest.java index 5df8f462f7..a6b35ebcd2 100644 --- a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/SimpleMerklePatriciaTrieTest.java +++ b/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/SimpleMerklePatriciaTrieTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; import static junit.framework.TestCase.assertFalse; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.nio.charset.Charset; import java.util.Optional; diff --git a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/StoredMerklePatriciaTrieTest.java b/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/StoredMerklePatriciaTrieTest.java index 46e0e426ce..51c0cdd857 100644 --- a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/StoredMerklePatriciaTrieTest.java +++ b/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/StoredMerklePatriciaTrieTest.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; import static junit.framework.TestCase.assertFalse; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.services.kvstore.InMemoryKeyValueStorage; -import net.consensys.pantheon.services.kvstore.KeyValueStorage; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.services.kvstore.InMemoryKeyValueStorage; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.nio.charset.Charset; 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/tech/pegasys/pantheon/ethereum/trie/TrieIteratorTest.java index ae0214010d..cd92fa3f2c 100644 --- a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieIteratorTest.java +++ b/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieIteratorTest.java @@ -1,6 +1,5 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; -import static net.consensys.pantheon.ethereum.trie.CompactEncoding.bytesToPath; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.inOrder; @@ -9,13 +8,14 @@ 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 net.consensys.pantheon.crypto.Hash; -import net.consensys.pantheon.ethereum.trie.TrieIterator.LeafHandler; -import net.consensys.pantheon.ethereum.trie.TrieIterator.State; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +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 java.nio.charset.StandardCharsets; import java.util.NavigableSet; diff --git a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieRefTest.java b/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieRefTest.java index cff8767584..54167e2274 100644 --- a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieRefTest.java +++ b/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieRefTest.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.testutil.JsonTestParameters; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.testutil.JsonTestParameters; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/ethereum/trie/TrieRefTestCaseSpec.java index 810ce14d80..7cfc7e8a83 100644 --- a/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieRefTestCaseSpec.java +++ b/ethereum/trie/src/test/java/tech/pegasys/pantheon/ethereum/trie/TrieRefTestCaseSpec.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.ethereum.trie; +package tech.pegasys.pantheon.ethereum.trie; import static java.nio.charset.StandardCharsets.UTF_8; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.ArrayList; diff --git a/pantheon/build.gradle b/pantheon/build.gradle index ce5d1a6147..35bd1418e1 100644 --- a/pantheon/build.gradle +++ b/pantheon/build.gradle @@ -42,7 +42,7 @@ dependencies { } task writeInfoFile(type: ProjectPropertiesFile) { - destPackage = "net.consensys.pantheon" + destPackage = "tech.pegasys.pantheon" addString("version", "$rootProject.name/$rootProject.version") } diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/Pantheon.java b/pantheon/src/main/java/tech/pegasys/pantheon/Pantheon.java index b5a178d07c..ef6cba2563 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/Pantheon.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/Pantheon.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon; +package tech.pegasys.pantheon; import static picocli.CommandLine.defaultExceptionHandler; -import net.consensys.pantheon.cli.PantheonCommand; -import net.consensys.pantheon.cli.PantheonControllerBuilder; -import net.consensys.pantheon.ethereum.eth.sync.SynchronizerConfiguration.Builder; -import net.consensys.pantheon.util.BlockImporter; -import net.consensys.pantheon.util.BlockchainImporter; +import tech.pegasys.pantheon.cli.PantheonCommand; +import tech.pegasys.pantheon.cli.PantheonControllerBuilder; +import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration.Builder; +import tech.pegasys.pantheon.util.BlockImporter; +import tech.pegasys.pantheon.util.BlockchainImporter; import picocli.CommandLine.RunLast; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/PantheonInfo.java b/pantheon/src/main/java/tech/pegasys/pantheon/PantheonInfo.java index c896b970dd..e70b9dcf55 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/PantheonInfo.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/PantheonInfo.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon; +package tech.pegasys.pantheon; // This file is generated via a gradle task and should not be edited directly. public class PantheonInfo { diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/Runner.java b/pantheon/src/main/java/tech/pegasys/pantheon/Runner.java index e61424a54b..99cbac330c 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/Runner.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/Runner.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon; +package tech.pegasys.pantheon; -import net.consensys.pantheon.controller.PantheonController; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcHttpService; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.WebSocketService; -import net.consensys.pantheon.ethereum.p2p.NetworkRunner; +import tech.pegasys.pantheon.controller.PantheonController; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcHttpService; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.WebSocketService; +import tech.pegasys.pantheon.ethereum.p2p.NetworkRunner; import java.io.File; import java.io.FileOutputStream; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/RunnerBuilder.java b/pantheon/src/main/java/tech/pegasys/pantheon/RunnerBuilder.java index 3b7dd5f790..ebc684b3b2 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/RunnerBuilder.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/RunnerBuilder.java @@ -1,44 +1,44 @@ -package net.consensys.pantheon; - -import net.consensys.pantheon.consensus.clique.CliqueContext; -import net.consensys.pantheon.consensus.clique.jsonrpc.CliqueJsonRpcMethodsFactory; -import net.consensys.pantheon.consensus.ibft.IbftContext; -import net.consensys.pantheon.consensus.ibft.jsonrpc.IbftJsonRpcMethodsFactory; -import net.consensys.pantheon.controller.PantheonController; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; -import net.consensys.pantheon.ethereum.chain.Blockchain; -import net.consensys.pantheon.ethereum.core.Synchronizer; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcHttpService; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcMethodsFactory; -import net.consensys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; -import net.consensys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.WebSocketConfiguration; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.WebSocketRequestHandler; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.WebSocketService; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.methods.WebSocketMethodsFactory; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.blockheaders.NewBlockHeadersSubscriptionService; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.logs.LogsSubscriptionService; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.pending.PendingTransactionSubscriptionService; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.subscription.syncing.SyncingSubscriptionService; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.NetworkRunner; -import net.consensys.pantheon.ethereum.p2p.api.ProtocolManager; -import net.consensys.pantheon.ethereum.p2p.config.DiscoveryConfiguration; -import net.consensys.pantheon.ethereum.p2p.config.NetworkingConfiguration; -import net.consensys.pantheon.ethereum.p2p.config.RlpxConfiguration; -import net.consensys.pantheon.ethereum.p2p.config.SubProtocolConfiguration; -import net.consensys.pantheon.ethereum.p2p.discovery.internal.PeerRequirement; -import net.consensys.pantheon.ethereum.p2p.netty.NettyP2PNetwork; -import net.consensys.pantheon.ethereum.p2p.peers.PeerBlacklist; -import net.consensys.pantheon.ethereum.p2p.wire.Capability; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; +package tech.pegasys.pantheon; + +import tech.pegasys.pantheon.consensus.clique.CliqueContext; +import tech.pegasys.pantheon.consensus.clique.jsonrpc.CliqueJsonRpcMethodsFactory; +import tech.pegasys.pantheon.consensus.ibft.IbftContext; +import tech.pegasys.pantheon.consensus.ibft.jsonrpc.IbftJsonRpcMethodsFactory; +import tech.pegasys.pantheon.controller.PantheonController; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; +import tech.pegasys.pantheon.ethereum.chain.Blockchain; +import tech.pegasys.pantheon.ethereum.core.Synchronizer; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcHttpService; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcMethodsFactory; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod; +import tech.pegasys.pantheon.ethereum.jsonrpc.internal.queries.BlockchainQueries; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.WebSocketConfiguration; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.WebSocketRequestHandler; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.WebSocketService; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.methods.WebSocketMethodsFactory; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.SubscriptionManager; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.blockheaders.NewBlockHeadersSubscriptionService; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.logs.LogsSubscriptionService; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.pending.PendingTransactionSubscriptionService; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.subscription.syncing.SyncingSubscriptionService; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.p2p.NetworkRunner; +import tech.pegasys.pantheon.ethereum.p2p.api.ProtocolManager; +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.discovery.internal.PeerRequirement; +import tech.pegasys.pantheon.ethereum.p2p.netty.NettyP2PNetwork; +import tech.pegasys.pantheon.ethereum.p2p.peers.PeerBlacklist; +import tech.pegasys.pantheon.ethereum.p2p.wire.Capability; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; import java.nio.file.Path; import java.util.Collection; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/ConfigOptionSearchAndRunHandler.java b/pantheon/src/main/java/tech/pegasys/pantheon/cli/ConfigOptionSearchAndRunHandler.java index 8aec0f2cd0..a236dd779a 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/ConfigOptionSearchAndRunHandler.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/cli/ConfigOptionSearchAndRunHandler.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.cli; +package tech.pegasys.pantheon.cli; import java.io.File; import java.util.ArrayList; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/EthNetworkConfig.java b/pantheon/src/main/java/tech/pegasys/pantheon/cli/EthNetworkConfig.java index 79667a165d..17569a551a 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/EthNetworkConfig.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/cli/EthNetworkConfig.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.cli; +package tech.pegasys.pantheon.cli; -import static net.consensys.pantheon.controller.CliquePantheonController.RINKEBY_NETWORK_ID; -import static net.consensys.pantheon.controller.MainnetPantheonController.MAINNET_NETWORK_ID; -import static net.consensys.pantheon.ethereum.p2p.config.DiscoveryConfiguration.MAINNET_BOOTSTRAP_NODES; -import static net.consensys.pantheon.ethereum.p2p.config.DiscoveryConfiguration.RINKEBY_BOOTSTRAP_NODES; +import static tech.pegasys.pantheon.controller.CliquePantheonController.RINKEBY_NETWORK_ID; +import static tech.pegasys.pantheon.controller.MainnetPantheonController.MAINNET_NETWORK_ID; +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 java.net.URI; import java.net.URISyntaxException; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/ExportPublicKeySubCommand.java b/pantheon/src/main/java/tech/pegasys/pantheon/cli/ExportPublicKeySubCommand.java index a464c6f325..b861cfb88b 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/ExportPublicKeySubCommand.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/cli/ExportPublicKeySubCommand.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.cli; +package tech.pegasys.pantheon.cli; import static java.nio.charset.StandardCharsets.UTF_8; -import net.consensys.pantheon.controller.PantheonController; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.controller.PantheonController; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; import java.io.BufferedWriter; import java.io.File; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/ImportBlockchainSubCommand.java b/pantheon/src/main/java/tech/pegasys/pantheon/cli/ImportBlockchainSubCommand.java index efecc6f6d7..7e4d6da483 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/ImportBlockchainSubCommand.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/cli/ImportBlockchainSubCommand.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.cli; +package tech.pegasys.pantheon.cli; import static com.google.common.base.Preconditions.checkNotNull; -import net.consensys.pantheon.util.BlockImporter; +import tech.pegasys.pantheon.util.BlockImporter; import java.io.IOException; import java.nio.file.Path; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/ImportSubCommand.java b/pantheon/src/main/java/tech/pegasys/pantheon/cli/ImportSubCommand.java index 087bfaf03e..a9baafa087 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/ImportSubCommand.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/cli/ImportSubCommand.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.cli; +package tech.pegasys.pantheon.cli; import static com.google.common.base.Preconditions.checkNotNull; -import net.consensys.pantheon.util.BlockImporter; +import tech.pegasys.pantheon.util.BlockImporter; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java b/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java index 5d9dc7dd86..d6bd6a8daf 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java @@ -1,24 +1,24 @@ -package net.consensys.pantheon.cli; +package tech.pegasys.pantheon.cli; import static com.google.common.base.Preconditions.checkNotNull; -import net.consensys.pantheon.Runner; -import net.consensys.pantheon.RunnerBuilder; -import net.consensys.pantheon.cli.custom.CorsAllowedOriginsProperty; -import net.consensys.pantheon.controller.PantheonController; -import net.consensys.pantheon.ethereum.blockcreation.MiningParameters; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.eth.sync.SyncMode; -import net.consensys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import net.consensys.pantheon.ethereum.eth.sync.SynchronizerConfiguration.Builder; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.WebSocketConfiguration; -import net.consensys.pantheon.ethereum.p2p.peers.DefaultPeer; -import net.consensys.pantheon.util.BlockImporter; -import net.consensys.pantheon.util.BlockchainImporter; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.Runner; +import tech.pegasys.pantheon.RunnerBuilder; +import tech.pegasys.pantheon.cli.custom.CorsAllowedOriginsProperty; +import tech.pegasys.pantheon.controller.PantheonController; +import tech.pegasys.pantheon.ethereum.blockcreation.MiningParameters; +import tech.pegasys.pantheon.ethereum.core.Address; +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.sync.SynchronizerConfiguration.Builder; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration.RpcApis; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.WebSocketConfiguration; +import tech.pegasys.pantheon.ethereum.p2p.peers.DefaultPeer; +import tech.pegasys.pantheon.util.BlockImporter; +import tech.pegasys.pantheon.util.BlockchainImporter; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.io.File; import java.io.IOException; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonControllerBuilder.java b/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonControllerBuilder.java index c14854b69a..b3010dd1ca 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonControllerBuilder.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonControllerBuilder.java @@ -1,14 +1,14 @@ -package net.consensys.pantheon.cli; +package tech.pegasys.pantheon.cli; import static java.nio.charset.StandardCharsets.UTF_8; -import static net.consensys.pantheon.controller.KeyPairUtil.loadKeyPair; +import static tech.pegasys.pantheon.controller.KeyPairUtil.loadKeyPair; -import net.consensys.pantheon.controller.MainnetPantheonController; -import net.consensys.pantheon.controller.PantheonController; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.blockcreation.MiningParameters; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; +import tech.pegasys.pantheon.controller.MainnetPantheonController; +import tech.pegasys.pantheon.controller.PantheonController; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.ethereum.blockcreation.MiningParameters; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; import java.io.IOException; import java.nio.file.Path; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/TomlConfigFileDefaultProvider.java b/pantheon/src/main/java/tech/pegasys/pantheon/cli/TomlConfigFileDefaultProvider.java index b438929ac4..b737e766a9 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/TomlConfigFileDefaultProvider.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/cli/TomlConfigFileDefaultProvider.java @@ -1,15 +1,14 @@ -package net.consensys.pantheon.cli; - -import net.consensys.cava.toml.Toml; -import net.consensys.cava.toml.TomlArray; -import net.consensys.cava.toml.TomlParseError; -import net.consensys.cava.toml.TomlParseResult; +package tech.pegasys.pantheon.cli; import java.io.File; import java.io.IOException; import java.util.List; import java.util.stream.Collectors; +import net.consensys.cava.toml.Toml; +import net.consensys.cava.toml.TomlArray; +import net.consensys.cava.toml.TomlParseError; +import net.consensys.cava.toml.TomlParseResult; import picocli.CommandLine; import picocli.CommandLine.IDefaultValueProvider; import picocli.CommandLine.Model.ArgSpec; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/VersionProvider.java b/pantheon/src/main/java/tech/pegasys/pantheon/cli/VersionProvider.java index 136fa6282a..d5ea99076c 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/VersionProvider.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/cli/VersionProvider.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.cli; +package tech.pegasys.pantheon.cli; -import net.consensys.pantheon.PantheonInfo; +import tech.pegasys.pantheon.PantheonInfo; import picocli.CommandLine; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/custom/CorsAllowedOriginsProperty.java b/pantheon/src/main/java/tech/pegasys/pantheon/cli/custom/CorsAllowedOriginsProperty.java index 7b8eed25ab..707b899652 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/custom/CorsAllowedOriginsProperty.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/cli/custom/CorsAllowedOriginsProperty.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.cli.custom; +package tech.pegasys.pantheon.cli.custom; import java.util.ArrayList; import java.util.Arrays; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/CliquePantheonController.java b/pantheon/src/main/java/tech/pegasys/pantheon/controller/CliquePantheonController.java index c5af0772a1..0d0fe15948 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/CliquePantheonController.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/controller/CliquePantheonController.java @@ -1,42 +1,42 @@ -package net.consensys.pantheon.controller; +package tech.pegasys.pantheon.controller; import static org.apache.logging.log4j.LogManager.getLogger; -import net.consensys.pantheon.consensus.clique.CliqueContext; -import net.consensys.pantheon.consensus.clique.CliqueVoteTallyUpdater; -import net.consensys.pantheon.consensus.clique.VoteTallyCache; -import net.consensys.pantheon.consensus.clique.blockcreation.CliqueBlockMiner; -import net.consensys.pantheon.consensus.clique.blockcreation.CliqueBlockScheduler; -import net.consensys.pantheon.consensus.clique.blockcreation.CliqueMinerExecutor; -import net.consensys.pantheon.consensus.clique.blockcreation.CliqueMiningCoordinator; -import net.consensys.pantheon.consensus.common.EpochManager; -import net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; -import net.consensys.pantheon.ethereum.blockcreation.MiningParameters; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.BlockHashFunction; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Synchronizer; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.core.Util; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.eth.EthProtocol; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManager; -import net.consensys.pantheon.ethereum.eth.sync.DefaultSynchronizer; -import net.consensys.pantheon.ethereum.eth.sync.SyncMode; -import net.consensys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import net.consensys.pantheon.ethereum.eth.transactions.TransactionPoolFactory; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; -import net.consensys.pantheon.ethereum.p2p.api.ProtocolManager; -import net.consensys.pantheon.ethereum.p2p.config.SubProtocolConfiguration; -import net.consensys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; -import net.consensys.pantheon.services.kvstore.RocksDbKeyValueStorage; -import net.consensys.pantheon.util.time.SystemClock; +import tech.pegasys.pantheon.consensus.clique.CliqueContext; +import tech.pegasys.pantheon.consensus.clique.CliqueVoteTallyUpdater; +import tech.pegasys.pantheon.consensus.clique.VoteTallyCache; +import tech.pegasys.pantheon.consensus.clique.blockcreation.CliqueBlockMiner; +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.common.EpochManager; +import tech.pegasys.pantheon.consensus.common.VoteProposer; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; +import tech.pegasys.pantheon.ethereum.blockcreation.MiningParameters; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; +import tech.pegasys.pantheon.ethereum.core.BlockHashFunction; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.Synchronizer; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.core.Util; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.eth.EthProtocol; +import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; +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.transactions.TransactionPoolFactory; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; +import tech.pegasys.pantheon.ethereum.p2p.api.ProtocolManager; +import tech.pegasys.pantheon.ethereum.p2p.config.SubProtocolConfiguration; +import tech.pegasys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; +import tech.pegasys.pantheon.services.kvstore.RocksDbKeyValueStorage; +import tech.pegasys.pantheon.util.time.SystemClock; import java.io.IOException; import java.nio.file.Files; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonController.java b/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonController.java index a2a5913449..09eadc689e 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonController.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonController.java @@ -1,45 +1,45 @@ -package net.consensys.pantheon.controller; +package tech.pegasys.pantheon.controller; import static org.apache.logging.log4j.LogManager.getLogger; -import net.consensys.pantheon.consensus.common.EpochManager; -import net.consensys.pantheon.consensus.common.VoteProposer; -import net.consensys.pantheon.consensus.common.VoteTally; -import net.consensys.pantheon.consensus.ibft.IbftContext; -import net.consensys.pantheon.consensus.ibft.IbftEventQueue; -import net.consensys.pantheon.consensus.ibft.IbftProcessor; -import net.consensys.pantheon.consensus.ibft.IbftProtocolSchedule; -import net.consensys.pantheon.consensus.ibft.IbftStateMachine; -import net.consensys.pantheon.consensus.ibft.VoteTallyUpdater; -import net.consensys.pantheon.consensus.ibft.blockcreation.IbftBlockMiner; -import net.consensys.pantheon.consensus.ibft.protocol.IbftProtocolManager; -import net.consensys.pantheon.consensus.ibft.protocol.IbftSubProtocol; -import net.consensys.pantheon.consensus.ibft.protocol.Istanbul64Protocol; -import net.consensys.pantheon.consensus.ibft.protocol.Istanbul64ProtocolManager; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.BlockHashFunction; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Synchronizer; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.eth.EthProtocol; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManager; -import net.consensys.pantheon.ethereum.eth.sync.DefaultSynchronizer; -import net.consensys.pantheon.ethereum.eth.sync.SyncMode; -import net.consensys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import net.consensys.pantheon.ethereum.eth.transactions.TransactionPoolFactory; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; -import net.consensys.pantheon.ethereum.p2p.api.ProtocolManager; -import net.consensys.pantheon.ethereum.p2p.config.SubProtocolConfiguration; -import net.consensys.pantheon.ethereum.p2p.wire.SubProtocol; -import net.consensys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; -import net.consensys.pantheon.services.kvstore.RocksDbKeyValueStorage; +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.ibft.IbftContext; +import tech.pegasys.pantheon.consensus.ibft.IbftEventQueue; +import tech.pegasys.pantheon.consensus.ibft.IbftProcessor; +import tech.pegasys.pantheon.consensus.ibft.IbftProtocolSchedule; +import tech.pegasys.pantheon.consensus.ibft.IbftStateMachine; +import tech.pegasys.pantheon.consensus.ibft.VoteTallyUpdater; +import tech.pegasys.pantheon.consensus.ibft.blockcreation.IbftBlockMiner; +import tech.pegasys.pantheon.consensus.ibft.protocol.IbftProtocolManager; +import tech.pegasys.pantheon.consensus.ibft.protocol.IbftSubProtocol; +import tech.pegasys.pantheon.consensus.ibft.protocol.Istanbul64Protocol; +import tech.pegasys.pantheon.consensus.ibft.protocol.Istanbul64ProtocolManager; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; +import tech.pegasys.pantheon.ethereum.core.BlockHashFunction; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.Synchronizer; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.eth.EthProtocol; +import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; +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.transactions.TransactionPoolFactory; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; +import tech.pegasys.pantheon.ethereum.p2p.api.ProtocolManager; +import tech.pegasys.pantheon.ethereum.p2p.config.SubProtocolConfiguration; +import tech.pegasys.pantheon.ethereum.p2p.wire.SubProtocol; +import tech.pegasys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; +import tech.pegasys.pantheon.services.kvstore.RocksDbKeyValueStorage; import java.io.IOException; import java.nio.file.Files; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/KeyPairUtil.java b/pantheon/src/main/java/tech/pegasys/pantheon/controller/KeyPairUtil.java index b7adc846bb..6cbddc512d 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/KeyPairUtil.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/controller/KeyPairUtil.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.controller; +package tech.pegasys.pantheon.controller; -import net.consensys.pantheon.crypto.SECP256K1; +import tech.pegasys.pantheon.crypto.SECP256K1; import java.io.File; import java.io.IOException; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/MainnetPantheonController.java b/pantheon/src/main/java/tech/pegasys/pantheon/controller/MainnetPantheonController.java index bd2b436942..7d35c28231 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/MainnetPantheonController.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/controller/MainnetPantheonController.java @@ -1,37 +1,37 @@ -package net.consensys.pantheon.controller; +package tech.pegasys.pantheon.controller; -import static net.consensys.pantheon.controller.KeyPairUtil.loadKeyPair; import static org.apache.logging.log4j.LogManager.getLogger; - -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.DefaultBlockScheduler; -import net.consensys.pantheon.ethereum.blockcreation.EthHashBlockMiner; -import net.consensys.pantheon.ethereum.blockcreation.EthHashMinerExecutor; -import net.consensys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; -import net.consensys.pantheon.ethereum.blockcreation.MiningParameters; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.BlockHashFunction; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.Synchronizer; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.db.DefaultMutableBlockchain; -import net.consensys.pantheon.ethereum.db.WorldStateArchive; -import net.consensys.pantheon.ethereum.eth.EthProtocol; -import net.consensys.pantheon.ethereum.eth.manager.EthProtocolManager; -import net.consensys.pantheon.ethereum.eth.sync.DefaultSynchronizer; -import net.consensys.pantheon.ethereum.eth.sync.SyncMode; -import net.consensys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import net.consensys.pantheon.ethereum.eth.transactions.TransactionPoolFactory; -import net.consensys.pantheon.ethereum.mainnet.MainnetBlockHeaderValidator; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; -import net.consensys.pantheon.ethereum.p2p.api.ProtocolManager; -import net.consensys.pantheon.ethereum.p2p.config.SubProtocolConfiguration; -import net.consensys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; -import net.consensys.pantheon.services.kvstore.RocksDbKeyValueStorage; -import net.consensys.pantheon.util.time.SystemClock; +import static tech.pegasys.pantheon.controller.KeyPairUtil.loadKeyPair; + +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.blockcreation.DefaultBlockScheduler; +import tech.pegasys.pantheon.ethereum.blockcreation.EthHashBlockMiner; +import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMinerExecutor; +import tech.pegasys.pantheon.ethereum.blockcreation.EthHashMiningCoordinator; +import tech.pegasys.pantheon.ethereum.blockcreation.MiningParameters; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +import tech.pegasys.pantheon.ethereum.chain.MutableBlockchain; +import tech.pegasys.pantheon.ethereum.core.BlockHashFunction; +import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.Synchronizer; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.db.DefaultMutableBlockchain; +import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; +import tech.pegasys.pantheon.ethereum.eth.EthProtocol; +import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager; +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.transactions.TransactionPoolFactory; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetBlockHeaderValidator; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; +import tech.pegasys.pantheon.ethereum.p2p.api.ProtocolManager; +import tech.pegasys.pantheon.ethereum.p2p.config.SubProtocolConfiguration; +import tech.pegasys.pantheon.ethereum.worldstate.KeyValueStorageWorldStateStorage; +import tech.pegasys.pantheon.services.kvstore.RocksDbKeyValueStorage; +import tech.pegasys.pantheon.util.time.SystemClock; import java.io.IOException; import java.nio.file.Files; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java b/pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java index e5cc0b4521..d705c1d8e7 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java @@ -1,20 +1,20 @@ -package net.consensys.pantheon.controller; - -import net.consensys.pantheon.consensus.clique.CliqueProtocolSchedule; -import net.consensys.pantheon.consensus.ibft.IbftProtocolSchedule; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractBlockCreator; -import net.consensys.pantheon.ethereum.blockcreation.AbstractMiningCoordinator; -import net.consensys.pantheon.ethereum.blockcreation.BlockMiner; -import net.consensys.pantheon.ethereum.blockcreation.MiningParameters; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.core.Synchronizer; -import net.consensys.pantheon.ethereum.core.TransactionPool; -import net.consensys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.p2p.config.SubProtocolConfiguration; +package tech.pegasys.pantheon.controller; + +import tech.pegasys.pantheon.consensus.clique.CliqueProtocolSchedule; +import tech.pegasys.pantheon.consensus.ibft.IbftProtocolSchedule; +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.blockcreation.AbstractMiningCoordinator; +import tech.pegasys.pantheon.ethereum.blockcreation.BlockMiner; +import tech.pegasys.pantheon.ethereum.blockcreation.MiningParameters; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +import tech.pegasys.pantheon.ethereum.core.Synchronizer; +import tech.pegasys.pantheon.ethereum.core.TransactionPool; +import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.ethereum.p2p.config.SubProtocolConfiguration; import java.io.Closeable; import java.io.IOException; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/management/RestfulRouteBuilder.java b/pantheon/src/main/java/tech/pegasys/pantheon/management/RestfulRouteBuilder.java index c41d429566..4cabd1542a 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/management/RestfulRouteBuilder.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/management/RestfulRouteBuilder.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.management; +package tech.pegasys.pantheon.management; import java.util.Collections; import java.util.HashMap; diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/util/BlockImporter.java b/pantheon/src/main/java/tech/pegasys/pantheon/util/BlockImporter.java index 7d580f2dff..3c6031e544 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/util/BlockImporter.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/util/BlockImporter.java @@ -1,22 +1,22 @@ -package net.consensys.pantheon.util; +package tech.pegasys.pantheon.util; import static org.apache.logging.log4j.LogManager.getLogger; -import net.consensys.pantheon.controller.PantheonController; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractBlockCreator; -import net.consensys.pantheon.ethereum.blockcreation.BlockMiner; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; -import net.consensys.pantheon.ethereum.util.RawBlockIterator; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.controller.PantheonController; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractBlockCreator; +import tech.pegasys.pantheon.ethereum.blockcreation.BlockMiner; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +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.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.ScheduleBasedBlockHashFunction; +import tech.pegasys.pantheon.ethereum.util.RawBlockIterator; +import tech.pegasys.pantheon.util.uint.UInt256; import java.io.IOException; import java.nio.file.Path; @@ -78,7 +78,7 @@ public class BlockImporter { throw new IllegalStateException( "Invalid header at block number " + header.getNumber() + "."); } - final net.consensys.pantheon.ethereum.core.BlockImporter blockImporter = + final tech.pegasys.pantheon.ethereum.core.BlockImporter blockImporter = protocolSpec.getBlockImporter(); final boolean blockImported = blockImporter.importBlock(context, block, HeaderValidationMode.NONE); diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/util/BlockchainImporter.java b/pantheon/src/main/java/tech/pegasys/pantheon/util/BlockchainImporter.java index 0d6349d5e7..2fdcbe8576 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/util/BlockchainImporter.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/util/BlockchainImporter.java @@ -1,34 +1,34 @@ -package net.consensys.pantheon.util; +package tech.pegasys.pantheon.util; import static com.google.common.base.Preconditions.checkNotNull; import static java.lang.String.format; -import net.consensys.pantheon.controller.PantheonController; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.AbstractBlockCreator; -import net.consensys.pantheon.ethereum.blockcreation.BlockMiner; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.chain.MutableBlockchain; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockBody; -import net.consensys.pantheon.ethereum.core.BlockHeader; -import net.consensys.pantheon.ethereum.core.Hash; -import net.consensys.pantheon.ethereum.core.MutableAccount; -import net.consensys.pantheon.ethereum.core.MutableWorldState; -import net.consensys.pantheon.ethereum.core.Transaction; -import net.consensys.pantheon.ethereum.core.TransactionReceipt; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.core.WorldUpdater; -import net.consensys.pantheon.ethereum.mainnet.BlockHeaderValidator; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.mainnet.ScheduleBasedBlockHashFunction; -import net.consensys.pantheon.ethereum.rlp.FileRLPInput; -import net.consensys.pantheon.ethereum.rlp.RLPInput; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.controller.PantheonController; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.blockcreation.AbstractBlockCreator; +import tech.pegasys.pantheon.ethereum.blockcreation.BlockMiner; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +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.Hash; +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.WorldUpdater; +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.ScheduleBasedBlockHashFunction; +import tech.pegasys.pantheon.ethereum.rlp.FileRLPInput; +import tech.pegasys.pantheon.ethereum.rlp.RLPInput; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.uint.UInt256; import java.io.IOException; import java.nio.channels.FileChannel; @@ -265,7 +265,7 @@ public class BlockchainImporter extends BlockImporter { itemStartingOffset, header, body, receiptsStr)); } - net.consensys.pantheon.ethereum.core.BlockImporter blockImporter; + tech.pegasys.pantheon.ethereum.core.BlockImporter blockImporter; blockImporter = protocolSpec.getBlockImporter(); if (!isSkipBlocks) { diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/RunnerTest.java b/pantheon/src/test/java/tech/pegasys/pantheon/RunnerTest.java index daa4d1d6dc..5f7b0d6dae 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/RunnerTest.java +++ b/pantheon/src/test/java/tech/pegasys/pantheon/RunnerTest.java @@ -1,27 +1,27 @@ -package net.consensys.pantheon; +package tech.pegasys.pantheon; -import static net.consensys.pantheon.controller.KeyPairUtil.loadKeyPair; import static org.assertj.core.api.Assertions.assertThat; - -import net.consensys.pantheon.controller.MainnetPantheonController; -import net.consensys.pantheon.controller.PantheonController; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.ProtocolContext; -import net.consensys.pantheon.ethereum.blockcreation.EthHashBlockMiner; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.core.Block; -import net.consensys.pantheon.ethereum.core.BlockImporter; -import net.consensys.pantheon.ethereum.core.BlockSyncTestUtils; -import net.consensys.pantheon.ethereum.core.MiningParametersTestBuilder; -import net.consensys.pantheon.ethereum.eth.sync.SyncMode; -import net.consensys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.WebSocketConfiguration; -import net.consensys.pantheon.ethereum.mainnet.HeaderValidationMode; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSpec; -import net.consensys.pantheon.ethereum.p2p.peers.DefaultPeer; -import net.consensys.pantheon.util.uint.UInt256; +import static tech.pegasys.pantheon.controller.KeyPairUtil.loadKeyPair; + +import tech.pegasys.pantheon.controller.MainnetPantheonController; +import tech.pegasys.pantheon.controller.PantheonController; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.ethereum.ProtocolContext; +import tech.pegasys.pantheon.ethereum.blockcreation.EthHashBlockMiner; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +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.MiningParametersTestBuilder; +import tech.pegasys.pantheon.ethereum.eth.sync.SyncMode; +import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.WebSocketConfiguration; +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.DefaultPeer; +import tech.pegasys.pantheon.util.uint.UInt256; import java.net.InetAddress; import java.nio.file.Path; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/CommandTestAbstract.java b/pantheon/src/test/java/tech/pegasys/pantheon/cli/CommandTestAbstract.java index a5fa98b297..5572a99643 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/CommandTestAbstract.java +++ b/pantheon/src/test/java/tech/pegasys/pantheon/cli/CommandTestAbstract.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.cli; +package tech.pegasys.pantheon.cli; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.when; -import net.consensys.pantheon.Runner; -import net.consensys.pantheon.RunnerBuilder; -import net.consensys.pantheon.controller.PantheonController; -import net.consensys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.WebSocketConfiguration; -import net.consensys.pantheon.util.BlockImporter; +import tech.pegasys.pantheon.Runner; +import tech.pegasys.pantheon.RunnerBuilder; +import tech.pegasys.pantheon.controller.PantheonController; +import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.WebSocketConfiguration; +import tech.pegasys.pantheon.util.BlockImporter; import java.io.ByteArrayOutputStream; import java.io.PrintStream; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/ConfigOptionSearchAndRunHandlerTest.java b/pantheon/src/test/java/tech/pegasys/pantheon/cli/ConfigOptionSearchAndRunHandlerTest.java index b9050834ff..83bb110650 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/ConfigOptionSearchAndRunHandlerTest.java +++ b/pantheon/src/test/java/tech/pegasys/pantheon/cli/ConfigOptionSearchAndRunHandlerTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.cli; +package tech.pegasys.pantheon.cli; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/ExportPublicKeySubCommandTest.java b/pantheon/src/test/java/tech/pegasys/pantheon/cli/ExportPublicKeySubCommandTest.java index 38cffd1724..61e1ad3dcb 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/ExportPublicKeySubCommandTest.java +++ b/pantheon/src/test/java/tech/pegasys/pantheon/cli/ExportPublicKeySubCommandTest.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.cli; +package tech.pegasys.pantheon.cli; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.contentOf; import static org.mockito.Mockito.when; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; import java.io.File; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/ImportSubCommandTest.java b/pantheon/src/test/java/tech/pegasys/pantheon/cli/ImportSubCommandTest.java index 36b82141ac..34e6db2829 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/ImportSubCommandTest.java +++ b/pantheon/src/test/java/tech/pegasys/pantheon/cli/ImportSubCommandTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.cli; +package tech.pegasys.pantheon.cli; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java b/pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java index 4c5624393c..3f8ce3f28f 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java +++ b/pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java @@ -1,8 +1,7 @@ -package net.consensys.pantheon.cli; +package tech.pegasys.pantheon.cli; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Arrays.asList; -import static net.consensys.pantheon.ethereum.p2p.config.DiscoveryConfiguration.MAINNET_BOOTSTRAP_NODES; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -13,16 +12,17 @@ import static org.mockito.ArgumentMatchers.isNotNull; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; - -import net.consensys.pantheon.PantheonInfo; -import net.consensys.pantheon.cli.EthNetworkConfig.Builder; -import net.consensys.pantheon.ethereum.blockcreation.MiningParameters; -import net.consensys.pantheon.ethereum.core.Address; -import net.consensys.pantheon.ethereum.core.Wei; -import net.consensys.pantheon.ethereum.eth.sync.SyncMode; -import net.consensys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration; -import net.consensys.pantheon.ethereum.jsonrpc.websocket.WebSocketConfiguration; -import net.consensys.pantheon.util.bytes.BytesValue; +import static tech.pegasys.pantheon.ethereum.p2p.config.DiscoveryConfiguration.MAINNET_BOOTSTRAP_NODES; + +import tech.pegasys.pantheon.PantheonInfo; +import tech.pegasys.pantheon.cli.EthNetworkConfig.Builder; +import tech.pegasys.pantheon.ethereum.blockcreation.MiningParameters; +import tech.pegasys.pantheon.ethereum.core.Address; +import tech.pegasys.pantheon.ethereum.core.Wei; +import tech.pegasys.pantheon.ethereum.eth.sync.SyncMode; +import tech.pegasys.pantheon.ethereum.jsonrpc.JsonRpcConfiguration; +import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.WebSocketConfiguration; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.io.File; import java.io.IOException; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/TomlConfigFileDefaultProviderTest.java b/pantheon/src/test/java/tech/pegasys/pantheon/cli/TomlConfigFileDefaultProviderTest.java index 7dae34ad65..e0dd3ec540 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/TomlConfigFileDefaultProviderTest.java +++ b/pantheon/src/test/java/tech/pegasys/pantheon/cli/TomlConfigFileDefaultProviderTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.cli; +package tech.pegasys.pantheon.cli; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/util/BlockImporterTest.java b/pantheon/src/test/java/tech/pegasys/pantheon/util/BlockImporterTest.java index d72c6cc0e5..05665ccc39 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/util/BlockImporterTest.java +++ b/pantheon/src/test/java/tech/pegasys/pantheon/util/BlockImporterTest.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.util; +package tech.pegasys.pantheon.util; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; -import net.consensys.pantheon.controller.MainnetPantheonController; -import net.consensys.pantheon.controller.PantheonController; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.core.MiningParametersTestBuilder; -import net.consensys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import net.consensys.pantheon.testutil.BlockTestUtil; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.controller.MainnetPantheonController; +import tech.pegasys.pantheon.controller.PantheonController; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.ethereum.core.MiningParametersTestBuilder; +import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; +import tech.pegasys.pantheon.testutil.BlockTestUtil; +import tech.pegasys.pantheon.util.uint.UInt256; import java.io.IOException; import java.nio.file.Files; diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/util/BlockchainImporterTest.java b/pantheon/src/test/java/tech/pegasys/pantheon/util/BlockchainImporterTest.java index 1ee05853db..f95a2e8720 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/util/BlockchainImporterTest.java +++ b/pantheon/src/test/java/tech/pegasys/pantheon/util/BlockchainImporterTest.java @@ -1,19 +1,19 @@ -package net.consensys.pantheon.util; +package tech.pegasys.pantheon.util; -import static net.consensys.pantheon.controller.KeyPairUtil.loadKeyPair; import static org.assertj.core.api.Assertions.assertThat; +import static tech.pegasys.pantheon.controller.KeyPairUtil.loadKeyPair; -import net.consensys.pantheon.controller.MainnetPantheonController; -import net.consensys.pantheon.controller.PantheonController; -import net.consensys.pantheon.crypto.SECP256K1.KeyPair; -import net.consensys.pantheon.ethereum.blockcreation.EthHashBlockMiner; -import net.consensys.pantheon.ethereum.blockcreation.MiningParameters; -import net.consensys.pantheon.ethereum.chain.GenesisConfig; -import net.consensys.pantheon.ethereum.core.MiningParametersTestBuilder; -import net.consensys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; -import net.consensys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; -import net.consensys.pantheon.ethereum.mainnet.ProtocolSchedule; -import net.consensys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.controller.MainnetPantheonController; +import tech.pegasys.pantheon.controller.PantheonController; +import tech.pegasys.pantheon.crypto.SECP256K1.KeyPair; +import tech.pegasys.pantheon.ethereum.blockcreation.EthHashBlockMiner; +import tech.pegasys.pantheon.ethereum.blockcreation.MiningParameters; +import tech.pegasys.pantheon.ethereum.chain.GenesisConfig; +import tech.pegasys.pantheon.ethereum.core.MiningParametersTestBuilder; +import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration; +import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule; +import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule; +import tech.pegasys.pantheon.util.uint.UInt256; import java.io.File; import java.net.URL; @@ -37,7 +37,7 @@ public final class BlockchainImporterTest { final URL importFileURL = getClass() .getClassLoader() - .getResource("net/consensys/pantheon/ethereum/jsonrpc/json-rpc-test.bin"); + .getResource("tech/pegasys/pantheon/ethereum/jsonrpc/json-rpc-test.bin"); assertThat(importFileURL).isNotNull(); final Path source = new File(importFileURL.toURI()).toPath(); @@ -46,7 +46,7 @@ public final class BlockchainImporterTest { final URL genesisJsonUrl = getClass() .getClassLoader() - .getResource("net/consensys/pantheon/ethereum/jsonrpc/jsonRpcTestGenesis.json"); + .getResource("tech/pegasys/pantheon/ethereum/jsonrpc/jsonRpcTestGenesis.json"); assertThat(genesisJsonUrl).isNotNull(); final String genesisJson = Resources.toString(genesisJsonUrl, Charsets.UTF_8); final KeyPair keyPair = loadKeyPair(target); diff --git a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/InMemoryKeyValueStorage.java b/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/InMemoryKeyValueStorage.java index 21ab80b95c..7ce5bbde37 100644 --- a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/InMemoryKeyValueStorage.java +++ b/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/InMemoryKeyValueStorage.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.services.kvstore; +package tech.pegasys.pantheon.services.kvstore; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.HashMap; import java.util.HashSet; diff --git a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/KeyValueStorage.java b/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/KeyValueStorage.java index 499c6a8b56..3bd5fda7b9 100644 --- a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/KeyValueStorage.java +++ b/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/KeyValueStorage.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.services.kvstore; +package tech.pegasys.pantheon.services.kvstore; import static com.google.common.base.Preconditions.checkState; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.util.Objects; import java.util.Optional; diff --git a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/RocksDbKeyValueStorage.java b/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/RocksDbKeyValueStorage.java index e2953e89b0..7bbe0aafe0 100644 --- a/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/RocksDbKeyValueStorage.java +++ b/services/kvstore/src/main/java/tech/pegasys/pantheon/services/kvstore/RocksDbKeyValueStorage.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.services.kvstore; +package tech.pegasys.pantheon.services.kvstore; -import net.consensys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValue; import java.io.Closeable; import java.nio.file.Path; diff --git a/services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/AbstractKeyValueStorageTest.java b/services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/AbstractKeyValueStorageTest.java index c82c021233..54cadb6dc2 100644 --- a/services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/AbstractKeyValueStorageTest.java +++ b/services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/AbstractKeyValueStorageTest.java @@ -1,13 +1,13 @@ -package net.consensys.pantheon.services.kvstore; +package tech.pegasys.pantheon.services.kvstore; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import net.consensys.pantheon.services.kvstore.KeyValueStorage.Entry; -import net.consensys.pantheon.services.kvstore.KeyValueStorage.Transaction; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage.Entry; +import tech.pegasys.pantheon.services.kvstore.KeyValueStorage.Transaction; +import tech.pegasys.pantheon.util.bytes.BytesValue; +import tech.pegasys.pantheon.util.bytes.BytesValues; import java.io.Closeable; import java.util.Arrays; diff --git a/services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/InMemoryKeyValueStorageTest.java b/services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/InMemoryKeyValueStorageTest.java index 50ba0216be..57048a2623 100644 --- a/services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/InMemoryKeyValueStorageTest.java +++ b/services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/InMemoryKeyValueStorageTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.services.kvstore; +package tech.pegasys.pantheon.services.kvstore; public class InMemoryKeyValueStorageTest extends AbstractKeyValueStorageTest { diff --git a/services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/RocksDbKeyValueStorageTest.java b/services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/RocksDbKeyValueStorageTest.java index 0c71f3d90d..25bb125d57 100644 --- a/services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/RocksDbKeyValueStorageTest.java +++ b/services/kvstore/src/test/java/tech/pegasys/pantheon/services/kvstore/RocksDbKeyValueStorageTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.services.kvstore; +package tech.pegasys.pantheon.services.kvstore; import org.junit.Rule; import org.junit.rules.TemporaryFolder; diff --git a/testutil/src/main/java/tech/pegasys/pantheon/testutil/BlockTestUtil.java b/testutil/src/main/java/tech/pegasys/pantheon/testutil/BlockTestUtil.java index 4d53390afc..41d71d888d 100644 --- a/testutil/src/main/java/tech/pegasys/pantheon/testutil/BlockTestUtil.java +++ b/testutil/src/main/java/tech/pegasys/pantheon/testutil/BlockTestUtil.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.testutil; +package tech.pegasys.pantheon.testutil; import java.io.IOException; import java.nio.file.Files; diff --git a/testutil/src/main/java/tech/pegasys/pantheon/testutil/JsonTestParameters.java b/testutil/src/main/java/tech/pegasys/pantheon/testutil/JsonTestParameters.java index e4bd7917b7..44eee5291e 100644 --- a/testutil/src/main/java/tech/pegasys/pantheon/testutil/JsonTestParameters.java +++ b/testutil/src/main/java/tech/pegasys/pantheon/testutil/JsonTestParameters.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.testutil; +package tech.pegasys.pantheon.testutil; import static com.google.common.base.Preconditions.checkState; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/ExceptionUtils.java b/util/src/main/java/tech/pegasys/pantheon/util/ExceptionUtils.java index 5fe526152b..853fa5c4ef 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/ExceptionUtils.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/ExceptionUtils.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util; +package tech.pegasys.pantheon.util; public class ExceptionUtils { diff --git a/util/src/main/java/tech/pegasys/pantheon/util/NetworkUtility.java b/util/src/main/java/tech/pegasys/pantheon/util/NetworkUtility.java index d8e9c98ebe..7c3e60433a 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/NetworkUtility.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/NetworkUtility.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util; +package tech.pegasys.pantheon.util; import java.net.InetAddress; import java.net.InetSocketAddress; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/Preconditions.java b/util/src/main/java/tech/pegasys/pantheon/util/Preconditions.java index 6a95acbe78..2c07d5c218 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/Preconditions.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/Preconditions.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util; +package tech.pegasys.pantheon.util; import java.util.function.Function; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/Subscribers.java b/util/src/main/java/tech/pegasys/pantheon/util/Subscribers.java index 4629c34271..af1ef0099e 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/Subscribers.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/Subscribers.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/AbstractBytes32Backed.java index 14a79655db..6f2fa702da 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/AbstractBytes32Backed.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/AbstractBytes32Backed.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/AbstractBytesValue.java index 48d2e9a4c6..abe460f162 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/AbstractBytesValue.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/AbstractBytesValue.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/ArrayWrappingBytes32.java index 57d6cd27f9..2fd8b28e68 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/ArrayWrappingBytes32.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/ArrayWrappingBytes32.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/ArrayWrappingBytesValue.java index 4dbde6e0f9..7077153bbd 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/ArrayWrappingBytesValue.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/ArrayWrappingBytesValue.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/BaseDelegatingBytesValue.java b/util/src/main/java/tech/pegasys/pantheon/util/bytes/BaseDelegatingBytesValue.java index 91ddba739c..5112c0a1d4 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/BaseDelegatingBytesValue.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/BaseDelegatingBytesValue.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/Bytes32.java index 313cf656ac..9b217659b9 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/Bytes32.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/Bytes32.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.util.bytes; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.util.uint.Int256; -import net.consensys.pantheon.util.uint.UInt256; -import net.consensys.pantheon.util.uint.UInt256Bytes; +import tech.pegasys.pantheon.util.uint.Int256; +import tech.pegasys.pantheon.util.uint.UInt256; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/Bytes32Backed.java index c931643aea..ee71a3acb8 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/Bytes32Backed.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/Bytes32Backed.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/Bytes32s.java index 1eb792c4c6..14ffcc376b 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/Bytes32s.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/Bytes32s.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/BytesBacked.java index 9946dd6348..ed70091483 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesBacked.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesBacked.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.util.bytes; /** Base interface for a value whose content is stored as bytes. */ public interface BytesBacked { diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesValue.java b/util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesValue.java index 0142149b21..5ae220c08b 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesValue.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesValue.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/BytesValues.java b/util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesValues.java index 54b69c19b7..372119d292 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesValues.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/BytesValues.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/DelegatingBytes32.java index 7a50309e25..36f2a4991b 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/DelegatingBytes32.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/DelegatingBytes32.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/DelegatingBytesValue.java index e38d631fc2..9af3c3b9b9 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/DelegatingBytesValue.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/DelegatingBytesValue.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/MutableArrayWrappingBytes32.java index c7c234e956..5d02163926 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableArrayWrappingBytes32.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableArrayWrappingBytes32.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/MutableArrayWrappingBytesValue.java index 1ad279bc95..147924582d 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableArrayWrappingBytesValue.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableArrayWrappingBytesValue.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/MutableBufferWrappingBytesValue.java index 7508e111aa..e727fb3fbf 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBufferWrappingBytesValue.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBufferWrappingBytesValue.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/MutableByteBufWrappingBytesValue.java index c5cf413e41..d99c9a3339 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableByteBufWrappingBytesValue.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableByteBufWrappingBytesValue.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/MutableBytes32.java index 60c681136b..4df99230cf 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBytes32.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBytes32.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.util.bytes; import static com.google.common.base.Preconditions.checkArgument; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBytesValue.java b/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBytesValue.java index 315465a480..7eee878bd8 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBytesValue.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/MutableBytesValue.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/WrappingBytes32.java index 78336e321a..0b438cc2a8 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/bytes/WrappingBytes32.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/bytes/WrappingBytes32.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.util.bytes; import static com.google.common.base.Preconditions.checkArgument; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/time/Clock.java b/util/src/main/java/tech/pegasys/pantheon/util/time/Clock.java index 751ac32fa1..58ea0780b9 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/time/Clock.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/time/Clock.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.time; +package tech.pegasys.pantheon.util.time; public interface Clock { diff --git a/util/src/main/java/tech/pegasys/pantheon/util/time/SystemClock.java b/util/src/main/java/tech/pegasys/pantheon/util/time/SystemClock.java index 7eddca29e6..a770fafb14 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/time/SystemClock.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/time/SystemClock.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.time; +package tech.pegasys.pantheon.util.time; public class SystemClock implements Clock { diff --git a/util/src/main/java/tech/pegasys/pantheon/util/uint/AbstractUInt256Value.java b/util/src/main/java/tech/pegasys/pantheon/util/uint/AbstractUInt256Value.java index 688780b596..d31f109b86 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/AbstractUInt256Value.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/uint/AbstractUInt256Value.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.util.uint; +package tech.pegasys.pantheon.util.uint; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.util.bytes.AbstractBytes32Backed; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.Bytes32s; +import tech.pegasys.pantheon.util.bytes.AbstractBytes32Backed; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.util.bytes.Bytes32s; import java.util.function.Supplier; diff --git a/util/src/main/java/tech/pegasys/pantheon/util/uint/BaseUInt256Value.java b/util/src/main/java/tech/pegasys/pantheon/util/uint/BaseUInt256Value.java index b4b5ac9791..d3debda4e1 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/BaseUInt256Value.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/uint/BaseUInt256Value.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.util.uint; +package tech.pegasys.pantheon.util.uint; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/uint/Counter.java index 86de8cf7f5..5b03e03c32 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/Counter.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/uint/Counter.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.util.uint; +package tech.pegasys.pantheon.util.uint; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.MutableBytes32; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/uint/DefaultInt256.java index 1e7509bb97..3c4b999811 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/DefaultInt256.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/uint/DefaultInt256.java @@ -1,10 +1,10 @@ -package net.consensys.pantheon.util.uint; +package tech.pegasys.pantheon.util.uint; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.util.bytes.AbstractBytes32Backed; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.MutableBytes32; +import tech.pegasys.pantheon.util.bytes.AbstractBytes32Backed; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/uint/DefaultUInt256.java index 2c4a4bb319..1410977c50 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/DefaultUInt256.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/uint/DefaultUInt256.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.util.uint; +package tech.pegasys.pantheon.util.uint; -import net.consensys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/uint/Int256.java index cad88f016d..4a7c8ea5be 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/Int256.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/uint/Int256.java @@ -1,7 +1,7 @@ -package net.consensys.pantheon.util.uint; +package tech.pegasys.pantheon.util.uint; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.Bytes32Backed; +import tech.pegasys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/uint/Int256Bytes.java index 5a1eba56f9..328438308c 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/Int256Bytes.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/uint/Int256Bytes.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.util.uint; +package tech.pegasys.pantheon.util.uint; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; -import net.consensys.pantheon.util.bytes.MutableBytes32; +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 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/tech/pegasys/pantheon/util/uint/UInt256.java index 0b0559b735..91e2fef6ff 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256.java @@ -1,6 +1,6 @@ -package net.consensys.pantheon.util.uint; +package tech.pegasys.pantheon.util.uint; -import net.consensys.pantheon.util.bytes.Bytes32; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/uint/UInt256Bytes.java index 637c526e20..f8027295ee 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256Bytes.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256Bytes.java @@ -1,12 +1,12 @@ -package net.consensys.pantheon.util.uint; +package tech.pegasys.pantheon.util.uint; import static com.google.common.base.Preconditions.checkArgument; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.Bytes32s; -import net.consensys.pantheon.util.bytes.BytesValue; -import net.consensys.pantheon.util.bytes.BytesValues; -import net.consensys.pantheon.util.bytes.MutableBytes32; +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 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/tech/pegasys/pantheon/util/uint/UInt256Value.java index f3359bc8ae..b1ef9f5e0c 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256Value.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256Value.java @@ -1,8 +1,8 @@ -package net.consensys.pantheon.util.uint; +package tech.pegasys.pantheon.util.uint; import static com.google.common.base.Preconditions.checkState; -import net.consensys.pantheon.util.bytes.Bytes32Backed; +import tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/uint/UInt256s.java index 4ad92f70d3..dac7554288 100644 --- a/util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256s.java +++ b/util/src/main/java/tech/pegasys/pantheon/util/uint/UInt256s.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.uint; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/ExceptionUtilsTest.java index 32f593aa13..0ecc5d9e8f 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/ExceptionUtilsTest.java +++ b/util/src/test/java/tech/pegasys/pantheon/util/ExceptionUtilsTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util; +package tech.pegasys.pantheon.util; import static org.assertj.core.api.Assertions.assertThat; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/NetworkUtilityTest.java b/util/src/test/java/tech/pegasys/pantheon/util/NetworkUtilityTest.java index 5b79c51580..392295097c 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/NetworkUtilityTest.java +++ b/util/src/test/java/tech/pegasys/pantheon/util/NetworkUtilityTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util; +package tech.pegasys.pantheon.util; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/SubscribersTest.java b/util/src/test/java/tech/pegasys/pantheon/util/SubscribersTest.java index c64d98fa9c..feca61d3e3 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/SubscribersTest.java +++ b/util/src/test/java/tech/pegasys/pantheon/util/SubscribersTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util; +package tech.pegasys.pantheon.util; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/bytes/Bytes32Test.java b/util/src/test/java/tech/pegasys/pantheon/util/bytes/Bytes32Test.java index 61d113112d..256a05bd5c 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/bytes/Bytes32Test.java +++ b/util/src/test/java/tech/pegasys/pantheon/util/bytes/Bytes32Test.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.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/tech/pegasys/pantheon/util/bytes/Bytes32sSingleLeftShiftTest.java index 094dba5b9a..cf1f6c9f2c 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/bytes/Bytes32sSingleLeftShiftTest.java +++ b/util/src/test/java/tech/pegasys/pantheon/util/bytes/Bytes32sSingleLeftShiftTest.java @@ -1,4 +1,4 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.util.bytes; import static org.junit.Assert.assertEquals; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValueTest.java b/util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValueTest.java index 01c0e100b9..5b846d02d2 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValueTest.java +++ b/util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValueTest.java @@ -1,16 +1,16 @@ -package net.consensys.pantheon.util.bytes; +package tech.pegasys.pantheon.util.bytes; -import static net.consensys.pantheon.util.bytes.BytesValue.fromHexString; -import static net.consensys.pantheon.util.bytes.BytesValue.fromHexStringLenient; -import static net.consensys.pantheon.util.bytes.BytesValue.of; -import static net.consensys.pantheon.util.bytes.BytesValue.wrap; -import static net.consensys.pantheon.util.bytes.BytesValue.wrapBuffer; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; +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.of; +import static tech.pegasys.pantheon.util.bytes.BytesValue.wrap; +import static tech.pegasys.pantheon.util.bytes.BytesValue.wrapBuffer; import java.math.BigInteger; import java.security.MessageDigest; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValuesTest.java b/util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValuesTest.java index bf8f10f034..73871fa4bf 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValuesTest.java +++ b/util/src/test/java/tech/pegasys/pantheon/util/bytes/BytesValuesTest.java @@ -1,15 +1,15 @@ -package net.consensys.pantheon.util.bytes; - -import static net.consensys.pantheon.util.bytes.BytesValue.fromHexString; -import static net.consensys.pantheon.util.bytes.BytesValues.asSignedBigInteger; -import static net.consensys.pantheon.util.bytes.BytesValues.asUnsignedBigInteger; -import static net.consensys.pantheon.util.bytes.BytesValues.concatenate; -import static net.consensys.pantheon.util.bytes.BytesValues.extractInt; -import static net.consensys.pantheon.util.bytes.BytesValues.extractLong; -import static net.consensys.pantheon.util.bytes.BytesValues.ofUnsignedShort; -import static net.consensys.pantheon.util.bytes.BytesValues.toMinimalBytes; -import static net.consensys.pantheon.util.bytes.BytesValues.trimLeadingZeros; +package tech.pegasys.pantheon.util.bytes; + import static org.junit.Assert.assertEquals; +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 java.math.BigInteger; diff --git a/util/src/test/java/tech/pegasys/pantheon/util/uint/UInt256BytesTest.java b/util/src/test/java/tech/pegasys/pantheon/util/uint/UInt256BytesTest.java index 83ddd67820..bf463478aa 100644 --- a/util/src/test/java/tech/pegasys/pantheon/util/uint/UInt256BytesTest.java +++ b/util/src/test/java/tech/pegasys/pantheon/util/uint/UInt256BytesTest.java @@ -1,9 +1,9 @@ -package net.consensys.pantheon.util.uint; +package tech.pegasys.pantheon.util.uint; -import net.consensys.pantheon.util.bytes.Bytes32; -import net.consensys.pantheon.util.bytes.MutableBytes32; -import net.consensys.pantheon.util.uint.UInt256Bytes.BinaryLongOp; -import net.consensys.pantheon.util.uint.UInt256Bytes.BinaryOp; +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 java.math.BigInteger;