fix test

drpcorg · Jun 11, 2024 · 24f71cf · 24f71cf
1 parent e503d8a
commit 24f71cf
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/generic/GenericUpstreamValidator.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/generic/GenericUpstreamValidator.kt
@@ -8,7 +8,6 @@ import io.emeraldpay.dshackle.upstream.Upstream
 import io.emeraldpay.dshackle.upstream.UpstreamAvailability
 import io.emeraldpay.dshackle.upstream.UpstreamValidator
 import io.emeraldpay.dshackle.upstream.ValidateUpstreamSettingsResult
-import io.emeraldpay.dshackle.upstream.ValidateUpstreamSettingsResult.UPSTREAM_VALID
 import reactor.core.publisher.Mono
 import java.util.concurrent.TimeoutException
 
@@ -49,14 +48,14 @@ class GenericUpstreamValidator(
             startupValidators.map { exec(it, ValidateUpstreamSettingsResult.UPSTREAM_SETTINGS_ERROR) },
         ) { a -> a.map { it as ValidateUpstreamSettingsResult } }
             .map(::resolve)
-            .defaultIfEmpty(ValidateUpstreamSettingsResult.UPSTREAM_FATAL_SETTINGS_ERROR)
+            .defaultIfEmpty(ValidateUpstreamSettingsResult.UPSTREAM_VALID)
             .onErrorResume {
                 log.error("Error during upstream validation for ${upstream.getId()}", it)
                 Mono.just(ValidateUpstreamSettingsResult.UPSTREAM_FATAL_SETTINGS_ERROR)
             }
     }
 
     override fun validateUpstreamSettingsOnStartup(): ValidateUpstreamSettingsResult {
-        return validateUpstreamSettings().block() ?: UPSTREAM_VALID
+        return validateUpstreamSettings().block() ?: ValidateUpstreamSettingsResult.UPSTREAM_VALID
     }
 }