Merge branch 'develop' of https://github.com/tronprotocol/java-tron into develop

Author: [email protected]

build.gradle

@@ -23,6 +23,7 @@ buildscript {
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.9.5'
 
     compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
     compile group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.25'

src/main/java/org/tron/core/BlockUtils.java

@@ -30,6 +30,7 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.Optional;
 
 import static org.tron.core.Constant.LAST_HASH;
 import static org.tron.crypto.Hash.sha3;
@@ -49,8 +50,10 @@ public static Block newBlock(List<Transaction> transactions, ByteString
         Block.Builder block = Block.newBuilder();
 
         for (int i = 0; transactions != null && i < transactions.size(); i++) {
-            Transaction transaction = transactions.get(i);
-            block.addTransactions(i, transaction);
+            final int index = i;
+            Optional.ofNullable(transactions.get(index)).ifPresent((transaction) ->
+                    block.addTransactions(index, transaction)
+            );
         }
 
         //Chain programming

src/main/java/org/tron/core/Blockchain.java

@@ -64,48 +64,34 @@ public class Blockchain {
      */
     public Blockchain(String address) {
         if (dbExists()) {
-            logger.info("blockchain already exists.");
-            System.exit(0);
-        }
+            blockDB = new LevelDbDataSourceImpl(BLOCK_DB_NAME);
+            blockDB.initDB();
 
-        blockDB = new LevelDbDataSourceImpl(BLOCK_DB_NAME);
-        blockDB.initDB();
+            this.lastHash = blockDB.getData(LAST_HASH);
+            this.currentHash = this.lastHash;
 
-        Transaction coinbase = TransactionUtils.newCoinbaseTransaction
-                (address, GENESIS_COINBASE_DATA);
-        Block genesisBlock = BlockUtils.newGenesisBlock(coinbase);
+            logger.info("load blockchain");
+        } else {
+            blockDB = new LevelDbDataSourceImpl(BLOCK_DB_NAME);
+            blockDB.initDB();
 
-        this.lastHash = genesisBlock.getBlockHeader().getHash().toByteArray();
-        this.currentHash = this.lastHash;
+            Transaction coinbase = TransactionUtils.newCoinbaseTransaction
+                    (address, GENESIS_COINBASE_DATA);
+            Block genesisBlock = BlockUtils.newGenesisBlock(coinbase);
 
-        blockDB.putData(genesisBlock.getBlockHeader().getHash().toByteArray(),
-                genesisBlock.toByteArray());
-        byte[] lastHash = genesisBlock.getBlockHeader()
-                .getHash()
-                .toByteArray();
+            this.lastHash = genesisBlock.getBlockHeader().getHash().toByteArray();
+            this.currentHash = this.lastHash;
 
-        blockDB.putData(LAST_HASH, lastHash);
+            blockDB.putData(genesisBlock.getBlockHeader().getHash().toByteArray(),
+                    genesisBlock.toByteArray());
+            byte[] lastHash = genesisBlock.getBlockHeader()
+                    .getHash()
+                    .toByteArray();
 
-        logger.info("new blockchain");
-    }
+            blockDB.putData(LAST_HASH, lastHash);
 
-    /**
-     * create blockchain by dbStore source
-     */
-    public Blockchain() {
-        if (!dbExists()) {
-            logger.info("no existing blockchain found. please create one " +
-                    "first");
-            System.exit(0);
+            logger.info("new blockchain");
         }
-
-        blockDB = new LevelDbDataSourceImpl(BLOCK_DB_NAME);
-        blockDB.initDB();
-
-        this.lastHash = blockDB.getData(LAST_HASH);
-        this.currentHash = this.lastHash;
-
-        logger.info("load blockchain");
     }
 
     /**

src/main/java/org/tron/peer/Peer.java

@@ -106,11 +106,7 @@ private void initWallet() {
     }
 
     private void initBlockchain() {
-        if (Blockchain.dbExists()) {
-            blockchain = new Blockchain();
-        } else {
-            blockchain = new Blockchain(ByteArray.toHexString(wallet.getAddress()));
-        }
+       blockchain = new Blockchain(ByteArray.toHexString(wallet.getAddress()));
     }
 
     private void initUTXOSet() {

src/test/java/org/tron/core/BlockUtilsTest.java

@@ -16,10 +16,12 @@
 
 import com.google.protobuf.ByteString;
 import org.junit.Test;
+import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tron.protos.core.TronBlock.Block;
 import org.tron.protos.core.TronTransaction.Transaction;
+import org.tron.storage.leveldb.LevelDbDataSourceImpl;
 import org.tron.utils.ByteArray;
 
 import static org.tron.core.Blockchain.GENESIS_COINBASE_DATA;
@@ -97,7 +99,12 @@ public void testGetPowBoundary() {
 
     @Test
     public void testGetIncreaseNumber() {
+        LevelDbDataSourceImpl mockDb = Mockito.mock(LevelDbDataSourceImpl.class);
+
+        Blockchain mockBlockchain = Mockito.mock(Blockchain.class);
+        Mockito.when(mockBlockchain.getBlockDB()).thenReturn(mockDb);
+
         logger.info("test getData increase number: {}", BlockUtils
-                .getIncreaseNumber(new Blockchain()));
+                .getIncreaseNumber(mockBlockchain));
     }
 }

src/test/java/org/tron/core/BlockchainTest.java

@@ -16,13 +16,15 @@
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.tron.storage.leveldb.LevelDbDataSourceImpl;
 import org.tron.protos.core.TronBlock.Block;
 import org.tron.protos.core.TronTXOutputs;
 import org.tron.protos.core.TronTransaction.Transaction;
+import org.tron.storage.leveldb.LevelDbDataSourceImpl;
 import org.tron.utils.ByteArray;
 import org.tron.wallet.Wallet;
 
@@ -36,21 +38,27 @@
 
 public class BlockchainTest {
     private static final Logger logger = LoggerFactory.getLogger("Test");
+    private static Blockchain blockchain;
+
+    @BeforeClass
+    public static void init() {
+       blockchain = new Blockchain("0304f784e4e7bae517bcab94c3e0c9214fb4ac7ff9d7d5a937d1f40031f87b85");
+    }
+
+    @AfterClass
+    public static void teardown() {
+        blockchain.getBlockDB().closeDB();
+    }
 
     @Test
     public void testBlockchain() {
-        Blockchain blockchain = new Blockchain
-                ("0304f784e4e7bae517bcab94c3e0c9214fb4ac7ff9d7d5a937d1f40031f87b85");
-
         logger.info("test blockchain: lashHash = {}, currentHash = {}",
                 ByteArray.toHexString(blockchain.getLastHash()), ByteArray
                         .toHexString(blockchain.getCurrentHash()));
     }
 
     @Test
     public void testBlockchainNew() {
-        Blockchain blockchain = new Blockchain();
-
         logger.info("test blockchain new: lastHash = {}", ByteArray
                 .toHexString(blockchain.getLastHash()));
 
@@ -70,7 +78,6 @@ public void testBlockchainNew() {
 
     @Test
     public void testIterator() {
-        Blockchain blockchain = new Blockchain("");
         Block info = null;
         BlockchainIterator bi = new BlockchainIterator(blockchain);
         while (bi.hasNext()) {
@@ -84,10 +91,6 @@ public void testIterator() {
 
     @Test
     public void testFindTransaction() {
-        Blockchain blockchain = new Blockchain();
-        LevelDbDataSourceImpl db = new LevelDbDataSourceImpl("test");
-        db.initDB();
-        blockchain.setBlockDB(db);
         Transaction transaction = blockchain.findTransaction(ByteString
                 .copyFrom(ByteArray.fromHexString
                         ("15f3988aa8d56eab3bfca45144bad77fc60acce50437a0a9d794a03a83c15c5e")));
@@ -101,12 +104,11 @@ public void testDBExists() {
 
     @Test
     public void testFindUTXO() {
-        Blockchain blockchain = new Blockchain
-                ("fd0f3c8ab4877f0fd96cd156b0ad42ea7aa82c31");
         Wallet wallet = new Wallet();
         wallet.init();
+        UTXOSet utxoSet = new UTXOSet();
         Transaction transaction = TransactionUtils.newTransaction(wallet,
-                "fd0f3c8ab4877f0fd96cd156b0ad42ea7aa82c31", 10, null);
+                "fd0f3c8ab4877f0fd96cd156b0ad42ea7aa82c31", 10, utxoSet);
         List<Transaction> transactions = new ArrayList<>();
         transactions.add(transaction);
         blockchain.addBlock(BlockUtils.newBlock(transactions, ByteString
@@ -122,14 +124,11 @@ public void testAddBlockToChain() {
         ByteString difficulty = ByteString.copyFrom(ByteArray.fromHexString
                 ("2001"));
 
-        //Blockchain blockchain = new Blockchain();
         Wallet wallet = new Wallet();
         wallet.init();
 
         Block block = BlockUtils.newBlock(null, parentHash,
                 difficulty, 0);
-        //TronBlockChainImpl tronBlockChain = new TronBlockChainImpl();
-        //tronBlockChain.addBlockToChain(block);
         LevelDbDataSourceImpl levelDbDataSource = new LevelDbDataSourceImpl
                 ("blockStore_test");
         levelDbDataSource.initDB();
@@ -139,8 +138,6 @@ public void testAddBlockToChain() {
         byte[] values = value.getBytes();
         levelDbDataSource.putData(key, values);
 
-        Blockchain blockchain = new Blockchain();
         blockchain.addBlock(block);
-
     }
 }