fix following comment

geb789 · geb789 · commit d43927ee492a · 2019-11-26T16:55:34.000+08:00
diff --git a/actuator/src/main/java/org/tron/core/actuator/ProposalCreateActuator.java b/actuator/src/main/java/org/tron/core/actuator/ProposalCreateActuator.java
@@ -17,7 +17,6 @@
 import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
 import org.tron.core.utils.ProposalUtil;
-import org.tron.core.vm.config.VMConfig;
 import org.tron.protos.Protocol.Transaction.Contract.ContractType;
 import org.tron.protos.Protocol.Transaction.Result.code;
 import org.tron.protos.contract.ProposalContract.ProposalCreateContract;
diff --git a/actuator/src/main/java/org/tron/core/actuator/ShieldedTransferActuator.java b/actuator/src/main/java/org/tron/core/actuator/ShieldedTransferActuator.java
@@ -35,8 +35,6 @@
 import org.tron.core.store.DynamicPropertiesStore;
 import org.tron.core.store.NullifierStore;
 import org.tron.core.store.ZKProofStore;
-import org.tron.core.utils.TransactionUtil;
-import org.tron.core.vm.config.VMConfig;
 import org.tron.protos.Protocol.AccountType;
 import org.tron.protos.Protocol.Transaction.Contract.ContractType;
 import org.tron.protos.Protocol.Transaction.Result.code;
diff --git a/actuator/src/main/java/org/tron/core/actuator/VMActuator.java b/actuator/src/main/java/org/tron/core/actuator/VMActuator.java
@@ -23,6 +23,7 @@
 import org.tron.common.runtime.InternalTransaction.TrxType;
 import org.tron.common.runtime.ProgramResult;
 import org.tron.common.utils.DBConfig;
+import org.tron.common.utils.StorageUtils;
 import org.tron.common.utils.WalletUtil;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.BlockCapsule;
@@ -339,7 +340,7 @@ private void create()
       long energyLimit;
       // according to version
 
-      if (VMConfig.getEnergyLimitHardFork()) {
+      if (StorageUtils.getEnergyLimitHardFork()) {
         if (callValue < 0) {
           throw new ContractValidateException("callValue must be >= 0");
         }
@@ -441,7 +442,7 @@ private void call()
       tokenId = contract.getTokenId();
     }
 
-    if (VMConfig.getEnergyLimitHardFork()) {
+    if (StorageUtils.getEnergyLimitHardFork()) {
       if (callValue < 0) {
         throw new ContractValidateException("callValue must be >= 0");
       }
@@ -576,7 +577,7 @@ public long getTotalEnergyLimit(AccountCapsule creator, AccountCapsule caller,
       return getAccountEnergyLimitWithFixRatio(caller, feeLimit, callValue);
     }
     //  according to version
-    if (VMConfig.getEnergyLimitHardFork()) {
+    if (StorageUtils.getEnergyLimitHardFork()) {
       return getTotalEnergyLimitWithFixRatio(creator, caller, contract, feeLimit, callValue);
     } else {
       return getTotalEnergyLimitWithFloatRatio(creator, caller, contract, feeLimit, callValue);
diff --git a/actuator/src/main/java/org/tron/core/vm/config/VMConfig.java b/actuator/src/main/java/org/tron/core/vm/config/VMConfig.java
@@ -94,10 +94,6 @@ public static void initAllowTvmSolidity059(long allow) {
     ALLOW_TVM_SOLIDITY_059 = allow == 1;
   }
 
-  public static boolean getEnergyLimitHardFork() {
-    return ENERGY_LIMIT_HARD_FORK;
-  }
-
   public static boolean allowTvmTransferTrc10() {
     return ALLOW_TVM_TRANSFER_TRC10;
   }
diff --git a/actuator/src/main/java/org/tron/core/vm/repository/RepositoryImpl.java b/actuator/src/main/java/org/tron/core/vm/repository/RepositoryImpl.java
@@ -14,6 +14,7 @@
 import org.tron.common.utils.DBConfig;
 import org.tron.common.utils.Hash;
 import org.tron.common.utils.Sha256Hash;
+import org.tron.common.utils.StorageUtils;
 import org.tron.common.utils.StringUtil;
 import org.tron.core.ChainBaseManager;
 import org.tron.core.capsule.AccountCapsule;
@@ -344,7 +345,7 @@ public Storage getStorage(byte[] address) {
     Storage storage;
     if (this.parent != null) {
       Storage parentStorage = parent.getStorage(address);
-      if (VMConfig.getEnergyLimitHardFork()) {
+      if (StorageUtils.getEnergyLimitHardFork()) {
         // deep copy
         storage = new Storage(parentStorage);
       } else {
diff --git a/chainbase/src/main/java/org/tron/common/utils/StorageUtils.java b/chainbase/src/main/java/org/tron/common/utils/StorageUtils.java
@@ -59,7 +59,7 @@ public static Options getOptionsByDbName(String dbName) {
     return createDefaultDbOptions();
   }
 
-  private static Options createDefaultDbOptions() {
+  protected static Options createDefaultDbOptions() {
     Options dbOptions = new Options();
 
     dbOptions.createIfMissing(true);
diff --git a/framework/src/main/java/org/tron/common/storage/DepositImpl.java b/framework/src/main/java/org/tron/common/storage/DepositImpl.java
@@ -13,6 +13,7 @@
 import org.tron.common.utils.ByteUtil;
 import org.tron.common.utils.Commons;
 import org.tron.common.utils.Hash;
+import org.tron.common.utils.StorageUtils;
 import org.tron.common.utils.StringUtil;
 import org.tron.core.capsule.AccountCapsule;
 import org.tron.core.capsule.AssetIssueCapsule;
@@ -338,7 +339,7 @@ public synchronized Storage getStorage(byte[] address) {
     Storage storage;
     if (this.parent != null) {
       Storage parentStorage = parent.getStorage(address);
-      if (VMConfig.getEnergyLimitHardFork()) {
+      if (StorageUtils.getEnergyLimitHardFork()) {
         // deep copy
         storage = new Storage(parentStorage);
       } else {
diff --git a/framework/src/main/java/org/tron/core/config/DefaultConfig.java b/framework/src/main/java/org/tron/core/config/DefaultConfig.java
@@ -8,6 +8,7 @@
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.tron.common.utils.StorageUtils;
 import org.tron.core.config.args.Args;
 import org.tron.core.db.RevokingDatabase;
 import org.tron.core.db.RevokingStore;
@@ -46,7 +47,7 @@ public RevokingDatabase revokingDatabase() {
         revokingDatabase = RevokingStore.getInstance();
       } else if (dbVersion == 2) {
         revokingDatabase = new SnapshotManager(
-            Args.getInstance().getOutputDirectoryByDbName("block"));
+            StorageUtils.getOutputDirectoryByDbName("block"));
       } else {
         throw new RuntimeException("db version is error.");
       }
diff --git a/framework/src/main/java/org/tron/core/config/args/Args.java b/framework/src/main/java/org/tron/core/config/args/Args.java
@@ -1092,20 +1092,6 @@ public void setFullNodeAllowShieldedTransaction(boolean fullNodeAllowShieldedTra
     DBConfig.setFullNodeAllowShieldedTransaction(fullNodeAllowShieldedTransaction);
   }
 
-  /**
-   * Get storage path by name of database
-   *
-   * @param dbName name of database
-   * @return path of that database
-   */
-  public String getOutputDirectoryByDbName(String dbName) {
-    String path = storage.getPathByDbName(dbName);
-    if (!StringUtils.isBlank(path)) {
-      return path;
-    }
-    return getOutputDirectory();
-  }
-
   /**
    * get output directory.
    */
diff --git a/framework/src/main/java/org/tron/core/config/args/Storage.java b/framework/src/main/java/org/tron/core/config/args/Storage.java
@@ -27,6 +27,7 @@
 import org.iq80.leveldb.Options;
 import org.tron.common.utils.FileUtil;
 import org.tron.common.utils.Property;
+import org.tron.common.utils.StorageUtils;
 
 /**
  * Custom storage configurations
@@ -36,7 +37,7 @@
  * @since 2018/5/25
  */
 
-public class Storage {
+public class Storage extends StorageUtils {
 
   /**
    * Keys (names) of database config
@@ -74,18 +75,6 @@ public class Storage {
   private static final String DEFAULT_INDEX_DIRECTORY = "index";
   private static final String DEFAULT_INDEX_SWTICH = "on";
 
-  /**
-   * Default values of db options: <p> DEFAULT_COMPRESSION_TYPE: compressed with snappy
-   * DEFAULT_BLOCK_SIZE:         4 KB =         4 * 1024 B DEFAULT_WRITE_BUFFER_SIZE: 10 MB = 10 *
-   * 1024 * 1024 B DEFAULT_CACHE_SIZE:        10 MB = 10 * 1024 * 1024 B DEFAULT_MAX_OPEN_FILES:
-   * 100
-   */
-  private static final CompressionType DEFAULT_COMPRESSION_TYPE = CompressionType.SNAPPY;
-  private static final int DEFAULT_BLOCK_SIZE = 4 * 1024;
-  private static final int DEFAULT_WRITE_BUFFER_SIZE = 10 * 1024 * 1024;
-  private static final long DEFAULT_CACHE_SIZE = 10 * 1024 * 1024L;
-  private static final int DEFAULT_MAX_OPEN_FILES = 100;
-
   /**
    * Database storage directory: /path/to/{dbDirectory}
    */
@@ -296,22 +285,6 @@ private static Property createProperty(final ConfigObject conf) {
     return property;
   }
 
-  private static Options createDefaultDbOptions() {
-    Options dbOptions = new Options();
-
-    dbOptions.createIfMissing(true);
-    dbOptions.paranoidChecks(true);
-    dbOptions.verifyChecksums(true);
-
-    dbOptions.compressionType(DEFAULT_COMPRESSION_TYPE);
-    dbOptions.blockSize(DEFAULT_BLOCK_SIZE);
-    dbOptions.writeBufferSize(DEFAULT_WRITE_BUFFER_SIZE);
-    dbOptions.cacheSize(DEFAULT_CACHE_SIZE);
-    dbOptions.maxOpenFiles(DEFAULT_MAX_OPEN_FILES);
-
-    return dbOptions;
-  }
-
   /**
    * Set propertyMap of Storage object from Config
    *
@@ -325,32 +298,6 @@ public void setPropertyMapFromConfig(final Config config) {
     }
   }
 
-  /**
-   * Get storage path by name of database
-   *
-   * @param dbName name of database
-   * @return path of that database
-   */
-  public String getPathByDbName(String dbName) {
-    if (hasProperty(dbName)) {
-      return getProperty(dbName).getPath();
-    }
-    return null;
-  }
-
-  /**
-   * Get database options by name of database
-   *
-   * @param dbName name of database
-   * @return options of that database
-   */
-  public Options getOptionsByDbName(String dbName) {
-    if (hasProperty(dbName)) {
-      return getProperty(dbName).getDbOptions();
-    }
-    return createDefaultDbOptions();
-  }
-
   /**
    * Only for unit test on db
    */

Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,6 @@ public static void initAllowTvmSolidity059(long allow) {`
`94`	`94`	`ALLOW_TVM_SOLIDITY_059 = allow == 1;`
`95`	`95`	`}`
`96`	`96`
`97`		`- public static boolean getEnergyLimitHardFork() {`
`98`		`- return ENERGY_LIMIT_HARD_FORK;`
`99`		`- }`
`100`		`-`
`101`	`97`	`public static boolean allowTvmTransferTrc10() {`
`102`	`98`	`return ALLOW_TVM_TRANSFER_TRC10;`
`103`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public static Options getOptionsByDbName(String dbName) {`
`59`	`59`	`return createDefaultDbOptions();`
`60`	`60`	`}`
`61`	`61`
`62`		`- private static Options createDefaultDbOptions() {`
	`62`	`+ protected static Options createDefaultDbOptions() {`
`63`	`63`	`Options dbOptions = new Options();`
`64`	`64`
`65`	`65`	`dbOptions.createIfMissing(true);`