Skip to content

fixup! Fix flaky GossipIntegrationSpec test (#3039) #3061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
remyers merged 1 commit into from
Apr 14, 2025
Merged

fixup! Fix flaky GossipIntegrationSpec test (#3039) #3061

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions ...core/src/test/scala/fr/acinq/eclair/integration/basic/channel/GossipIntegrationSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,15 @@ class GossipIntegrationSpec extends FixtureSpec with IntegrationPatience {

// Bob also creates a channel_announcement for the splice transaction and updates the graph.
inside(getRouterData(bob)) { routerData =>
assert(routerData.channels.keys == Set(splice_scid_ab, scid_bc))
assert(routerData.spentChannels.isEmpty)
routerData.spentChannels match {
case spentChannels if spentChannels.isEmpty =>
assert(routerData.channels.keys == Set(splice_scid_ab, scid_bc))
case spentChannels =>
// Handle the special case where Bob receives ExternalChannelSpent after validating the local channel update
// for the splice and treating it as a new channel; the original splice will be removed when the splice tx confirms.
assert(spentChannels.contains(spliceTxId) && spentChannels(spliceTxId) == Set(scid_ab))
assert(routerData.channels.keys == Set(splice_scid_ab, scid_bc, scid_ab))
}
assert(routerData.channels.get(splice_scid_ab).map(_.ann).contains(spliceAnn))
routerData.channels.get(splice_scid_ab).foreach(c => {
assert(c.capacity == 200_000.sat)
Expand All @@ -124,8 +131,15 @@ class GossipIntegrationSpec extends FixtureSpec with IntegrationPatience {

// The channel_announcement for the splice propagates to Carol.
inside(getRouterData(carol)) { routerData =>
assert(routerData.channels.keys == Set(splice_scid_ab, scid_bc))
assert(routerData.spentChannels.isEmpty)
routerData.spentChannels match {
case spentChannels if spentChannels.isEmpty =>
assert(routerData.channels.keys == Set(splice_scid_ab, scid_bc))
case spentChannels =>
// Handle the special case where Carol receives ExternalChannelSpent after validating the local channel update
// for the splice and treating it as a new channel; the original splice will be removed when the splice tx confirms.
assert(spentChannels.contains(spliceTxId) && spentChannels(spliceTxId) == Set(scid_ab))
assert(routerData.channels.keys == Set(splice_scid_ab, scid_bc, scid_ab))
}
assert(routerData.channels.get(splice_scid_ab).map(_.ann).contains(spliceAnn))
routerData.channels.get(splice_scid_ab).foreach(c => {
assert(c.capacity == 200_000.sat)
Expand Down