Skip to content

Commit 86b1bdd

Browse files
committed
refactor(config): expose all config beans as static singletons
Add GenesisConfig, MiscConfig, RateLimiterConfig, MetricsConfig, EventConfig to static singleton fields on Args, completing the set. All 10 config beans are now accessible via Args.getXxxConfig().
1 parent ad0dd57 commit 86b1bdd

1 file changed

Lines changed: 21 additions & 6 deletions

File tree

  • framework/src/main/java/org/tron/core/config/args

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

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,16 @@ public class Args extends CommonParameter {
133133
private static CommitteeConfig committeeConfig;
134134
@Getter
135135
private static StorageConfig storageConfig;
136+
@Getter
137+
private static GenesisConfig genesisConfig;
138+
@Getter
139+
private static MiscConfig miscConfig;
140+
@Getter
141+
private static RateLimiterConfig rateLimiterConfig;
142+
@Getter
143+
private static MetricsConfig metricsConfig;
144+
@Getter
145+
private static EventConfig eventConfig;
136146

137147
@Getter
138148
@Setter
@@ -759,7 +769,7 @@ public static void applyConfigParams(
759769
// is arguably misplaced, but preserved for backward compatibility
760770

761771
// Genesis config: bind from config.conf "genesis.block" section
762-
GenesisConfig genesisConfig = GenesisConfig.fromConfig(config);
772+
genesisConfig = GenesisConfig.fromConfig(config);
763773
applyGenesisConfig(genesisConfig, config);
764774

765775
// Block config: bind from config.conf "block" section
@@ -769,7 +779,7 @@ public static void applyConfigParams(
769779
// node discovery, legacy fallback, p2p, dns — all handled in applyNodeConfig
770780

771781
// Misc config: storage, trx, energy — small domains, read via beans
772-
MiscConfig miscConfig = MiscConfig.fromConfig(config);
782+
miscConfig = MiscConfig.fromConfig(config);
773783
applyMiscConfig(miscConfig);
774784

775785
// vm, committee already handled above
@@ -781,24 +791,24 @@ public static void applyConfigParams(
781791
// shielded transaction API, active/passive/fastForward — handled in applyNodeConfig
782792

783793
// Rate limiter config: bind from config.conf "rate.limiter" section
784-
RateLimiterConfig rlConfig = RateLimiterConfig.fromConfig(config);
785-
applyRateLimiterConfig(rlConfig, config);
794+
rateLimiterConfig = RateLimiterConfig.fromConfig(config);
795+
applyRateLimiterConfig(rateLimiterConfig, config);
786796

787797
// Node backup: from NodeConfig bean
788798
applyNodeBackupConfig(nodeConfig);
789799

790800
// actuatorSet already set in applyMiscConfig
791801

792802
// Metrics config: bind from config.conf "node.metrics" section
793-
MetricsConfig metricsConfig = MetricsConfig.fromConfig(config);
803+
metricsConfig = MetricsConfig.fromConfig(config);
794804
applyMetricsConfig(metricsConfig);
795805

796806
// historyBalanceLookup already handled by MiscConfig above
797807

798808
// node.shutdown — handled in applyNodeConfig
799809

800810
// Event config: bind from config.conf "event.subscribe" section
801-
EventConfig eventConfig = EventConfig.fromConfig(config);
811+
eventConfig = EventConfig.fromConfig(config);
802812
applyEventConfig(eventConfig);
803813

804814
logConfig();
@@ -989,6 +999,11 @@ public static void clearParam() {
989999
blockConfig = null;
9901000
committeeConfig = null;
9911001
storageConfig = null;
1002+
genesisConfig = null;
1003+
miscConfig = null;
1004+
rateLimiterConfig = null;
1005+
metricsConfig = null;
1006+
eventConfig = null;
9921007
}
9931008

9941009
// getProposalExpirationTime removed — logic moved to BlockConfig.fromConfig()

0 commit comments

Comments
 (0)