status-im
/
ethereumj-personal
mirror of https://github.com/status-im/ethereumj-personal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Optimize imports using shared IDEA configuration 

The affected sources have drifted from import organization conventions
since the shared IDEA configuration was added in commit a155518. There
are several ways to avoid this in the future:

 1. Run Code->Optimize Imports manually prior to making any commit (or
    use the shortcut key).
 2. Select 'Optimize Imports on the Fly' from
    Preferences->Editor->General->Auto Import.

If IDEA is not being used, simply follow convention.
This commit is contained in:
Chris Beams 2015-01-20 11:17:40 +01:00
parent ee0e3e8aea
commit 2d785f9406
No known key found for this signature in database
GPG Key ID: 3D214F8F5BC5ED73
24 changed files with 71 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ethereumj-core/src/main/java/org/ethereum/core/BlockchainImpl.java
View File

@ -9,9 +9,12 @@ import org.ethereum.net.BlockQueue;
import org.ethereum.net.server.ChannelManager;
import org.ethereum.util.AdvancedDeviceUtils;
import org.ethereum.vm.ProgramInvokeFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spongycastle.util.encoders.Hex;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.FileSystemUtils;
@ -20,7 +23,9 @@ import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -332,7 +337,7 @@ public class BlockchainImpl implements Blockchain {
for (Transaction tx : block.getTransactionsList()) {
stateLogger.info("apply block: [{}] tx: [{}] ", block.getNumber(), i);
TransactionExecutor executor = new TransactionExecutor(tx, block.getCoinbase(),
TransactionExecutor executor = new TransactionExecutor(tx, block.getCoinbase(),
track, blockStore,
programInvokeFactory, block);
executor.execute();

15
ethereumj-core/src/main/java/org/ethereum/datasource/LevelDbDataSource.java
View File

@ -1,18 +1,19 @@
package org.ethereum.datasource;
import org.ethereum.config.SystemProperties;
import org.ethereum.db.ByteArrayWrapper;
import org.ethereum.db.Database;
import org.ethereum.db.DatabaseImpl;
import org.ethereum.trie.Node;
import org.iq80.leveldb.*;
import org.iq80.leveldb.CompressionType;
import org.iq80.leveldb.DB;
import org.iq80.leveldb.DBIterator;
import org.iq80.leveldb.Options;
import org.iq80.leveldb.WriteBatch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spongycastle.util.encoders.Hex;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;

13
ethereumj-core/src/main/java/org/ethereum/datasource/RedisDataSource.java
View File

@ -1,15 +1,16 @@
package org.ethereum.datasource;
import org.ethereum.db.Database;
import org.ethereum.db.DatabaseImpl;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.Pipeline;
import java.util.*;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import static org.ethereum.config.SystemProperties.CONFIG;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.Pipeline;
/**
* @author Roman Mandeleil
* @since 18.01.2015

2
ethereumj-core/src/main/java/org/ethereum/db/BlockStore.java
View File

@ -2,9 +2,11 @@ package org.ethereum.db;
import org.ethereum.core.Block;
import org.ethereum.core.TransactionReceipt;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigInteger;
import java.util.List;
/**

2
ethereumj-core/src/main/java/org/ethereum/db/BlockStoreDummy.java
View File

@ -3,9 +3,9 @@ package org.ethereum.db;
import org.ethereum.core.Block;
import org.ethereum.core.TransactionReceipt;
import org.ethereum.crypto.HashUtil;
import org.ethereum.util.ByteUtil;
import java.math.BigInteger;
import java.util.List;
/**

2
ethereumj-core/src/main/java/org/ethereum/db/BlockStoreImpl.java
View File

@ -2,8 +2,8 @@ package org.ethereum.db;
import org.ethereum.core.Block;
import org.ethereum.core.TransactionReceipt;
import org.ethereum.util.ByteUtil;
import org.hibernate.SessionFactory;
import org.springframework.beans.factory.annotation.Autowired;

3
ethereumj-core/src/main/java/org/ethereum/db/DatabaseImpl.java
View File

@ -1,12 +1,13 @@
package org.ethereum.db;
import org.ethereum.config.SystemProperties;
import org.ethereum.datasource.KeyValueDataSource;
import org.ethereum.datasource.LevelDbDataSource;
import org.ethereum.datasource.RedisDataSource;
import org.ethereum.util.ByteUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spongycastle.util.encoders.Hex;
import java.util.ArrayList;

2
ethereumj-core/src/main/java/org/ethereum/db/RepositoryDummy.java
View File

@ -5,8 +5,6 @@ import org.ethereum.core.Block;
import org.ethereum.facade.Repository;
import org.ethereum.vm.DataWord;
import org.iq80.leveldb.DBIterator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

10
ethereumj-core/src/main/java/org/ethereum/db/RepositoryImpl.java
View File

@ -1,7 +1,5 @@
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;
@ -10,9 +8,15 @@ import org.ethereum.json.JSONHelper;
import org.ethereum.trie.Trie;
import org.ethereum.trie.TrieImpl;
import org.ethereum.vm.DataWord;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spongycastle.util.encoders.Hex;
import org.springframework.stereotype.Component;
import org.springframework.util.FileSystemUtils;
@ -20,7 +24,9 @@ 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.Set;

3
ethereumj-core/src/main/java/org/ethereum/db/RepositoryTrack.java
View File

@ -4,11 +4,14 @@ import org.ethereum.core.AccountState;
import org.ethereum.core.Block;
import org.ethereum.facade.Repository;
import org.ethereum.vm.DataWord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spongycastle.util.encoders.Hex;
import java.math.BigInteger;
import java.util.HashMap;
import java.util.Set;

3
ethereumj-core/src/main/java/org/ethereum/facade/Repository.java
View File

@ -6,12 +6,9 @@ import org.ethereum.db.ByteArrayWrapper;
import org.ethereum.db.ContractDetails;
import org.ethereum.vm.DataWord;
import org.iq80.leveldb.DBIterator;
import java.math.BigInteger;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
/**

2
ethereumj-core/src/main/java/org/ethereum/listener/EthereumListenerWrapper.java
View File

@ -3,8 +3,8 @@ package org.ethereum.listener;
import org.ethereum.core.Block;
import org.ethereum.core.Transaction;
import org.ethereum.net.message.Message;
import org.ethereum.net.p2p.HelloMessage;
import org.springframework.stereotype.Component;
import java.util.Set;

1
ethereumj-core/src/main/java/org/ethereum/manager/WorldManager.java
View File

@ -7,7 +7,6 @@ import org.ethereum.core.TransactionReceipt;
import org.ethereum.core.Wallet;
import org.ethereum.crypto.HashUtil;
import org.ethereum.db.BlockStore;
import org.ethereum.db.BlockStoreImpl;
import org.ethereum.facade.Blockchain;
import org.ethereum.facade.Repository;
import org.ethereum.listener.EthereumListener;

1
ethereumj-core/src/main/java/org/ethereum/net/server/Channel.java
View File

@ -15,6 +15,7 @@ import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import java.math.BigInteger;
import java.net.InetSocketAddress;
/**

3
ethereumj-core/src/main/java/org/ethereum/trie/Cache.java
View File

@ -5,9 +5,6 @@ import org.ethereum.datasource.KeyValueDataSource;
import org.ethereum.db.ByteArrayWrapper;
import org.ethereum.util.Value;
import org.iq80.leveldb.DB;
import org.iq80.leveldb.WriteBatch;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

2
ethereumj-core/src/main/java/org/ethereum/trie/TrieImpl.java
View File

@ -5,8 +5,6 @@ import org.ethereum.datasource.KeyValueDataSource;
import org.ethereum.db.ByteArrayWrapper;
import org.ethereum.util.Value;
import org.iq80.leveldb.DB;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

9
ethereumj-core/src/main/java/org/ethereum/vm/Program.java
View File

@ -1,7 +1,6 @@
package org.ethereum.vm;
import org.ethereum.crypto.HashUtil;
import org.ethereum.db.BlockStore;
import org.ethereum.db.ContractDetails;
import org.ethereum.facade.Repository;
import org.ethereum.util.ByteUtil;
@ -28,7 +27,13 @@ import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.Stack;
import static org.ethereum.config.SystemProperties.CONFIG;
import static org.ethereum.util.ByteUtil.EMPTY_BYTE_ARRAY;

1
ethereumj-core/src/main/java/org/ethereum/vm/ProgramInvokeFactoryImpl.java
View File

@ -3,7 +3,6 @@ package org.ethereum.vm;
import org.ethereum.core.Block;
import org.ethereum.core.Transaction;
import org.ethereum.db.BlockStore;
import org.ethereum.db.BlockStoreImpl;
import org.ethereum.facade.Blockchain;
import org.ethereum.facade.Repository;
import org.ethereum.util.ByteUtil;

3
ethereumj-core/src/test/java/test/ethereum/datasource/RedisDataSourceTest.java
View File

@ -1,9 +1,12 @@
package test.ethereum.datasource;
import org.ethereum.datasource.RedisDataSource;
import org.junit.Assert;
import org.junit.Test;
import org.spongycastle.util.encoders.Hex;
import redis.clients.jedis.exceptions.JedisConnectionException;
/**

1
ethereumj-core/src/test/java/test/ethereum/db/MockDB.java
View File

@ -2,6 +2,7 @@ package test.ethereum.db;
import org.ethereum.datasource.KeyValueDataSource;
import org.ethereum.db.ByteArrayWrapper;
import org.iq80.leveldb.DBException;
import java.util.HashMap;

14
ethereumj-core/src/test/java/test/ethereum/trie/TrieTest.java
View File

@ -1,7 +1,5 @@
package test.ethereum.trie;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.Pipeline;
import test.ethereum.db.MockDB;
import org.ethereum.core.AccountState;
@ -34,11 +32,21 @@ import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import static org.ethereum.crypto.HashUtil.EMPTY_TRIE_HASH;
import static org.junit.Assert.*;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.Pipeline;
public class TrieTest {
private static final Logger logger = LoggerFactory.getLogger("test");

3
ethereumj-core/src/test/java/test/ethereum/vm/PrecompiledContractTest.java
View File

@ -4,8 +4,9 @@ import org.ethereum.util.ByteUtil;
import org.ethereum.vm.DataWord;
import org.ethereum.vm.PrecompiledContracts;
import org.ethereum.vm.PrecompiledContracts.PrecompiledContract;
import org.junit.Assert;
import org.junit.Test;
import org.spongycastle.util.encoders.Hex;
import static org.junit.Assert.*;

3
ethereumj-core/src/test/java/test/ethereum/vm/VMTest.java
View File

@ -1,6 +1,5 @@
package test.ethereum.vm;
import jdk.nashorn.internal.ir.annotations.Ignore;
import org.ethereum.facade.Repository;
import org.ethereum.util.ByteUtil;
import org.ethereum.vm.DataWord;
@ -24,6 +23,8 @@ import java.util.List;
import static org.junit.Assert.*;
import jdk.nashorn.internal.ir.annotations.Ignore;
/**
* @author Roman Mandeleil
* @since 01.06.2014

7
ethereumj-studio/src/main/java/org/ethereum/gui/AccountsListWindow.java
View File

@ -4,16 +4,19 @@ import org.ethereum.core.AccountState;
import org.ethereum.core.Denomination;
import org.ethereum.crypto.HashUtil;
import org.ethereum.facade.Repository;
import org.spongycastle.util.Arrays;
import org.spongycastle.util.encoders.Hex;
import javax.swing.*;
import javax.swing.table.AbstractTableModel;
import java.awt.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import javax.swing.*;
import javax.swing.table.AbstractTableModel;
public class AccountsListWindow extends JFrame {
private JTable tblAccountsDataTable;