From 76c742eba14b18fa8713525338962bf86b620687 Mon Sep 17 00:00:00 2001 From: Adrian Sutton Date: Sat, 13 Oct 2018 08:23:56 +1000 Subject: [PATCH] Fix package names. (#56) --- .../ethereum/core/MessageFrameTestFixture.java | 10 +--------- .../pantheon/ethereum/core/TestCodeExecutor.java | 2 -- .../pantheon/ethereum/vm/DebugOperationTracerTest.java | 2 +- .../ethereum/vm/operations/BlockHashOperationTest.java | 5 ++--- .../vm/operations/ExtCodeHashOperationTest.java | 2 +- 5 files changed, 5 insertions(+), 16 deletions(-) rename ethereum/core/src/test-support/java/{net/consensys => tech/pegasys}/pantheon/ethereum/core/MessageFrameTestFixture.java (91%) rename ethereum/core/src/test/java/{net/consensys => tech/pegasys}/pantheon/ethereum/vm/operations/BlockHashOperationTest.java (94%) diff --git a/ethereum/core/src/test-support/java/net/consensys/pantheon/ethereum/core/MessageFrameTestFixture.java b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/MessageFrameTestFixture.java similarity index 91% rename from ethereum/core/src/test-support/java/net/consensys/pantheon/ethereum/core/MessageFrameTestFixture.java rename to ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/MessageFrameTestFixture.java index 9f3e5a82f7..f7b13b6a64 100644 --- a/ethereum/core/src/test-support/java/net/consensys/pantheon/ethereum/core/MessageFrameTestFixture.java +++ b/ethereum/core/src/test-support/java/tech/pegasys/pantheon/ethereum/core/MessageFrameTestFixture.java @@ -1,14 +1,6 @@ -package net.consensys.pantheon.ethereum.core; +package tech.pegasys.pantheon.ethereum.core; 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.ExecutionContextTestFixture; -import tech.pegasys.pantheon.ethereum.core.Gas; -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.vm.BlockHashLookup; import tech.pegasys.pantheon.ethereum.vm.Code; import tech.pegasys.pantheon.ethereum.vm.MessageFrame; 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 a36a56a0af..fb32bbef79 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 @@ -16,8 +16,6 @@ import java.util.ArrayDeque; import java.util.Deque; import java.util.function.Consumer; -import net.consensys.pantheon.ethereum.core.MessageFrameTestFixture; - public class TestCodeExecutor { private final ExecutionContextTestFixture fixture; 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 63319e8b14..47182abcef 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 @@ -10,6 +10,7 @@ import static tech.pegasys.pantheon.ethereum.vm.ExceptionalHaltReason.INSUFFICIE import tech.pegasys.pantheon.ethereum.core.BlockHeader; import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; import tech.pegasys.pantheon.ethereum.core.Gas; +import tech.pegasys.pantheon.ethereum.core.MessageFrameTestFixture; import tech.pegasys.pantheon.ethereum.core.MutableAccount; import tech.pegasys.pantheon.ethereum.core.Wei; import tech.pegasys.pantheon.ethereum.core.WorldUpdater; @@ -25,7 +26,6 @@ import java.util.Map; import java.util.Optional; import java.util.TreeMap; -import net.consensys.pantheon.ethereum.core.MessageFrameTestFixture; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/ethereum/core/src/test/java/net/consensys/pantheon/ethereum/vm/operations/BlockHashOperationTest.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/BlockHashOperationTest.java similarity index 94% rename from ethereum/core/src/test/java/net/consensys/pantheon/ethereum/vm/operations/BlockHashOperationTest.java rename to ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/BlockHashOperationTest.java index 8e53bef779..b2f11dcb19 100644 --- a/ethereum/core/src/test/java/net/consensys/pantheon/ethereum/vm/operations/BlockHashOperationTest.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/operations/BlockHashOperationTest.java @@ -1,4 +1,4 @@ -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; @@ -9,16 +9,15 @@ import static org.mockito.Mockito.when; import tech.pegasys.pantheon.ethereum.core.BlockHeader; import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.MessageFrameTestFixture; import tech.pegasys.pantheon.ethereum.mainnet.FrontierGasCalculator; import tech.pegasys.pantheon.ethereum.vm.BlockHashLookup; import tech.pegasys.pantheon.ethereum.vm.MessageFrame; -import tech.pegasys.pantheon.ethereum.vm.operations.BlockHashOperation; import tech.pegasys.pantheon.util.bytes.Bytes32; import tech.pegasys.pantheon.util.bytes.BytesValue; import tech.pegasys.pantheon.util.uint.UInt256; import com.google.common.base.Strings; -import net.consensys.pantheon.ethereum.core.MessageFrameTestFixture; import org.junit.After; 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 78a070d9ad..b9b4714386 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 @@ -10,6 +10,7 @@ import tech.pegasys.pantheon.ethereum.core.BlockHeader; import tech.pegasys.pantheon.ethereum.core.BlockHeaderTestFixture; import tech.pegasys.pantheon.ethereum.core.Gas; import tech.pegasys.pantheon.ethereum.core.Hash; +import tech.pegasys.pantheon.ethereum.core.MessageFrameTestFixture; import tech.pegasys.pantheon.ethereum.core.Wei; import tech.pegasys.pantheon.ethereum.core.WorldUpdater; import tech.pegasys.pantheon.ethereum.db.WorldStateArchive; @@ -22,7 +23,6 @@ import tech.pegasys.pantheon.util.bytes.Bytes32; import tech.pegasys.pantheon.util.bytes.BytesValue; import tech.pegasys.pantheon.util.uint.UInt256; -import net.consensys.pantheon.ethereum.core.MessageFrameTestFixture; import org.junit.Test; public class ExtCodeHashOperationTest {