From d7671814b71b67d4625179b19f56a7e5bfddbd0f Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sat, 27 Dec 2014 01:27:42 +0100 Subject: [PATCH] Remove unused imports --- .../main/java/org/ethereum/cli/CLIInterface.java | 1 - .../java/org/ethereum/config/SystemProperties.java | 1 - .../src/main/java/org/ethereum/core/Account.java | 1 - .../src/main/java/org/ethereum/core/Bloom.java | 1 - .../java/org/ethereum/core/TransactionReceipt.java | 1 - .../main/java/org/ethereum/db/RepositoryDummy.java | 14 -------------- .../java/org/ethereum/db/TransactionReceiptVO.java | 1 - .../main/java/org/ethereum/facade/Blockchain.java | 3 --- .../java/org/ethereum/facade/EthereumImpl.java | 1 - .../org/ethereum/jsontestsuite/AccountState.java | 2 -- .../org/ethereum/jsontestsuite/JSONReader.java | 1 - .../main/java/org/ethereum/jsontestsuite/Logs.java | 4 ---- .../org/ethereum/jsontestsuite/TestRunner.java | 1 - .../org/ethereum/jsontestsuite/Transaction.java | 6 ------ .../java/org/ethereum/jsontestsuite/Utils.java | 1 - .../src/main/java/org/ethereum/mine/Miner.java | 2 -- .../java/org/ethereum/net/client/PeerClient.java | 2 -- .../net/peerdiscovery/DiscoveryChannel.java | 2 -- .../org/ethereum/net/peerdiscovery/PeerInfo.java | 3 --- .../ethereum/net/peerdiscovery/WorkerThread.java | 1 - .../net/server/EthereumChannelInitializer.java | 8 -------- .../org/ethereum/net/submit/TransactionTask.java | 1 - .../java/org/ethereum/net/wire/MessageEncoder.java | 1 - .../src/main/java/org/ethereum/util/RLP.java | 1 - .../src/main/java/org/ethereum/vm/LogInfo.java | 4 ---- .../src/main/java/org/ethereum/vm/Program.java | 2 -- .../org/ethereum/vm/ProgramInvokeFactoryImpl.java | 1 - .../src/main/java/org/ethereum/vm/VM.java | 1 - .../java/org/ethereum/vmtrace/ProgramTrace.java | 5 ----- .../test/java/test/ethereum/core/BlockTest.java | 4 ---- .../test/java/test/ethereum/core/LogInfoTest.java | 1 - .../test/java/test/ethereum/core/StateTest.java | 5 ----- .../java/test/ethereum/core/TransactionTest.java | 11 ----------- .../test/java/test/ethereum/db/RepositoryTest.java | 1 - .../java/test/ethereum/net/BlocksMessageTest.java | 2 -- .../java/test/ethereum/net/HelloMessageTest.java | 6 ------ .../java/test/ethereum/net/PeersMessageTest.java | 5 ----- .../java/test/ethereum/net/StatusMessageTest.java | 1 - .../java/org/ethereum/gui/AccountsListWindow.java | 1 - .../java/org/ethereum/gui/BlockChainTable.java | 1 - .../org/ethereum/gui/ConnectionConsoleWindow.java | 1 - .../main/java/org/ethereum/gui/PayOutDialog.java | 3 --- .../java/org/ethereum/gui/PeersTableModel.java | 1 - .../java/org/ethereum/gui/PeersTableWindow.java | 2 -- .../java/org/ethereum/gui/ProgramPlayDialog.java | 1 - .../java/org/ethereum/gui/StateExplorerWindow.java | 1 - .../java/org/ethereum/gui/UIEthereumManager.java | 1 - .../java/org/ethereum/gui/WalletAddressPanel.java | 1 - 48 files changed, 122 deletions(-) diff --git a/ethereumj-core/src/main/java/org/ethereum/cli/CLIInterface.java b/ethereumj-core/src/main/java/org/ethereum/cli/CLIInterface.java index 1b74402e..331b6904 100644 --- a/ethereumj-core/src/main/java/org/ethereum/cli/CLIInterface.java +++ b/ethereumj-core/src/main/java/org/ethereum/cli/CLIInterface.java @@ -1,6 +1,5 @@ package org.ethereum.cli; -import org.ethereum.config.SystemProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/ethereumj-core/src/main/java/org/ethereum/config/SystemProperties.java b/ethereumj-core/src/main/java/org/ethereum/config/SystemProperties.java index 3df96c85..2064e22c 100644 --- a/ethereumj-core/src/main/java/org/ethereum/config/SystemProperties.java +++ b/ethereumj-core/src/main/java/org/ethereum/config/SystemProperties.java @@ -8,7 +8,6 @@ import java.util.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; /** * Utility class to retrieve property values from the system.properties files diff --git a/ethereumj-core/src/main/java/org/ethereum/core/Account.java b/ethereumj-core/src/main/java/org/ethereum/core/Account.java index 61f5bb22..2a950881 100644 --- a/ethereumj-core/src/main/java/org/ethereum/core/Account.java +++ b/ethereumj-core/src/main/java/org/ethereum/core/Account.java @@ -6,7 +6,6 @@ import java.util.*; import org.ethereum.crypto.ECKey; import org.ethereum.manager.WorldManager; import org.ethereum.util.Utils; -import org.spongycastle.util.encoders.Hex; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/ethereumj-core/src/main/java/org/ethereum/core/Bloom.java b/ethereumj-core/src/main/java/org/ethereum/core/Bloom.java index 34177766..d2136ccd 100644 --- a/ethereumj-core/src/main/java/org/ethereum/core/Bloom.java +++ b/ethereumj-core/src/main/java/org/ethereum/core/Bloom.java @@ -3,7 +3,6 @@ package org.ethereum.core; import org.ethereum.util.ByteUtil; import org.spongycastle.util.encoders.Hex; -import java.nio.ByteBuffer; import java.util.Arrays; /** diff --git a/ethereumj-core/src/main/java/org/ethereum/core/TransactionReceipt.java b/ethereumj-core/src/main/java/org/ethereum/core/TransactionReceipt.java index 92d47f3a..20203ac4 100644 --- a/ethereumj-core/src/main/java/org/ethereum/core/TransactionReceipt.java +++ b/ethereumj-core/src/main/java/org/ethereum/core/TransactionReceipt.java @@ -7,7 +7,6 @@ import org.spongycastle.util.encoders.Hex; import java.math.BigInteger; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import static org.ethereum.util.ByteUtil.EMPTY_BYTE_ARRAY; diff --git a/ethereumj-core/src/main/java/org/ethereum/db/RepositoryDummy.java b/ethereumj-core/src/main/java/org/ethereum/db/RepositoryDummy.java index 59e9b810..b6df6f94 100644 --- a/ethereumj-core/src/main/java/org/ethereum/db/RepositoryDummy.java +++ b/ethereumj-core/src/main/java/org/ethereum/db/RepositoryDummy.java @@ -1,32 +1,18 @@ package org.ethereum.db; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; import org.ethereum.core.AccountState; import org.ethereum.core.Block; import org.ethereum.facade.Repository; -import org.ethereum.json.EtherObjectMapper; -import org.ethereum.json.JSONHelper; -import org.ethereum.trie.Trie; -import org.ethereum.trie.TrieImpl; import org.ethereum.vm.DataWord; import org.iq80.leveldb.DBIterator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.spongycastle.util.encoders.Hex; -import org.springframework.stereotype.Component; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; import java.math.BigInteger; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Set; -import static org.ethereum.config.SystemProperties.CONFIG; import static org.ethereum.crypto.SHA3Helper.sha3; import static org.ethereum.util.ByteUtil.wrap; diff --git a/ethereumj-core/src/main/java/org/ethereum/db/TransactionReceiptVO.java b/ethereumj-core/src/main/java/org/ethereum/db/TransactionReceiptVO.java index b247bde7..8c51ba11 100644 --- a/ethereumj-core/src/main/java/org/ethereum/db/TransactionReceiptVO.java +++ b/ethereumj-core/src/main/java/org/ethereum/db/TransactionReceiptVO.java @@ -4,7 +4,6 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Lob; import javax.persistence.Table; -import java.math.BigInteger; /** * @author Roman Mandeleil diff --git a/ethereumj-core/src/main/java/org/ethereum/facade/Blockchain.java b/ethereumj-core/src/main/java/org/ethereum/facade/Blockchain.java index aa768598..e3d4c87d 100644 --- a/ethereumj-core/src/main/java/org/ethereum/facade/Blockchain.java +++ b/ethereumj-core/src/main/java/org/ethereum/facade/Blockchain.java @@ -2,12 +2,9 @@ package org.ethereum.facade; import java.math.BigInteger; import java.util.List; -import java.util.Map; - import org.ethereum.core.Block; import org.ethereum.core.Chain; import org.ethereum.core.TransactionReceipt; -import org.ethereum.db.ByteArrayWrapper; import org.ethereum.net.BlockQueue; import org.ethereum.core.Genesis; diff --git a/ethereumj-core/src/main/java/org/ethereum/facade/EthereumImpl.java b/ethereumj-core/src/main/java/org/ethereum/facade/EthereumImpl.java index f45628ce..598f7d2c 100644 --- a/ethereumj-core/src/main/java/org/ethereum/facade/EthereumImpl.java +++ b/ethereumj-core/src/main/java/org/ethereum/facade/EthereumImpl.java @@ -7,7 +7,6 @@ import java.util.Set; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.ethereum.config.SystemProperties; import org.ethereum.core.Transaction; import org.ethereum.core.Wallet; import org.ethereum.listener.EthereumListener; diff --git a/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/AccountState.java b/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/AccountState.java index 4a049390..66595071 100644 --- a/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/AccountState.java +++ b/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/AccountState.java @@ -1,6 +1,5 @@ package org.ethereum.jsontestsuite; -import org.ethereum.db.ByteArrayWrapper; import org.ethereum.db.ContractDetails; import org.ethereum.util.ByteUtil; import org.ethereum.vm.DataWord; @@ -9,7 +8,6 @@ import org.spongycastle.util.encoders.Hex; import java.math.BigInteger; import java.util.*; -import java.util.regex.Pattern; /** * @author Roman Mandeleil diff --git a/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/JSONReader.java b/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/JSONReader.java index d3cb8e6d..3c572c04 100644 --- a/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/JSONReader.java +++ b/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/JSONReader.java @@ -6,7 +6,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; -import java.net.URISyntaxException; import java.net.URL; import java.nio.file.Files; diff --git a/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/Logs.java b/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/Logs.java index ecf033fe..9f5ae32e 100644 --- a/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/Logs.java +++ b/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/Logs.java @@ -1,12 +1,8 @@ package org.ethereum.jsontestsuite; import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map; -import java.util.Set; - import org.ethereum.vm.DataWord; import org.ethereum.vm.LogInfo; import org.json.simple.JSONArray; diff --git a/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/TestRunner.java b/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/TestRunner.java index 0d44add2..1fe7512f 100644 --- a/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/TestRunner.java +++ b/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/TestRunner.java @@ -5,7 +5,6 @@ import org.ethereum.core.TransactionExecutor; import org.ethereum.db.ByteArrayWrapper; import org.ethereum.db.ContractDetails; import org.ethereum.db.RepositoryDummy; -import org.ethereum.db.RepositoryTrack; import org.ethereum.facade.Repository; import org.ethereum.util.ByteUtil; import org.ethereum.vm.*; diff --git a/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/Transaction.java b/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/Transaction.java index 07a77dcd..cd7078f8 100644 --- a/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/Transaction.java +++ b/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/Transaction.java @@ -1,12 +1,6 @@ package org.ethereum.jsontestsuite; -import org.ethereum.util.ByteUtil; import org.json.simple.JSONObject; -import org.spongycastle.util.encoders.Hex; - -import java.math.BigInteger; -import java.util.Arrays; - import static org.ethereum.util.ByteUtil.toHexString; /** diff --git a/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/Utils.java b/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/Utils.java index 19646aef..3c462b14 100644 --- a/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/Utils.java +++ b/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/Utils.java @@ -1,7 +1,6 @@ package org.ethereum.jsontestsuite; import org.ethereum.util.ByteUtil; -import org.spongycastle.pqc.math.linearalgebra.ByteUtils; import org.spongycastle.util.encoders.Hex; /** diff --git a/ethereumj-core/src/main/java/org/ethereum/mine/Miner.java b/ethereumj-core/src/main/java/org/ethereum/mine/Miner.java index 97982e85..d6081bf0 100644 --- a/ethereumj-core/src/main/java/org/ethereum/mine/Miner.java +++ b/ethereumj-core/src/main/java/org/ethereum/mine/Miner.java @@ -8,8 +8,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.spongycastle.util.Arrays; import org.spongycastle.util.BigIntegers; -import org.spongycastle.util.encoders.Hex; - import java.math.BigInteger; /** diff --git a/ethereumj-core/src/main/java/org/ethereum/net/client/PeerClient.java b/ethereumj-core/src/main/java/org/ethereum/net/client/PeerClient.java index e5b7ebac..1476a5c7 100644 --- a/ethereumj-core/src/main/java/org/ethereum/net/client/PeerClient.java +++ b/ethereumj-core/src/main/java/org/ethereum/net/client/PeerClient.java @@ -8,8 +8,6 @@ import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioSocketChannel; import org.ethereum.manager.WorldManager; -import org.ethereum.net.eth.StatusMessage; -import org.ethereum.net.p2p.HelloMessage; import org.ethereum.net.server.ChannelManager; import org.ethereum.net.server.EthereumChannelInitializer; import org.slf4j.Logger; diff --git a/ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/DiscoveryChannel.java b/ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/DiscoveryChannel.java index 81ed5037..a2c6463c 100644 --- a/ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/DiscoveryChannel.java +++ b/ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/DiscoveryChannel.java @@ -2,7 +2,6 @@ package org.ethereum.net.peerdiscovery; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; -import io.netty.channel.Channel; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.timeout.ReadTimeoutHandler; @@ -13,7 +12,6 @@ import org.ethereum.net.eth.EthHandler; import org.ethereum.net.eth.StatusMessage; import org.ethereum.net.p2p.HelloMessage; import org.ethereum.net.p2p.P2pHandler; -import org.ethereum.net.server.*; import org.ethereum.net.shh.ShhHandler; import org.ethereum.net.wire.MessageDecoder; import org.ethereum.net.wire.MessageEncoder; diff --git a/ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/PeerInfo.java b/ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/PeerInfo.java index d53a1306..c534cc53 100644 --- a/ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/PeerInfo.java +++ b/ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/PeerInfo.java @@ -3,9 +3,6 @@ package org.ethereum.net.peerdiscovery; import org.ethereum.net.client.Capability; import org.ethereum.net.eth.StatusMessage; import org.ethereum.net.p2p.HelloMessage; -import org.ethereum.util.RLP; -import org.spongycastle.util.encoders.Hex; - import java.net.InetAddress; import java.util.ArrayList; import java.util.List; diff --git a/ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/WorkerThread.java b/ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/WorkerThread.java index dd832d2c..c896ec23 100644 --- a/ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/WorkerThread.java +++ b/ethereumj-core/src/main/java/org/ethereum/net/peerdiscovery/WorkerThread.java @@ -1,6 +1,5 @@ package org.ethereum.net.peerdiscovery; -import org.ethereum.net.client.PeerClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ethereumj-core/src/main/java/org/ethereum/net/server/EthereumChannelInitializer.java b/ethereumj-core/src/main/java/org/ethereum/net/server/EthereumChannelInitializer.java index 70877374..79633836 100644 --- a/ethereumj-core/src/main/java/org/ethereum/net/server/EthereumChannelInitializer.java +++ b/ethereumj-core/src/main/java/org/ethereum/net/server/EthereumChannelInitializer.java @@ -7,19 +7,11 @@ import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.timeout.ReadTimeoutHandler; import org.ethereum.facade.Blockchain; import org.ethereum.manager.WorldManager; -import org.ethereum.net.MessageQueue; import org.ethereum.net.client.Capability; -import org.ethereum.net.eth.EthHandler; -import org.ethereum.net.p2p.P2pHandler; -import org.ethereum.net.shh.ShhHandler; -import org.ethereum.net.wire.MessageDecoder; -import org.ethereum.net.wire.MessageEncoder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; import java.util.concurrent.TimeUnit; diff --git a/ethereumj-core/src/main/java/org/ethereum/net/submit/TransactionTask.java b/ethereumj-core/src/main/java/org/ethereum/net/submit/TransactionTask.java index 797fb718..7aa61726 100644 --- a/ethereumj-core/src/main/java/org/ethereum/net/submit/TransactionTask.java +++ b/ethereumj-core/src/main/java/org/ethereum/net/submit/TransactionTask.java @@ -3,7 +3,6 @@ package org.ethereum.net.submit; import org.ethereum.core.Transaction; import org.ethereum.core.Wallet; import org.ethereum.manager.WorldManager; -import org.ethereum.net.client.PeerClient; import org.ethereum.net.server.ChannelManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ethereumj-core/src/main/java/org/ethereum/net/wire/MessageEncoder.java b/ethereumj-core/src/main/java/org/ethereum/net/wire/MessageEncoder.java index 03a02997..e500f55a 100644 --- a/ethereumj-core/src/main/java/org/ethereum/net/wire/MessageEncoder.java +++ b/ethereumj-core/src/main/java/org/ethereum/net/wire/MessageEncoder.java @@ -10,7 +10,6 @@ import org.ethereum.net.message.StaticMessages; import org.ethereum.util.ByteUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spongycastle.util.Strings; import org.spongycastle.util.encoders.Hex; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; diff --git a/ethereumj-core/src/main/java/org/ethereum/util/RLP.java b/ethereumj-core/src/main/java/org/ethereum/util/RLP.java index 2724bd5f..89f732ca 100644 --- a/ethereumj-core/src/main/java/org/ethereum/util/RLP.java +++ b/ethereumj-core/src/main/java/org/ethereum/util/RLP.java @@ -16,7 +16,6 @@ import java.util.List; import org.ethereum.util.RLP; import org.ethereum.util.RLPItem; import org.ethereum.util.RLPList; -import org.spongycastle.util.encoders.Hex; /** * Recursive Length Prefix (RLP) encoding. diff --git a/ethereumj-core/src/main/java/org/ethereum/vm/LogInfo.java b/ethereumj-core/src/main/java/org/ethereum/vm/LogInfo.java index 5b6b0bff..dea99cb6 100644 --- a/ethereumj-core/src/main/java/org/ethereum/vm/LogInfo.java +++ b/ethereumj-core/src/main/java/org/ethereum/vm/LogInfo.java @@ -1,17 +1,13 @@ package org.ethereum.vm; -import org.ethereum.core.BlockHeader; import org.ethereum.core.Bloom; import org.ethereum.crypto.HashUtil; import org.ethereum.util.RLP; -import org.ethereum.util.RLPElement; import org.ethereum.util.RLPItem; import org.ethereum.util.RLPList; import org.spongycastle.util.encoders.Hex; -import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** diff --git a/ethereumj-core/src/main/java/org/ethereum/vm/Program.java b/ethereumj-core/src/main/java/org/ethereum/vm/Program.java index 0cb5c74a..a7cc94ab 100644 --- a/ethereumj-core/src/main/java/org/ethereum/vm/Program.java +++ b/ethereumj-core/src/main/java/org/ethereum/vm/Program.java @@ -13,8 +13,6 @@ import org.ethereum.vmtrace.ProgramTrace; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.spongycastle.util.encoders.Hex; -import org.springframework.beans.factory.annotation.Autowired; - import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; diff --git a/ethereumj-core/src/main/java/org/ethereum/vm/ProgramInvokeFactoryImpl.java b/ethereumj-core/src/main/java/org/ethereum/vm/ProgramInvokeFactoryImpl.java index 417fe6f7..a902d640 100644 --- a/ethereumj-core/src/main/java/org/ethereum/vm/ProgramInvokeFactoryImpl.java +++ b/ethereumj-core/src/main/java/org/ethereum/vm/ProgramInvokeFactoryImpl.java @@ -4,7 +4,6 @@ import org.ethereum.core.Block; import org.ethereum.core.Transaction; import org.ethereum.facade.Blockchain; import org.ethereum.facade.Repository; -import org.ethereum.manager.WorldManager; import org.ethereum.util.ByteUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ethereumj-core/src/main/java/org/ethereum/vm/VM.java b/ethereumj-core/src/main/java/org/ethereum/vm/VM.java index e7744e21..36968e89 100644 --- a/ethereumj-core/src/main/java/org/ethereum/vm/VM.java +++ b/ethereumj-core/src/main/java/org/ethereum/vm/VM.java @@ -8,7 +8,6 @@ import static org.ethereum.config.SystemProperties.CONFIG; import org.ethereum.util.ByteUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spongycastle.util.BigIntegers; import org.spongycastle.util.encoders.Hex; import org.ethereum.vm.MessageCall.MsgType; diff --git a/ethereumj-core/src/main/java/org/ethereum/vmtrace/ProgramTrace.java b/ethereumj-core/src/main/java/org/ethereum/vmtrace/ProgramTrace.java index 571bf591..40352355 100644 --- a/ethereumj-core/src/main/java/org/ethereum/vmtrace/ProgramTrace.java +++ b/ethereumj-core/src/main/java/org/ethereum/vmtrace/ProgramTrace.java @@ -1,12 +1,7 @@ package org.ethereum.vmtrace; import org.json.simple.JSONArray; -import org.json.simple.JSONObject; - -import java.io.IOException; -import java.io.StringWriter; import java.util.ArrayList; -import java.util.LinkedHashMap; import java.util.List; /** diff --git a/ethereumj-core/src/test/java/test/ethereum/core/BlockTest.java b/ethereumj-core/src/test/java/test/ethereum/core/BlockTest.java index 8db8e182..462d05a1 100644 --- a/ethereumj-core/src/test/java/test/ethereum/core/BlockTest.java +++ b/ethereumj-core/src/test/java/test/ethereum/core/BlockTest.java @@ -6,8 +6,6 @@ import org.ethereum.core.BlockchainImpl; import org.ethereum.core.Genesis; import org.ethereum.facade.Blockchain; import org.ethereum.manager.WorldManager; -import org.ethereum.util.RLP; -import org.ethereum.util.RLPList; import org.junit.After; import org.junit.Ignore; import org.junit.Test; @@ -33,8 +31,6 @@ import java.nio.file.Files; import java.util.List; import static org.junit.Assert.*; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(loader = AnnotationConfigContextLoader.class) diff --git a/ethereumj-core/src/test/java/test/ethereum/core/LogInfoTest.java b/ethereumj-core/src/test/java/test/ethereum/core/LogInfoTest.java index af7fc320..391714bb 100644 --- a/ethereumj-core/src/test/java/test/ethereum/core/LogInfoTest.java +++ b/ethereumj-core/src/test/java/test/ethereum/core/LogInfoTest.java @@ -1,7 +1,6 @@ package test.ethereum.core; import org.ethereum.vm.LogInfo; -import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ethereumj-core/src/test/java/test/ethereum/core/StateTest.java b/ethereumj-core/src/test/java/test/ethereum/core/StateTest.java index b4cc03d7..6e11cbc0 100644 --- a/ethereumj-core/src/test/java/test/ethereum/core/StateTest.java +++ b/ethereumj-core/src/test/java/test/ethereum/core/StateTest.java @@ -2,18 +2,13 @@ package test.ethereum.core; import org.ethereum.core.AccountState; import org.ethereum.core.Genesis; -import org.ethereum.core.Transaction; -import org.ethereum.core.TransactionReceipt; import org.ethereum.crypto.HashUtil; import org.ethereum.trie.Trie; import org.ethereum.trie.TrieImpl; -import org.ethereum.util.RLP; import org.junit.Test; -import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.spongycastle.util.encoders.Hex; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import test.ethereum.db.MockDB; import java.math.BigInteger; diff --git a/ethereumj-core/src/test/java/test/ethereum/core/TransactionTest.java b/ethereumj-core/src/test/java/test/ethereum/core/TransactionTest.java index 9f21dda8..f8221951 100644 --- a/ethereumj-core/src/test/java/test/ethereum/core/TransactionTest.java +++ b/ethereumj-core/src/test/java/test/ethereum/core/TransactionTest.java @@ -15,24 +15,13 @@ import org.ethereum.core.Bloom; import org.ethereum.core.TransactionReceipt; import org.ethereum.vm.LogInfo; import org.junit.Ignore; -import test.ethereum.TestContext; import org.ethereum.core.Transaction; import org.ethereum.crypto.ECKey; import org.ethereum.crypto.ECKey.MissingPrivateKeyException; import org.ethereum.crypto.HashUtil; -import org.ethereum.manager.WorldManager; -import org.junit.After; -import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; import org.spongycastle.util.BigIntegers; import org.spongycastle.util.encoders.Hex; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; @Ignore public class TransactionTest { diff --git a/ethereumj-core/src/test/java/test/ethereum/db/RepositoryTest.java b/ethereumj-core/src/test/java/test/ethereum/db/RepositoryTest.java index 7b40240f..cba04ef9 100644 --- a/ethereumj-core/src/test/java/test/ethereum/db/RepositoryTest.java +++ b/ethereumj-core/src/test/java/test/ethereum/db/RepositoryTest.java @@ -16,7 +16,6 @@ import java.math.BigInteger; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; /** * @author Roman Mandeleil diff --git a/ethereumj-core/src/test/java/test/ethereum/net/BlocksMessageTest.java b/ethereumj-core/src/test/java/test/ethereum/net/BlocksMessageTest.java index b42c983b..fc927db2 100644 --- a/ethereumj-core/src/test/java/test/ethereum/net/BlocksMessageTest.java +++ b/ethereumj-core/src/test/java/test/ethereum/net/BlocksMessageTest.java @@ -1,8 +1,6 @@ package test.ethereum.net; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - import java.io.File; import java.io.IOException; import java.net.URISyntaxException; diff --git a/ethereumj-core/src/test/java/test/ethereum/net/HelloMessageTest.java b/ethereumj-core/src/test/java/test/ethereum/net/HelloMessageTest.java index 2b174c2f..fda935e2 100644 --- a/ethereumj-core/src/test/java/test/ethereum/net/HelloMessageTest.java +++ b/ethereumj-core/src/test/java/test/ethereum/net/HelloMessageTest.java @@ -2,14 +2,8 @@ package test.ethereum.net; import static org.junit.Assert.assertEquals; -import java.util.Arrays; -import java.util.List; - -import org.ethereum.net.client.Capability; -import org.ethereum.net.eth.EthHandler; import org.ethereum.net.p2p.HelloMessage; import org.ethereum.net.p2p.P2pMessageCodes; -import org.ethereum.net.shh.ShhHandler; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ethereumj-core/src/test/java/test/ethereum/net/PeersMessageTest.java b/ethereumj-core/src/test/java/test/ethereum/net/PeersMessageTest.java index c3bc5c56..bed7e47b 100644 --- a/ethereumj-core/src/test/java/test/ethereum/net/PeersMessageTest.java +++ b/ethereumj-core/src/test/java/test/ethereum/net/PeersMessageTest.java @@ -2,12 +2,7 @@ package test.ethereum.net; import static org.junit.Assert.assertEquals; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.HashSet; import java.util.Iterator; -import java.util.Set; - import org.ethereum.net.p2p.GetPeersMessage; import org.ethereum.net.p2p.P2pMessageCodes; import org.ethereum.net.p2p.Peer; diff --git a/ethereumj-core/src/test/java/test/ethereum/net/StatusMessageTest.java b/ethereumj-core/src/test/java/test/ethereum/net/StatusMessageTest.java index 063938ee..a2978eeb 100644 --- a/ethereumj-core/src/test/java/test/ethereum/net/StatusMessageTest.java +++ b/ethereumj-core/src/test/java/test/ethereum/net/StatusMessageTest.java @@ -2,7 +2,6 @@ package test.ethereum.net; import static org.junit.Assert.assertEquals; -import org.ethereum.net.eth.EthMessageCodes; import org.ethereum.net.eth.StatusMessage; import org.junit.Test; import org.slf4j.Logger; diff --git a/ethereumj-studio/src/main/java/org/ethereum/gui/AccountsListWindow.java b/ethereumj-studio/src/main/java/org/ethereum/gui/AccountsListWindow.java index c37b7d41..e6d6a5d1 100755 --- a/ethereumj-studio/src/main/java/org/ethereum/gui/AccountsListWindow.java +++ b/ethereumj-studio/src/main/java/org/ethereum/gui/AccountsListWindow.java @@ -16,7 +16,6 @@ import org.ethereum.core.AccountState; import org.ethereum.core.Denomination; import org.ethereum.crypto.HashUtil; import org.ethereum.facade.Repository; -import org.ethereum.manager.WorldManager; import org.iq80.leveldb.DBIterator; import org.spongycastle.util.Arrays; import org.spongycastle.util.encoders.Hex; diff --git a/ethereumj-studio/src/main/java/org/ethereum/gui/BlockChainTable.java b/ethereumj-studio/src/main/java/org/ethereum/gui/BlockChainTable.java index 33ddaabe..6aedd21d 100644 --- a/ethereumj-studio/src/main/java/org/ethereum/gui/BlockChainTable.java +++ b/ethereumj-studio/src/main/java/org/ethereum/gui/BlockChainTable.java @@ -3,7 +3,6 @@ package org.ethereum.gui; import org.ethereum.core.Block; import org.ethereum.core.Transaction; import org.ethereum.facade.Blockchain; -import org.ethereum.manager.WorldManager; import org.ethereum.util.ByteUtil; import org.ethereum.util.Utils; diff --git a/ethereumj-studio/src/main/java/org/ethereum/gui/ConnectionConsoleWindow.java b/ethereumj-studio/src/main/java/org/ethereum/gui/ConnectionConsoleWindow.java index 0ac83edd..f4397bca 100644 --- a/ethereumj-studio/src/main/java/org/ethereum/gui/ConnectionConsoleWindow.java +++ b/ethereumj-studio/src/main/java/org/ethereum/gui/ConnectionConsoleWindow.java @@ -9,7 +9,6 @@ import java.awt.event.WindowEvent; import javax.swing.*; import org.ethereum.config.SystemProperties; -import org.ethereum.listener.EthereumListener; import org.ethereum.listener.EthereumListenerAdapter; import org.fife.ui.rsyntaxtextarea.*; import org.fife.ui.rtextarea.RTextScrollPane; diff --git a/ethereumj-studio/src/main/java/org/ethereum/gui/PayOutDialog.java b/ethereumj-studio/src/main/java/org/ethereum/gui/PayOutDialog.java index 523ca0e3..3d7d12c4 100644 --- a/ethereumj-studio/src/main/java/org/ethereum/gui/PayOutDialog.java +++ b/ethereumj-studio/src/main/java/org/ethereum/gui/PayOutDialog.java @@ -2,9 +2,6 @@ package org.ethereum.gui; import org.ethereum.core.Account; import org.ethereum.core.Transaction; -import org.ethereum.core.Wallet; -import org.ethereum.util.ByteUtil; -import org.spongycastle.pqc.math.linearalgebra.ByteUtils; import org.spongycastle.util.BigIntegers; import org.spongycastle.util.encoders.Hex; diff --git a/ethereumj-studio/src/main/java/org/ethereum/gui/PeersTableModel.java b/ethereumj-studio/src/main/java/org/ethereum/gui/PeersTableModel.java index ad3d4498..aa8bf070 100644 --- a/ethereumj-studio/src/main/java/org/ethereum/gui/PeersTableModel.java +++ b/ethereumj-studio/src/main/java/org/ethereum/gui/PeersTableModel.java @@ -13,7 +13,6 @@ import org.ethereum.geo.IpGeoDB; import org.ethereum.net.eth.StatusMessage; import org.ethereum.net.p2p.HelloMessage; -import org.ethereum.net.peerdiscovery.PeerInfo; import org.ethereum.util.Utils; import com.maxmind.geoip.Location; diff --git a/ethereumj-studio/src/main/java/org/ethereum/gui/PeersTableWindow.java b/ethereumj-studio/src/main/java/org/ethereum/gui/PeersTableWindow.java index 044d7bab..48d53e09 100644 --- a/ethereumj-studio/src/main/java/org/ethereum/gui/PeersTableWindow.java +++ b/ethereumj-studio/src/main/java/org/ethereum/gui/PeersTableWindow.java @@ -13,8 +13,6 @@ import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; -import static org.ethereum.config.SystemProperties.CONFIG; - /** * @author Roman Mandeleil * @since 25.04.14 diff --git a/ethereumj-studio/src/main/java/org/ethereum/gui/ProgramPlayDialog.java b/ethereumj-studio/src/main/java/org/ethereum/gui/ProgramPlayDialog.java index f7822a14..806d3eee 100755 --- a/ethereumj-studio/src/main/java/org/ethereum/gui/ProgramPlayDialog.java +++ b/ethereumj-studio/src/main/java/org/ethereum/gui/ProgramPlayDialog.java @@ -2,7 +2,6 @@ package org.ethereum.gui; import org.ethereum.core.Block; import org.ethereum.core.Transaction; -import org.ethereum.manager.WorldManager; import org.ethereum.vm.*; import org.spongycastle.util.encoders.Hex; diff --git a/ethereumj-studio/src/main/java/org/ethereum/gui/StateExplorerWindow.java b/ethereumj-studio/src/main/java/org/ethereum/gui/StateExplorerWindow.java index c8d0022e..31a8ae68 100755 --- a/ethereumj-studio/src/main/java/org/ethereum/gui/StateExplorerWindow.java +++ b/ethereumj-studio/src/main/java/org/ethereum/gui/StateExplorerWindow.java @@ -35,7 +35,6 @@ import javax.swing.table.AbstractTableModel; import org.ethereum.core.AccountState; import org.ethereum.db.ContractDetails; import org.ethereum.facade.Repository; -import org.ethereum.manager.WorldManager; import org.ethereum.util.Utils; import org.ethereum.vm.DataWord; import org.ethereum.vm.Program; diff --git a/ethereumj-studio/src/main/java/org/ethereum/gui/UIEthereumManager.java b/ethereumj-studio/src/main/java/org/ethereum/gui/UIEthereumManager.java index 93c21652..21105f6b 100644 --- a/ethereumj-studio/src/main/java/org/ethereum/gui/UIEthereumManager.java +++ b/ethereumj-studio/src/main/java/org/ethereum/gui/UIEthereumManager.java @@ -2,7 +2,6 @@ package org.ethereum.gui; import org.ethereum.facade.Ethereum; import org.ethereum.facade.EthereumFactory; -import org.ethereum.facade.EthereumImpl; /** * @author Roman Mandeleil diff --git a/ethereumj-studio/src/main/java/org/ethereum/gui/WalletAddressPanel.java b/ethereumj-studio/src/main/java/org/ethereum/gui/WalletAddressPanel.java index 9d030cf8..c9de0e6d 100644 --- a/ethereumj-studio/src/main/java/org/ethereum/gui/WalletAddressPanel.java +++ b/ethereumj-studio/src/main/java/org/ethereum/gui/WalletAddressPanel.java @@ -1,7 +1,6 @@ package org.ethereum.gui; import org.ethereum.core.Account; -import org.ethereum.facade.Ethereum; import org.ethereum.util.Utils; import org.spongycastle.util.encoders.Hex;