Merge pull request #32 from p2p-org/fix_upstream_chain_matcher

fix chain matcher
2022-10-18 19:33:42 +03:00
parent 50e8b05fbe 30f1c37901
commit 032caabf16
1 changed files with 1 additions and 1 deletions
--- 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<Chain, UpstreamsConfig.Options> {