Skip to content

Commit b129246

Browse files
author
vividcoder
committed
refactor(config): restructure Args init flow and WitnessInitializer
- Restructure Args.setParam into 4-step flow: parse CLI, apply config, apply CLI overrides, init witnesses - Rename setParam(Config) to applyConfigParams, setCLIParameter to applyCLIParams for clarity - Extract WitnessInitializer into 3 static methods (initFromCLIPrivateKey, initFromCFGPrivateKey, initFromKeystore) with routing in Args - Remove password/privateKey/witnessAddress/help/version/configFilePath from CommonParameter — pass as method params instead of global state - Move JDK version check from Args to FullNode entry point - Extract Configuration.getByFileName for single-param config loading
1 parent b6939fd commit b129246

File tree

14 files changed

+456
-521
lines changed

14 files changed

+456
-521
lines changed

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

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,20 @@
2323

2424
public class CommonParameter {
2525

26-
public static final String IGNORE_WRONG_WITNESS_ADDRESS_FORMAT =
27-
"The localWitnessAccountAddress format is incorrect,"
28-
+ " ignored";
29-
3026
protected static CommonParameter PARAMETER = new CommonParameter();
3127

28+
// Runtime chain state: set by VMConfig.initVmHardFork()
29+
// when the energy-limit governance proposal is activated.
30+
// Legacy: should belong to VMConfig, not here.
3231
@Setter
3332
public static boolean ENERGY_LIMIT_HARD_FORK = false;
3433

35-
// ── Config / path ────────────────────────────────
36-
@Getter
37-
public String configFilePath = "";
34+
// ── Startup parameters ─────────────────────────
3835
@Getter
3936
public String outputDirectory = "output-directory";
4037
@Getter
4138
public String logbackPath = "";
42-
43-
// ── CLI-only flags ───────────────────────────────
44-
@Getter
45-
public boolean help = false;
39+
// ── Flags (CLI + Config) ─────────────────────────
4640
@Getter
4741
@Setter
4842
public boolean witness = false;
@@ -81,9 +75,6 @@ public class CommonParameter {
8175
public int maxHttpConnectNumber = 50;
8276
@Getter
8377
public List<String> seedNodes = new ArrayList<>();
84-
public String privateKey = "";
85-
public String witnessAddress = "";
86-
public String password;
8778
public String storageDbDirectory = "";
8879
public String storageDbEngine = "";
8980
public String storageDbSynchronous = "";
@@ -93,7 +84,6 @@ public class CommonParameter {
9384
public String storageTransactionHistorySwitch = "";
9485
@Getter
9586
public boolean fastForward = false;
96-
9787
// ── Network / P2P ───────────────────────────────
9888
@Getter
9989
@Setter
@@ -362,7 +352,8 @@ public class CommonParameter {
362352
@Getter
363353
@Setter
364354
public long trxExpirationTimeInMilliseconds;
365-
public boolean version;
355+
356+
// ── Shielded / ZK ────────────────────────────────
366357
@Getter
367358
@Setter
368359
public String zenTokenId; // clearParam: "000000"

common/src/main/java/org/tron/core/config/Configuration.java

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package org.tron.core.config;
2020

2121
import static org.apache.commons.lang3.StringUtils.isBlank;
22-
import static org.apache.commons.lang3.StringUtils.isNoneBlank;
2322

2423
import com.typesafe.config.ConfigFactory;
2524
import java.io.File;
@@ -36,21 +35,15 @@ public class Configuration {
3635
* @param confFileName path to configuration file
3736
* @return loaded configuration
3837
*/
39-
public static com.typesafe.config.Config getByFileName(final String shellConfFileName,
38+
public static com.typesafe.config.Config getByFileName(
4039
final String confFileName) {
41-
if (isNoneBlank(shellConfFileName)) {
42-
File shellConfFile = new File(shellConfFileName);
43-
resolveConfigFile(shellConfFileName, shellConfFile);
44-
return config;
45-
}
46-
4740
if (isBlank(confFileName)) {
48-
throw new IllegalArgumentException("Configuration path is required!");
49-
} else {
50-
File confFile = new File(confFileName);
51-
resolveConfigFile(confFileName, confFile);
52-
return config;
41+
throw new IllegalArgumentException(
42+
"Configuration path is required!");
5343
}
44+
File confFile = new File(confFileName);
45+
resolveConfigFile(confFileName, confFile);
46+
return config;
5447
}
5548

5649
private static void resolveConfigFile(String fileName, File confFile) {

0 commit comments

Comments
 (0)