StakeSquid/dshackle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

problem: broken head subsription for bitcoin

Browse Source
This commit is contained in:
Igor Artamonov
2020-08-31 19:26:31 -04:00
parent b7de4f0490
commit 813f2ae4a2
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/kotlin/io/emeraldpay/dshackle/rpc/StreamHead.kt
View File

@@ -46,19 +46,12 @@ class StreamHead(
.getFlux() .getFlux()
.map { asProto(chain, it!!) } .map { asProto(chain, it!!) }
.onErrorContinue { t, _ -> .onErrorContinue { t, _ ->
log.warn("Head error: ${t.message}") log.warn("Head subscription error: ${t.message}")
} }
} }
} }
fun asProto(chain: Chain, block: BlockContainer): BlockchainOuterClass.ChainHead { 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() return BlockchainOuterClass.ChainHead.newBuilder()
.setChainValue(chain.id) .setChainValue(chain.id)
.setHeight(block.height) .setHeight(block.height)

2
src/main/kotlin/io/emeraldpay/dshackle/upstream/AbstractHead.kt
View File

@@ -78,7 +78,7 @@ abstract class AbstractHead : Head {
} }
override fun getFlux(): Flux<BlockContainer> { override fun getFlux(): Flux<BlockContainer> {
return Flux.merge( return Flux.concat(
Mono.justOrEmpty(head.get()), Mono.justOrEmpty(head.get()),
Flux.from(stream) Flux.from(stream)
).onBackpressureLatest() ).onBackpressureLatest()