fix(config): address PR review feedback

- DynamicArgs: parse NodeConfig once in reload(), pass to both methods
- Storage: remove 12 unused getXxxFromConfig static methods
- reference.conf: fix influxdb database default to "metrics"

Author: vividctrlalt

common/src/main/java/org/tron/core/config/args/Storage.java

@@ -25,7 +25,6 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.iq80.leveldb.CompressionType;
 import org.iq80.leveldb.Options;
 import org.tron.common.cache.CacheStrategies;
@@ -124,78 +123,6 @@ public class Storage {
   // db root
   private final Map<String, Sha256Hash> dbRoots = Maps.newConcurrentMap();
 
-  /**
-   * All getXxxFromConfig methods now read from StorageConfig bean instead of
-   * manual string constants. Signatures preserved for backward compatibility.
-   */
-
-  public static String getDbEngineFromConfig(final Config config) {
-    return StorageConfig.fromConfig(config).getDb().getEngine();
-  }
-
-  public static Boolean getDbVersionSyncFromConfig(final Config config) {
-    return StorageConfig.fromConfig(config).getDb().isSync();
-  }
-
-  public static int getSnapshotMaxFlushCountFromConfig(final Config config) {
-    int maxFlushCountConfig = StorageConfig.fromConfig(config)
-        .getSnapshot().getMaxFlushCount();
-    if (maxFlushCountConfig <= 0) {
-      throw new IllegalArgumentException("MaxFlushCount value can not be negative or zero!");
-    }
-    if (maxFlushCountConfig > 500) {
-      throw new IllegalArgumentException("MaxFlushCount value must not exceed 500!");
-    }
-    return maxFlushCountConfig;
-  }
-
-  public static Boolean getContractParseSwitchFromConfig(final Config config) {
-    // contractParse is under event.subscribe, not storage — read from EventConfig
-    EventConfig ec = EventConfig.fromConfig(config);
-    return ec.isContractParse();
-  }
-
-  public static String getDbDirectoryFromConfig(final Config config) {
-    return StorageConfig.fromConfig(config).getDb().getDirectory();
-  }
-
-  public static String getIndexDirectoryFromConfig(final Config config) {
-    return StorageConfig.fromConfig(config).getIndex().getDirectory();
-  }
-
-  public static String getIndexSwitchFromConfig(final Config config) {
-    String val = StorageConfig.fromConfig(config).getIndex().getSwitch();
-    return StringUtils.isNotEmpty(val) ? val : DEFAULT_INDEX_SWITCH;
-  }
-
-  public static String getTransactionHistorySwitchFromConfig(final Config config) {
-    return StorageConfig.fromConfig(config).getTransHistory().getSwitch();
-  }
-
-  public static int getCheckpointVersionFromConfig(final Config config) {
-    return StorageConfig.fromConfig(config).getCheckpoint().getVersion();
-  }
-
-  public static boolean getCheckpointSyncFromConfig(final Config config) {
-    return StorageConfig.fromConfig(config).getCheckpoint().isSync();
-  }
-
-  public static int getEstimatedTransactionsFromConfig(final Config config) {
-    int estimatedTransactions = StorageConfig.fromConfig(config)
-        .getTxCache().getEstimatedTransactions();
-    if (estimatedTransactions > 10000) {
-      estimatedTransactions = 10000;
-    } else if (estimatedTransactions < 100) {
-      estimatedTransactions = 100;
-    }
-    return estimatedTransactions;
-  }
-
-  public static boolean getTxCacheInitOptimizationFromConfig(final Config config) {
-    return StorageConfig.fromConfig(config).getTxCache().isInitOptimization();
-  }
-
-
   /**
    * Accepts raw storage Config sub-tree because cache.strategies has dynamic keys
    * (CacheType enum names) that ConfigBeanFactory cannot bind to fixed bean fields.

common/src/main/resources/reference.conf

@@ -182,7 +182,7 @@ node.metrics = {
   influxdb {
     ip = ""
     port = 8086
-    database = ""
+    database = "metrics"
     metricsReportInterval = 10
   }
 }

framework/src/main/java/org/tron/core/config/args/DynamicArgs.java

@@ -61,14 +61,14 @@ public void run() {
   public void reload() {
     logger.debug("Reloading ... ");
     Config config = Configuration.getByFileName(Args.getConfigFilePath());
+    NodeConfig nodeConfig = NodeConfig.fromConfig(config);
 
-    updateActiveNodes(config);
+    updateActiveNodes(nodeConfig);
 
-    updateTrustNodes(config);
+    updateTrustNodes(nodeConfig);
   }
 
-  private void updateActiveNodes(Config config) {
-    NodeConfig nodeConfig = NodeConfig.fromConfig(config);
+  private void updateActiveNodes(NodeConfig nodeConfig) {
     List<InetSocketAddress> newActiveNodes =
         Args.filterInetSocketAddress(nodeConfig.getActive(), true);
     parameter.setActiveNodes(newActiveNodes);
@@ -79,8 +79,7 @@ private void updateActiveNodes(Config config) {
         TronNetService.getP2pConfig().getActiveNodes().toString());
   }
 
-  private void updateTrustNodes(Config config) {
-    NodeConfig nodeConfig = NodeConfig.fromConfig(config);
+  private void updateTrustNodes(NodeConfig nodeConfig) {
     List<InetAddress> newPassiveNodes = new java.util.ArrayList<>();
     for (InetSocketAddress sa : Args.filterInetSocketAddress(nodeConfig.getPassive(), false)) {
       newPassiveNodes.add(sa.getAddress());