Skip to content

refactor(config): simplify applyEventConfig (follow-up to #6615) #6735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kuny0707 merged 2 commits into from
May 8, 2026
+114 −64
Merged

refactor(config): simplify applyEventConfig (follow-up to #6615) #6735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb918c7
refactor(config): simplify applyEventConfig to gate on isEnable()
vividctrlalt Apr 30, 2026
8efceea
Merge branch 'develop' into refactor/apply-event-config-cleanup
Sunny6889 May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 66 additions & 64 deletions framework/src/main/java/org/tron/core/config/args/Args.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,82 +376,84 @@ private static void applyEventConfig(EventConfig ec) {
// contractParse belongs to event.subscribe but Storage object holds it
PARAMETER.storage.setContractParseSwitch(ec.isContractParse());

// PARAMETER.eventPluginConfig and PARAMETER.eventFilter are only consumed by
// Manager.startEventSubscribing(), which itself is gated by isEventSubscribe()
// (= ec.isEnable()) at Manager.java:564. When subscribe is disabled, building
// these objects has no observable effect — skip both early so PARAMETER stays
// consistent with the runtime intent.
if (!ec.isEnable()) {
return;
}

// Build EventPluginConfig from EventConfig bean
// If event.subscribe was configured, bean will have non-default values
if (ec.isEnable() || ec.getVersion() != 0 || !ec.getTopics().isEmpty()
|| StringUtils.isNotEmpty(ec.getPath()) || StringUtils.isNotEmpty(ec.getServer())) {
EventPluginConfig epc = new EventPluginConfig();
epc.setVersion(ec.getVersion());
epc.setStartSyncBlockNum(ec.getStartSyncBlockNum());

// native queue
EventConfig.NativeConfig nq = ec.getNativeQueue();
epc.setUseNativeQueue(nq.isUseNativeQueue());
epc.setBindPort(nq.getBindport());
epc.setSendQueueLength(nq.getSendqueuelength());

if (!nq.isUseNativeQueue()) {
if (StringUtils.isNotEmpty(ec.getPath())) {
epc.setPluginPath(ec.getPath().trim());
}
if (StringUtils.isNotEmpty(ec.getServer())) {
epc.setServerAddress(ec.getServer().trim());
}
if (StringUtils.isNotEmpty(ec.getDbconfig())) {
epc.setDbConfig(ec.getDbconfig().trim());
}
EventPluginConfig epc = new EventPluginConfig();
epc.setVersion(ec.getVersion());
epc.setStartSyncBlockNum(ec.getStartSyncBlockNum());

// native queue
EventConfig.NativeConfig nq = ec.getNativeQueue();
epc.setUseNativeQueue(nq.isUseNativeQueue());
epc.setBindPort(nq.getBindport());
epc.setSendQueueLength(nq.getSendqueuelength());

if (!nq.isUseNativeQueue()) {
if (StringUtils.isNotEmpty(ec.getPath())) {
epc.setPluginPath(ec.getPath().trim());
}

// topics
List<TriggerConfig> triggerConfigs = new ArrayList<>();
for (EventConfig.TopicConfig tc : ec.getTopics()) {
TriggerConfig trig = new TriggerConfig();
trig.setTriggerName(tc.getTriggerName());
trig.setEnabled(tc.isEnable());
trig.setTopic(tc.getTopic());
trig.setSolidified(tc.isSolidified());
trig.setEthCompatible(tc.isEthCompatible());
trig.setRedundancy(tc.isRedundancy());
triggerConfigs.add(trig);
if (StringUtils.isNotEmpty(ec.getServer())) {
epc.setServerAddress(ec.getServer().trim());
}
if (StringUtils.isNotEmpty(ec.getDbconfig())) {
epc.setDbConfig(ec.getDbconfig().trim());
}
epc.setTriggerConfigList(triggerConfigs);
}

PARAMETER.eventPluginConfig = epc;
// topics
List<TriggerConfig> triggerConfigs = new ArrayList<>();
for (EventConfig.TopicConfig tc : ec.getTopics()) {
TriggerConfig trig = new TriggerConfig();
trig.setTriggerName(tc.getTriggerName());
trig.setEnabled(tc.isEnable());
trig.setTopic(tc.getTopic());
trig.setSolidified(tc.isSolidified());
trig.setEthCompatible(tc.isEthCompatible());
trig.setRedundancy(tc.isRedundancy());
triggerConfigs.add(trig);
}
epc.setTriggerConfigList(triggerConfigs);

PARAMETER.eventPluginConfig = epc;

// Build FilterQuery from EventConfig.FilterConfig bean
EventConfig.FilterConfig fc = ec.getFilter();
if (StringUtils.isNotEmpty(fc.getFromblock()) || StringUtils.isNotEmpty(fc.getToblock())
|| !fc.getContractAddress().isEmpty()) {
FilterQuery filter = new FilterQuery();
FilterQuery filter = new FilterQuery();

try {
filter.setFromBlock(FilterQuery.parseFromBlockNumber(fc.getFromblock().trim()));
} catch (Exception e) {
logger.error("invalid filter: fromBlockNumber: {}", fc.getFromblock(), e);
PARAMETER.eventFilter = null;
return;
}
try {
filter.setFromBlock(FilterQuery.parseFromBlockNumber(fc.getFromblock().trim()));
} catch (Exception e) {
logger.error("invalid filter: fromBlockNumber: {}", fc.getFromblock(), e);
PARAMETER.eventFilter = null;
return;
}

try {
filter.setToBlock(FilterQuery.parseToBlockNumber(fc.getToblock().trim()));
} catch (Exception e) {
logger.error("invalid filter: toBlockNumber: {}", fc.getToblock(), e);
PARAMETER.eventFilter = null;
return;
}
try {
filter.setToBlock(FilterQuery.parseToBlockNumber(fc.getToblock().trim()));
} catch (Exception e) {
logger.error("invalid filter: toBlockNumber: {}", fc.getToblock(), e);
PARAMETER.eventFilter = null;
return;
}

filter.setContractAddressList(
fc.getContractAddress().stream()
.filter(StringUtils::isNotEmpty)
.collect(Collectors.toList()));
filter.setContractTopicList(
fc.getContractTopic().stream()
.filter(StringUtils::isNotEmpty)
.collect(Collectors.toList()));
filter.setContractAddressList(
fc.getContractAddress().stream()
.filter(StringUtils::isNotEmpty)
.collect(Collectors.toList()));
filter.setContractTopicList(
fc.getContractTopic().stream()
.filter(StringUtils::isNotEmpty)
.collect(Collectors.toList()));

PARAMETER.eventFilter = filter;
}
PARAMETER.eventFilter = filter;
}

/**
Expand Down
48 changes: 48 additions & 0 deletions framework/src/test/java/org/tron/core/config/args/ArgsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,54 @@ public void testFetchBlockTimeoutInRangeUnchanged() {
Args.clearParam();
}

// ===========================================================================
// event.subscribe gating: PARAMETER.eventPluginConfig and PARAMETER.eventFilter
// are only consumed by Manager.startEventSubscribing(), which is gated by
// isEventSubscribe() (= ec.isEnable()). When subscribe is disabled, these
// objects must not be built — building them would be dead state.
// ===========================================================================

@Test
public void testEventConfigDisabledSkipsEpcAndFilter() {
Map<String, String> override = new HashMap<>();
override.put("storage.db.directory", "database");
override.put("event.subscribe.enable", "false");
Config config = ConfigFactory.parseMap(override)
.withFallback(ConfigFactory.defaultReference());
Args.applyConfigParams(config);
Assert.assertNull(Args.getInstance().getEventPluginConfig());
Assert.assertNull(Args.getInstance().getEventFilter());
Args.clearParam();
}

@Test
public void testEventConfigEnabledBuildsEpcAndFilter() {
Map<String, String> override = new HashMap<>();
override.put("storage.db.directory", "database");
override.put("event.subscribe.enable", "true");
Config config = ConfigFactory.parseMap(override)
.withFallback(ConfigFactory.defaultReference());
Args.applyConfigParams(config);
Assert.assertNotNull(Args.getInstance().getEventPluginConfig());
Assert.assertNotNull(Args.getInstance().getEventFilter());
Args.clearParam();
}

@Test
public void testEventConfigEnabledWithInvalidFromBlockLeavesFilterNull() {
Map<String, String> override = new HashMap<>();
override.put("storage.db.directory", "database");
override.put("event.subscribe.enable", "true");
override.put("event.subscribe.filter.fromblock", "not-a-number");
Config config = ConfigFactory.parseMap(override)
.withFallback(ConfigFactory.defaultReference());
Args.applyConfigParams(config);
// epc still built; filter rejected
Assert.assertNotNull(Args.getInstance().getEventPluginConfig());
Assert.assertNull(Args.getInstance().getEventFilter());
Args.clearParam();
}

@Test
public void testAllowShieldedTransactionApiDefault() {
Args.setParam(new String[]{}, TestConstants.TEST_CONF);
Expand Down
Loading