remove duplicate reference to tron.conf

fixed typo formatting cleanup
obaimand · Jan 6, 2018 · ed193ad · ed193ad
1 parent 7a88c60
commit ed193ad
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/src/main/java/org/tron/config/Configer.java b/src/main/java/org/tron/config/Configer.java
@@ -19,6 +19,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.spongycastle.util.encoders.Hex;
+import org.tron.core.Constant;
 import org.tron.crypto.ECKey;
 import org.tron.utils.ByteArray;
 
@@ -28,7 +29,6 @@
 public class Configer {
     private static final Logger logger = LoggerFactory.getLogger("Configer");
 
-    public static String TRON_CONF = "tron.conf";
     private final static String DATABASE_DIRECTORY = "database.directory";
     private static String generatedNodePrivateKey;
     private static Config config;
@@ -67,7 +67,7 @@ public class Configer {
 
     public static Config getConf() {
         if (config == null) {
-            config = ConfigFactory.load(TRON_CONF);
+            config = ConfigFactory.load(Constant.NORMAL_CONF);
         }
         return config;
     }

diff --git a/src/main/java/org/tron/core/Blockchain.java b/src/main/java/org/tron/core/Blockchain.java
@@ -48,9 +48,9 @@
 
 public class Blockchain {
     public static final String GENESIS_COINBASE_DATA = "0x00";
+    public static final String genesisCoinbaseData = "0x10";
 
     public static final Logger logger = LoggerFactory.getLogger("BlockChain");
-    public static final String genesisCoinbaseData = "0x10";
     private LevelDbDataSourceImpl blockDB = null;
     private PendingState pendingState = new PendingStateImpl();
 

diff --git a/src/main/java/org/tron/core/Coin.java b/src/main/java/org/tron/core/Coin.java
@@ -17,8 +17,8 @@ public final class Coin implements Monetary, Comparable<Coin>, Serializable {
 
     public final long value;
 
-    private Coin(long statoshis) {
-        this.value = statoshis;
+    private Coin(long satoshis) {
+        this.value = satoshis;
     }
 
     @Override

diff --git a/src/main/java/org/tron/core/Constant.java b/src/main/java/org/tron/core/Constant.java
@@ -32,10 +32,7 @@ public class Constant {
     public final static Integer PARTITION = 0;
 
     //config
-    public final  static String NORMAL_CONF="tron.conf";
-    public final  static String TEST_CONF="tron-test.conf";
-    public final  static String DATABASE_DIR="database.directory";
-
-
-
+    public final static String NORMAL_CONF = "tron.conf";
+    public final static String TEST_CONF = "tron-test.conf";
+    public final static String DATABASE_DIR = "database.directory";
 }