fix

Author: [email protected]

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

@@ -15,14 +15,14 @@
 package org.tron.core;
 
 
-import org.tron.dbStore.BlockStoreInter;
+import org.tron.dbStore.BlockStoreInput;
 import org.tron.protos.core.TronBlock;
 
 import java.math.BigInteger;
 
 public interface TronBlockChain {
 
-    BlockStoreInter getBlockStoreInter();
+    BlockStoreInput getBlockStoreInter();
 
     /**
      * @return - last added block from blockchain

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

@@ -22,7 +22,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.tron.config.SystemProperties;
-import org.tron.dbStore.BlockStoreInter;
+import org.tron.dbStore.BlockStoreInput;
 import org.tron.storage.leveldb.LevelDbDataSourceImpl;
 import org.tron.protos.core.TronBlock;
 
@@ -43,14 +43,14 @@ public class TronBlockChainImpl implements TronBlockChain, org.tron.facade
     SystemProperties config = SystemProperties.getDefault();
 
     @Autowired
-    protected BlockStoreInter blockStoreInter;
+    protected BlockStoreInput blockStoreInter;
 
     //private static TronBlock.Block bestBlock;
 
     private BigInteger totalDifficulty = BigInteger.ZERO;
 
     @Override
-    public BlockStoreInter getBlockStoreInter() {
+    public BlockStoreInput getBlockStoreInter() {
         return blockStoreInter;
     }
 

src/main/java/org/tron/dbStore/AbstractBlockstore.java

@@ -1,5 +1,5 @@
 package org.tron.dbStore;
 
-public abstract class AbstractBlockstore implements BlockStoreInter {
+public abstract class AbstractBlockstore implements BlockStoreInput {
 
 }

src/main/java/org/tron/dbStore/BlockStoreInter.java renamed to src/main/java/org/tron/dbStore/BlockStoreInput.java

@@ -15,7 +15,7 @@
 package org.tron.dbStore;
 import org.tron.protos.core.TronBlock;
 
-public interface BlockStoreInter {
+public interface BlockStoreInput {
 
     TronBlock.Block getBestBlock();
 

src/main/java/org/tron/dbStore/IndexedBlockStoreInter.java renamed to src/main/java/org/tron/dbStore/IndexedBlockStore.java

@@ -21,7 +21,7 @@
 import java.math.BigInteger;
 import java.util.List;
 
-public class IndexedBlockStoreInter extends AbstractBlockstore {
+public class IndexedBlockStore extends AbstractBlockstore {
 
     DataSourceArray<List<BlockInfo>> index;
     ObjectDataSource<TronBlock.Block> blocks;

src/main/java/org/tron/manager/BlockLoader.java renamed to src/main/java/org/tron/manager/TronBlockLoader.java

@@ -29,9 +29,9 @@
 import java.util.Scanner;
 import java.util.function.Function;
 
-public class BlockLoader {
+public class TronBlockLoader {
 
-    private static final Logger logger = LoggerFactory.getLogger("BlockLoader");
+    private static final Logger logger = LoggerFactory.getLogger("TronBlockLoader");
 
     @Autowired
     private TronBlockChainImpl blockchain;

src/main/java/org/tron/trie/TrieImpl.java

@@ -39,6 +39,17 @@ public class TrieImpl implements Trie<byte[]> {
     private final static int MIN_BRANCHES_CONCURRENTLY = 3;
     private static ExecutorService executor;
 
+
+    private static final int OFFSET_SHORT_ITEM = 0x80;
+
+    private static final int SIZE_THRESHOLD = 56;
+
+    private static final int OFFSET_LONG_ITEM = 0xb7;
+
+    private static final int OFFSET_SHORT_LIST = 0xc0;
+
+    private static final int OFFSET_LONG_LIST = 0xf7;
+
     public static ExecutorService getExecutor() {
         if (executor == null) {
             executor = Executors.newFixedThreadPool(4,
@@ -53,17 +64,6 @@ public enum NodeType {
         KVNodeNode
     }
 
-    //***********************************
-
-    private static final int OFFSET_SHORT_ITEM = 0x80;
-
-    private static final int SIZE_THRESHOLD = 56;
-
-    private static final int OFFSET_LONG_ITEM = 0xb7;
-
-    private static final int OFFSET_SHORT_LIST = 0xc0;
-
-    private static final int OFFSET_LONG_LIST = 0xf7;
 
     public final byte[] EMPTY_ELEMENT_SERIALIZABLE = encodeElement(new byte[0]);
 
@@ -126,8 +126,7 @@ public byte[] encodeList(byte[]... elements) {
             data[0] = (byte) (OFFSET_SHORT_LIST + totalLength);
             copyPos = 1;
         } else {
-            // length of length = BX
-            // prefix = [BX, [length]]
+
             int tmpLength = totalLength;
             byte byteNum = 0;
             while (tmpLength != 0) {
@@ -247,8 +246,6 @@ public LList decodeLazyList(byte[] data, int pos, int length) {
     }
 
 
-    //***********************************
-
     public final class Node {
         private byte[] hash = null;