From 06930b63f70207cb713cf7ec39de2f74f2532950 Mon Sep 17 00:00:00 2001
From: Igor Artamonov <igor@artamonov.ru>
Date: Mon, 31 Aug 2020 19:26:31 -0400
Subject: [PATCH] problem: broken head subsription for bitcoin

---
 src/main/kotlin/io/emeraldpay/dshackle/rpc/StreamHead.kt | 9 +--------
 .../io/emeraldpay/dshackle/upstream/AbstractHead.kt      | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/rpc/StreamHead.kt b/src/main/kotlin/io/emeraldpay/dshackle/rpc/StreamHead.kt
index 620efcb25..7905b3ddd 100644
--- a/src/main/kotlin/io/emeraldpay/dshackle/rpc/StreamHead.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/rpc/StreamHead.kt
@@ -46,19 +46,12 @@ class StreamHead(
                     .getFlux()
                     .map { asProto(chain, it!!) }
                     .onErrorContinue { t, _ ->
-                        log.warn("Head error: ${t.message}")
+                        log.warn("Head subscription error: ${t.message}")
                     }
         }
     }
 
     fun asProto(chain: Chain, block: BlockContainer): BlockchainOuterClass.ChainHead {
-        if (BlockchainType.fromBlockchain(chain) == BlockchainType.ETHEREUM) {
-            return asEthereumProto(chain, block)
-        }
-        throw IllegalArgumentException("Unsupported blockchain ${chain}")
-    }
-
-    fun asEthereumProto(chain: Chain, block: BlockContainer): BlockchainOuterClass.ChainHead {
         return BlockchainOuterClass.ChainHead.newBuilder()
                 .setChainValue(chain.id)
                 .setHeight(block.height)
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/AbstractHead.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/AbstractHead.kt
index 368ddff4d..d5dc1f7ae 100644
--- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/AbstractHead.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/AbstractHead.kt
@@ -78,7 +78,7 @@ abstract class AbstractHead : Head {
     }
 
     override fun getFlux(): Flux<BlockContainer> {
-        return Flux.merge(
+        return Flux.concat(
                 Mono.justOrEmpty(head.get()),
                 Flux.from(stream)
         ).onBackpressureLatest()