solution: mark Upstream status right after WS connect/disconnect

src/test/groovy/io/emeraldpay/dshackle/upstream/ethereum/EthereumWsFactoryRealSpec.groovy

@@ -1,6 +1,8 @@
 package io.emeraldpay.dshackle.upstream.ethereum
 
 import io.emeraldpay.dshackle.test.MockWSServer
+import io.emeraldpay.dshackle.upstream.DefaultUpstream
+import io.emeraldpay.dshackle.upstream.UpstreamAvailability
 import io.emeraldpay.dshackle.upstream.rpcclient.JsonRpcRequest
 import reactor.test.StepVerifier
 import spock.lang.Shared
@@ -28,7 +30,7 @@ class EthereumWsFactoryRealSpec extends Specification {
         server = new MockWSServer(port)
         server.start()
         Thread.sleep(SLEEP)
-        conn = new EthereumWsFactory("ws://localhost:${port}".toURI(), "http://localhost:${port}".toURI()).create(null)
+        conn = new EthereumWsFactory("ws://localhost:${port}".toURI(), "http://localhost:${port}".toURI()).create(null, null, null)
     }
 
     def cleanup() {
@@ -91,6 +93,33 @@ class EthereumWsFactoryRealSpec extends Specification {
         act[0].value.contains("\"params\":[\"newHeads\"]")
     }
 
+    def "Gets UNAVAIL status right after disconnect"() {
+        setup:
+        def up = Mock(DefaultUpstream)
+        conn = new EthereumWsFactory("ws://localhost:${port}".toURI(), "http://localhost:${port}".toURI()).create(up, null, null)
+        when:
+        conn.connect()
+        conn.reconnectIntervalSeconds = 10
+        Thread.sleep(SLEEP)
+        server.stop()
+        Thread.sleep(100)
+
+        then:
+        1 * up.setStatus(UpstreamAvailability.UNAVAILABLE)
+    }
+
+    def "Validates after connect"() {
+        setup:
+        def validator = Mock(EthereumUpstreamValidator)
+        conn = new EthereumWsFactory("ws://localhost:${port}".toURI(), "http://localhost:${port}".toURI()).create(null, validator, null)
+        when:
+        conn.connect()
+        Thread.sleep(100)
+
+        then:
+        1 * validator.validate()
+    }
+
     def "Try to connects to server until it's available"() {
         when:
         server.stop()

src/test/groovy/io/emeraldpay/dshackle/upstream/ethereum/EthereumWsFactorySpec.groovy

@@ -53,7 +53,7 @@ class EthereumWsFactorySpec extends Specification {
 
         def apiMock = TestingCommons.api()
         def wsApiMock = apiMock.asWebsocket()
-        def ws = wsf.create()
+        def ws = wsf.create(null, null, null)
 
         apiMock.answerOnce("eth_getBlockByHash", ["0x3ec2ebf5d0ec474d0ac6bc50d2770d8409ad76e119968e7919f85d5ec8915200", false], block)
 
@@ -74,7 +74,7 @@ class EthereumWsFactorySpec extends Specification {
         def wsf = new EthereumWsFactory(new URI("http://localhost"), new URI("http://localhost"))
         def apiMock = TestingCommons.api()
         def wsApiMock = apiMock.asWebsocket()
-        def ws = wsf.create()
+        def ws = wsf.create(null, null, null)
 
         def tx = new TransactionJson().tap {
             hash = TransactionId.from("0x3ec2ebf5d0ec474d0ac6bc50d2770d8409ad76e119968e7919f85d5ec8915200")
@@ -99,7 +99,7 @@ class EthereumWsFactorySpec extends Specification {
         def wsf = new EthereumWsFactory(new URI("http://localhost"), new URI("http://localhost"))
         def apiMock = TestingCommons.api()
         def wsApiMock = apiMock.asWebsocket()
-        def ws = wsf.create()
+        def ws = wsf.create(null, null, null)
 
         apiMock.answerOnce("eth_getTransactionByHash", ["0x3ec2ebf5d0ec474d0ac6bc50d2770d8409ad76e119968e7919f85d5ec8915200"], null)
 
@@ -122,7 +122,7 @@ class EthereumWsFactorySpec extends Specification {
         def wsf = new EthereumWsFactory(new URI("http://localhost"), new URI("http://localhost"))
         def apiMock = TestingCommons.api()
         def wsApiMock = apiMock.asWebsocket()
-        def ws = wsf.create()
+        def ws = wsf.create(null, null, null)
 
         apiMock.answerOnce("eth_getTransactionByHash", ["0x3ec2ebf5d0ec474d0ac6bc50d2770d8409ad76e119968e7919f85d5ec8915200"],
                 new RpcResponseError(RpcResponseError.CODE_METHOD_NOT_EXIST, "test"))