Merge pull request #43 from p2p-org/check-actual-upstreams-before-call

check all actual upstreams before call

src/main/kotlin/io/emeraldpay/dshackle/rpc/NativeCall.kt

@@ -166,7 +166,8 @@ open class NativeCall(
         }
 
         val matcher = Selector.convertToMatcher(request.selector)
-        if (!configuredUpstreams.hasMatchingUpstream(chain, matcher)) {
+
+        if (!multistreamHolder.getUpstream(chain).hasMatchingUpstream(matcher)) {
             if (Global.metricsExtended) {
                 Metrics.globalRegistry
                     .counter("no_matching_upstream", "chain", chain.chainCode, "matcher", matcher.describeInternal())
@@ -176,7 +177,6 @@ open class NativeCall(
         }
 
         val upstream = multistreamHolder.getUpstream(chain)
-            ?: return Flux.error(CallFailure(0, SilentException.UnsupportedBlockchain(chain)))
 
         return prepareCall(request, upstream)
     }

src/main/kotlin/io/emeraldpay/dshackle/startup/ConfiguredUpstreams.kt

@@ -117,11 +117,6 @@ open class ConfiguredUpstreams(
         }
     }
 
-    fun hasMatchingUpstream(chain: Chain, matcher: Selector.LabelSelectorMatcher): Boolean =
-        config.upstreams.any { up ->
-            (up.chain?.let { Global.chainById(it) == chain } ?: true) && matcher.matches(up.labels)
-        }
-
     private fun buildDefaultOptions(config: UpstreamsConfig): HashMap<Chain, UpstreamsConfig.Options> {
         val defaultOptions = HashMap<Chain, UpstreamsConfig.Options>()
         config.defaultOptions.forEach { defaultsConfig ->

src/main/kotlin/io/emeraldpay/dshackle/upstream/CurrentMultistreamHolder.kt

@@ -30,8 +30,8 @@ open class CurrentMultistreamHolder(
 
     private val chainMapping = multistreams.associateBy { it.chain }
 
-    override fun getUpstream(chain: Chain): Multistream? {
+    override fun getUpstream(chain: Chain): Multistream {
-        return chainMapping[chain]
+        return chainMapping.getValue(chain)
     }
 
     override fun getAvailable(): List<Chain> {

src/main/kotlin/io/emeraldpay/dshackle/upstream/Multistream.kt

@@ -352,6 +352,10 @@ abstract class Multistream(
     fun haveUpstreams(): Boolean =
         upstreams.isNotEmpty()
 
+    fun hasMatchingUpstream(matcher: Selector.LabelSelectorMatcher): Boolean {
+        return upstreams.any { matcher.matches(it) }
+    }
+
     // --------------------------------------------------------------------------------------------------------
 
     class UpstreamStatus(val upstream: Upstream, val status: UpstreamAvailability, val ts: Instant = Instant.now())

src/main/kotlin/io/emeraldpay/dshackle/upstream/MultistreamHolder.kt

@@ -22,7 +22,7 @@ import io.emeraldpay.dshackle.Chain
  * Holds Multistreams configured for a chain.
  */
 interface MultistreamHolder {
-    fun getUpstream(chain: Chain): Multistream?
+    fun getUpstream(chain: Chain): Multistream
     fun getAvailable(): List<Chain>
     fun isAvailable(chain: Chain): Boolean
 }