fix(config): write CLI storage params directly to Storage object

applyCLIParams() wrote 7 storage-related values to intermediate fields
on CommonParameter instead of the Storage object that is actually used
at runtime. Since applyConfigParams() runs first, these CLI values were
silently ignored.

- Remove 7 intermediate fields from CommonParameter
- Simplify applyConfigParams() to read directly from config
- Fix applyCLIParams() to write directly to PARAMETER.storage
- Add tests for CLI-overrides-config and config-defaults scenarios

Author: vividcoder

common/src/main/java/org/tron/common/parameter/CommonParameter.java

@@ -76,27 +76,6 @@ public class CommonParameter {
   @Getter
   public List<String> seedNodes = new ArrayList<>();
   @Getter
-  @Setter
-  public String storageDbDirectory = "";
-  @Getter
-  @Setter
-  public String storageDbEngine = "";
-  @Getter
-  @Setter
-  public String storageDbSynchronous = "";
-  @Getter
-  @Setter
-  public String contractParseEnable = "";
-  @Getter
-  @Setter
-  public String storageIndexDirectory = "";
-  @Getter
-  @Setter
-  public String storageIndexSwitch = "";
-  @Getter
-  @Setter
-  public String storageTransactionHistorySwitch = "";
-  @Getter
   public boolean fastForward = false;
   // ── Network / P2P ─────────────────────────────
   @Getter

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

@@ -225,37 +225,14 @@ public static void applyConfigParams(
 
     PARAMETER.storage = new Storage();
 
-    PARAMETER.storage.setDbEngine(Optional.ofNullable(PARAMETER.storageDbEngine)
-        .filter(StringUtils::isNotEmpty)
-        .orElse(Storage.getDbEngineFromConfig(config)));
-
-    PARAMETER.storage.setDbSync(Optional.ofNullable(PARAMETER.storageDbSynchronous)
-        .filter(StringUtils::isNotEmpty)
-        .map(Boolean::valueOf)
-        .orElse(Storage.getDbVersionSyncFromConfig(config)));
-
-    PARAMETER.storage.setContractParseSwitch(Optional.ofNullable(PARAMETER.contractParseEnable)
-        .filter(StringUtils::isNotEmpty)
-        .map(Boolean::valueOf)
-        .orElse(Storage.getContractParseSwitchFromConfig(config)));
-
-    PARAMETER.storage.setDbDirectory(Optional.ofNullable(PARAMETER.storageDbDirectory)
-        .filter(StringUtils::isNotEmpty)
-        .orElse(Storage.getDbDirectoryFromConfig(config)));
-
-    PARAMETER.storage.setIndexDirectory(Optional.ofNullable(PARAMETER.storageIndexDirectory)
-        .filter(StringUtils::isNotEmpty)
-        .orElse(Storage.getIndexDirectoryFromConfig(config)));
-
-    PARAMETER.storage.setIndexSwitch(Optional.ofNullable(PARAMETER.storageIndexSwitch)
-        .filter(StringUtils::isNotEmpty)
-        .orElse(Storage.getIndexSwitchFromConfig(config)));
-
-    PARAMETER.storage
-        .setTransactionHistorySwitch(
-            Optional.ofNullable(PARAMETER.storageTransactionHistorySwitch)
-                .filter(StringUtils::isNotEmpty)
-                .orElse(Storage.getTransactionHistorySwitchFromConfig(config)));
+    PARAMETER.storage.setDbEngine(Storage.getDbEngineFromConfig(config));
+    PARAMETER.storage.setDbSync(Storage.getDbVersionSyncFromConfig(config));
+    PARAMETER.storage.setContractParseSwitch(Storage.getContractParseSwitchFromConfig(config));
+    PARAMETER.storage.setDbDirectory(Storage.getDbDirectoryFromConfig(config));
+    PARAMETER.storage.setIndexDirectory(Storage.getIndexDirectoryFromConfig(config));
+    PARAMETER.storage.setIndexSwitch(Storage.getIndexSwitchFromConfig(config));
+    PARAMETER.storage.setTransactionHistorySwitch(
+        Storage.getTransactionHistorySwitchFromConfig(config));
 
     PARAMETER.storage
         .setCheckpointVersion(Storage.getCheckpointVersionFromConfig(config));
@@ -1057,25 +1034,25 @@ private static void applyCLIParams(CLIParameter cmd, JCommander jc) {
       PARAMETER.maxHttpConnectNumber = cmd.maxHttpConnectNumber;
     }
     if (assigned.containsKey("--storage-db-directory")) {
-      PARAMETER.storageDbDirectory = cmd.storageDbDirectory;
+      PARAMETER.storage.setDbDirectory(cmd.storageDbDirectory);
     }
     if (assigned.containsKey("--storage-db-engine")) {
-      PARAMETER.storageDbEngine = cmd.storageDbEngine;
+      PARAMETER.storage.setDbEngine(cmd.storageDbEngine);
     }
     if (assigned.containsKey("--storage-db-synchronous")) {
-      PARAMETER.storageDbSynchronous = cmd.storageDbSynchronous;
+      PARAMETER.storage.setDbSync(Boolean.valueOf(cmd.storageDbSynchronous));
     }
     if (assigned.containsKey("--contract-parse-enable")) {
-      PARAMETER.contractParseEnable = cmd.contractParseEnable;
+      PARAMETER.storage.setContractParseSwitch(Boolean.valueOf(cmd.contractParseEnable));
     }
     if (assigned.containsKey("--storage-index-directory")) {
-      PARAMETER.storageIndexDirectory = cmd.storageIndexDirectory;
+      PARAMETER.storage.setIndexDirectory(cmd.storageIndexDirectory);
     }
     if (assigned.containsKey("--storage-index-switch")) {
-      PARAMETER.storageIndexSwitch = cmd.storageIndexSwitch;
+      PARAMETER.storage.setIndexSwitch(cmd.storageIndexSwitch);
     }
     if (assigned.containsKey("--storage-transactionHistory-switch")) {
-      PARAMETER.storageTransactionHistorySwitch = cmd.storageTransactionHistorySwitch;
+      PARAMETER.storage.setTransactionHistorySwitch(cmd.storageTransactionHistorySwitch);
     }
     if (assigned.containsKey("--fast-forward")) {
       PARAMETER.fastForward = cmd.fastForward;

framework/src/test/java/org/tron/core/config/args/ArgsTest.java

@@ -282,5 +282,58 @@ public void testInitService() {
 
     Args.clearParam();
   }
+
+  /**
+   * Verify that CLI storage parameters correctly override config file values.
+   *
+   * <p>config-test.conf defines: db.directory = "database", db.engine = "LEVELDB".
+   * When CLI passes different values (e.g. --storage-db-directory cli-db-dir),
+   * the Storage object should reflect the CLI values, not the config file values.
+   *
+   * <p>This ensures the three-layer override chain works:
+   * Storage defaults -> config file -> CLI arguments.
+   */
+  @Test
+  public void testCliOverridesStorageConfig() {
+    Args.setParam(new String[] {
+        "--storage-db-directory", "cli-db-dir",
+        "--storage-db-engine", "ROCKSDB",
+        "--storage-db-synchronous", "true",
+        "--storage-index-directory", "cli-index-dir",
+        "--storage-index-switch", "cli-index-switch",
+        "--storage-transactionHistory-switch", "off",
+        "--contract-parse-enable", "false"
+    }, TestConstants.TEST_CONF);
+
+    CommonParameter parameter = Args.getInstance();
+
+    Assert.assertEquals("cli-db-dir", parameter.getStorage().getDbDirectory());
+    Assert.assertEquals("ROCKSDB", parameter.getStorage().getDbEngine());
+    Assert.assertTrue(parameter.getStorage().isDbSync());
+    Assert.assertEquals("cli-index-dir", parameter.getStorage().getIndexDirectory());
+    Assert.assertEquals("cli-index-switch", parameter.getStorage().getIndexSwitch());
+    Assert.assertEquals("off", parameter.getStorage().getTransactionHistorySwitch());
+    Assert.assertFalse(parameter.getStorage().isContractParseSwitch());
+
+    Args.clearParam();
+  }
+
+  /**
+   * Verify that config file storage values are applied when no CLI override is present.
+   *
+   * <p>config-test.conf defines: db.directory = "database", db.engine = "LEVELDB".
+   * Without any CLI storage arguments, the Storage object should use these config values.
+   */
+  @Test
+  public void testConfigStorageDefaults() {
+    Args.setParam(new String[] {}, TestConstants.TEST_CONF);
+
+    CommonParameter parameter = Args.getInstance();
+
+    Assert.assertEquals("database", parameter.getStorage().getDbDirectory());
+    Assert.assertEquals("LEVELDB", parameter.getStorage().getDbEngine());
+
+    Args.clearParam();
+  }
 }