Change spliceStatus to Aborted after responding to SpliceInit wit…

…h `TxAbort`
ACINQ · Nov 13, 2023 · 2ee9156 · 2ee9156
1 parent 370a7f4
commit 2ee9156
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/commonMain/kotlin/fr/acinq/lightning/channel/states/Normal.kt b/src/commonMain/kotlin/fr/acinq/lightning/channel/states/Normal.kt
@@ -448,7 +448,7 @@ data class Normal(
                     is SpliceInit -> when (spliceStatus) {
                         is SpliceStatus.None -> {
                             logger.warning { "rejecting splice attempt: quiescence not negotiated" }
-                            Pair(this@Normal, listOf(ChannelAction.Message.Send(TxAbort(channelId, InvalidSpliceNotQuiescent(channelId).message))))
+                            Pair(this@Normal.copy(spliceStatus = SpliceStatus.Aborted), listOf(ChannelAction.Message.Send(TxAbort(channelId, InvalidSpliceNotQuiescent(channelId).message))))
                         }
                         is SpliceStatus.NonInitiatorQuiescent ->
                             if (commitments.isQuiescent()) {
@@ -485,7 +485,7 @@ data class Normal(
                                 Pair(nextState, listOf(ChannelAction.Message.Send(spliceAck)))
                             } else {
                                 logger.warning { "rejecting splice attempt: channel is not quiescent" }
-                                Pair(this@Normal, listOf(ChannelAction.Message.Send(TxAbort(channelId, InvalidSpliceNotQuiescent(channelId).message))))
+                                Pair(this@Normal.copy(spliceStatus = SpliceStatus.Aborted), listOf(ChannelAction.Message.Send(TxAbort(channelId, InvalidSpliceNotQuiescent(channelId).message))))
                             }
                         is SpliceStatus.Aborted -> {
                             logger.info { "rejecting splice attempt: our previous tx_abort was not acked" }

diff --git a/src/commonTest/kotlin/fr/acinq/lightning/channel/states/QuiescenceTestsCommon.kt b/src/commonTest/kotlin/fr/acinq/lightning/channel/states/QuiescenceTestsCommon.kt
@@ -403,9 +403,11 @@ class QuiescenceTestsCommon : LightningTestSuite() {
     fun `receive SpliceInit when channel is not quiescent` () {
         val (alice, _) = init()
         val spliceInit = SpliceInit(alice.channelId, 500_000.sat, FeeratePerKw(253.sat), 0, Lightning.randomKey().publicKey())
-        val (_, actionsAlice) = alice.process(ChannelCommand.MessageReceived(spliceInit))
+        val (alice1, actionsAlice1) = alice.process(ChannelCommand.MessageReceived(spliceInit))
         // quiescence not negotiated
-        actionsAlice.hasOutgoingMessage<TxAbort>()
+        actionsAlice1.hasOutgoingMessage<TxAbort>()
+        assertIs<LNChannel<Normal>>(alice1)
+        assertIs<SpliceStatus.Aborted>(alice1.state.spliceStatus)
     }
 
     companion object {