From 30f1c37901b01455068c7bb77b9eb6095b7fef70 Mon Sep 17 00:00:00 2001 From: Maksim Fomenkov Date: Tue, 18 Oct 2022 19:20:05 +0300 Subject: [PATCH] fix chain matcher --- .../io/emeraldpay/dshackle/startup/ConfiguredUpstreams.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/io/emeraldpay/dshackle/startup/ConfiguredUpstreams.kt b/src/main/kotlin/io/emeraldpay/dshackle/startup/ConfiguredUpstreams.kt index 250361d9..e984e91b 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/startup/ConfiguredUpstreams.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/startup/ConfiguredUpstreams.kt @@ -110,7 +110,7 @@ open class ConfiguredUpstreams( fun hasMatchingUpstream(chain: Chain, matcher: Selector.LabelSelectorMatcher): Boolean = config.upstreams.any { up -> - up.chain?.equals(chain.chainName, ignoreCase = true) ?: true && matcher.matches(up.labels) + (up.chain?.let { Global.chainById(it) == chain } ?: true) && matcher.matches(up.labels) } private fun buildDefaultOptions(config: UpstreamsConfig): HashMap {