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

Fix subscription event update (#517)

Browse Source
This commit is contained in:
KirillPamPam
2024-07-03 15:19:29 +04:00
committed by GitHub
parent bd57edf93e
commit 377595f7d1
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -220,7 +220,7 @@ abstract class Multistream(
protected open fun onUpstreamsUpdated() {
val upstreams = getAll()
state.updateState(upstreams, getSubscriptionTopics())
state.updateState(upstreams, getEgressSubscription())
when {
upstreams.size == 1 -> {

5
src/main/kotlin/io/emeraldpay/dshackle/upstream/state/MultistreamState.kt
View File

@@ -4,6 +4,7 @@ import io.emeraldpay.dshackle.Defaults
import io.emeraldpay.dshackle.startup.QuorumForLabels
import io.emeraldpay.dshackle.upstream.Capability
import io.emeraldpay.dshackle.upstream.DefaultUpstream
import io.emeraldpay.dshackle.upstream.EgressSubscription
import io.emeraldpay.dshackle.upstream.Upstream
import io.emeraldpay.dshackle.upstream.UpstreamAvailability
import io.emeraldpay.dshackle.upstream.calls.AggregatedCallMethods
@@ -59,7 +60,7 @@ class MultistreamState(
return status
}
fun updateState(upstreams: List<Upstream>, subs: List<String>) {
fun updateState(upstreams: List<Upstream>, egressSubscription: EgressSubscription) {
val oldState = CurrentMultistreamState(this)
val availableUpstreams = upstreams.filter { it.isAvailable() }
@@ -68,7 +69,7 @@ class MultistreamState(
updateQuorumLabels(availableUpstreams)
updateUpstreamBounds(availableUpstreams)
status = if (upstreams.isEmpty()) UpstreamAvailability.UNAVAILABLE else upstreams.minOf { it.getStatus() }
this.subs = subs
this.subs = egressSubscription.getAvailableTopics()
stateEvents.emitNext(
stateHandler.compareStates(oldState, CurrentMultistreamState(this)),

10
src/test/kotlin/io/emeraldpay/dshackle/upstream/state/MultistreamStateTest.kt
View File

@@ -4,6 +4,7 @@ import io.emeraldpay.dshackle.config.UpstreamsConfig
import io.emeraldpay.dshackle.startup.QuorumForLabels
import io.emeraldpay.dshackle.upstream.Capability
import io.emeraldpay.dshackle.upstream.DefaultUpstream
import io.emeraldpay.dshackle.upstream.EgressSubscription
import io.emeraldpay.dshackle.upstream.UpstreamAvailability
import io.emeraldpay.dshackle.upstream.calls.CallMethods
import io.emeraldpay.dshackle.upstream.finalization.FinalizationData
@@ -57,11 +58,14 @@ class MultistreamStateTest {
listOf(LowerBoundData(1, LowerBoundType.STATE), LowerBoundData(1, LowerBoundType.BLOCK)),
listOf(FinalizationData(990, FinalizationType.SAFE_BLOCK), FinalizationData(880, FinalizationType.FINALIZED_BLOCK)),
)
val egressSub = mock<EgressSubscription> {
on { getAvailableTopics() } doReturn listOf("heads", "notHeads")
}
val state = MultistreamState {}
StepVerifier.create(state.stateEvents())
.then { state.updateState(listOf(up1, up2, up3), listOf("heads", "notHeads")) }
.then { state.updateState(listOf(up1, up2, up3), egressSub) }
.assertNext {
assertThat(it).hasSize(7)
assertThat(it.toList())
@@ -93,11 +97,11 @@ class MultistreamStateTest {
),
)
}
.then { state.updateState(listOf(up1, up2, up3), listOf("heads", "notHeads")) }
.then { state.updateState(listOf(up1, up2, up3), egressSub) }
.assertNext {
assertThat(it).hasSize(0)
}
.then { state.updateState(listOf(up1, up2, up3, up4), listOf("heads", "notHeads")) }
.then { state.updateState(listOf(up1, up2, up3, up4), egressSub) }
.assertNext {
assertThat(it).hasSize(4)
assertThat(it.toList())