Remove dbExists logic, as now rely on the Dependency Injection for BlockDB

seanrobbins · sasaxie · commit e619b49dfa65 · 2018-01-12T14:45:03.000+08:00
diff --git a/src/main/java/org/tron/core/Blockchain.java b/src/main/java/org/tron/core/Blockchain.java
@@ -124,24 +124,6 @@ public Blockchain(LevelDbDataSourceImpl blockDB, String address, String type) {
         }
     }
 
-    /**
-     * create blockchain by db source
-     */
-    @Inject
-    public Blockchain(@Named("block") LevelDbDataSourceImpl blockDb) {
-        if (!dbExists()) {
-            logger.info("no existing blockchain found. please create one first");
-            throw new IllegalStateException("No existing blockchain found. please create one first");
-        }
-
-        blockDB = blockDb;
-
-        this.lastHash = blockDB.getData(LAST_HASH);
-        this.currentHash = this.lastHash;
-
-        logger.info("load blockchain");
-    }
-
     /**
      * find transaction by id
      *
@@ -229,23 +211,6 @@ public HashMap<String, TXOutputs> findUTXO() {
         return utxo;
     }
 
-    /**
-     * Checks if the database file exists
-     *
-     * @return boolean
-     */
-    public static boolean dbExists() {
-        if (Constant.NORMAL==parentName){
-            parentName= Configer.getConf(Constant.NORMAL_CONF).getString(Constant.DATABASE_DIR);
-        }else {
-            parentName=Configer.getConf(Constant.TEST_CONF).getString(Constant.DATABASE_DIR);
-
-        }
-        File file = new File(Paths.get(parentName, BLOCK_DB_NAME).toString());
-        return file.exists();
-    }
-
-
     /**
      * add a block into database
      *
diff --git a/src/test/java/org/tron/core/BlockchainTest.java b/src/test/java/org/tron/core/BlockchainTest.java
@@ -14,13 +14,9 @@
  */
 package org.tron.core;
 
-import com.alibaba.fastjson.JSON;
-import com.google.common.io.ByteStreams;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
-import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.slf4j.Logger;
@@ -33,13 +29,12 @@
 import org.tron.wallet.Wallet;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
-import static org.tron.core.Blockchain.GENESIS_COINBASE_DATA;
-import static org.tron.core.Blockchain.dbExists;
 import static org.tron.core.Constant.LAST_HASH;
 import static org.tron.utils.ByteArray.toHexString;
 
@@ -107,11 +102,6 @@ public void testFindTransaction() {
         logger.info("{}", TransactionUtils.toPrintString(transaction));
     }
 
-    @Test
-    public void testDBExists() {
-        logger.info("test dbStore exists: {}", dbExists());
-    }
-
     @Test
     public void testFindUTXO() {
         long testAmount = 10;
