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

problem: service may miss available chain if initialized after

Browse Source
This commit is contained in:
Igor Artamonov
2019-08-09 23:27:03 -04:00
parent 7205a33ff3
commit 5660f4ca09
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/kotlin/io/emeraldpay/dshackle/upstream/AvailableChains.kt
View File

@@ -19,12 +19,18 @@ class AvailableChains(
private val callTargets = HashMap<Chain, EthereumTargets>() private val callTargets = HashMap<Chain, EthereumTargets>()
fun add(chain: Chain) { fun add(chain: Chain) {
if (all.contains(chain)) {
return
}
all.add(chain) all.add(chain)
bus.onNext(chain) bus.onNext(chain)
} }
fun observe(): Flux<Chain> { fun observe(): Flux<Chain> {
return Flux.from(bus) return Flux.merge(
Flux.fromIterable(all),
Flux.from(bus)
)
} }
fun supports(chain: Chain): Boolean { fun supports(chain: Chain): Boolean {

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

@@ -159,9 +159,9 @@ open class ConfiguredUpstreams(
override fun getOrCreateUpstream(chain: Chain): ChainUpstreams { override fun getOrCreateUpstream(chain: Chain): ChainUpstreams {
val current = chainMapping[chain] val current = chainMapping[chain]
if (current == null) { if (current == null) {
availableChains.add(chain)
val created = ChainUpstreams(chain, ArrayList<Upstream>(), availableChains.targetFor(chain)) val created = ChainUpstreams(chain, ArrayList<Upstream>(), availableChains.targetFor(chain))
chainMapping[chain] = created chainMapping[chain] = created
availableChains.add(chain)
return created return created
} }
return current return current