Improve splice tests

And fix a bug when an inactive revoked commitment is published.
ACINQ · Dec 20, 2023 · b7b4364 · b7b4364
1 parent 61f3082
commit b7b4364
Show file tree

Hide file tree

Showing 3 changed files with 295 additions and 375 deletions.
diff --git a/src/commonMain/kotlin/fr/acinq/lightning/channel/Helpers.kt b/src/commonMain/kotlin/fr/acinq/lightning/channel/Helpers.kt
@@ -962,6 +962,10 @@ object Helpers {
                 // NB: from the point of view of the remote, their incoming htlcs are our outgoing htlcs
                 htlcsInRemoteCommit.incomings().toSet() - localCommit.spec.htlcs.outgoings().toSet()
             }
+            revokedCommitPublished.map { it.commitTx.txid }.contains(tx.txid) -> {
+                // a revoked commitment got confirmed: we will claim its outputs, but we also need to fail htlcs that are pending in the latest commitment
+                (nextRemoteCommit ?: remoteCommit).spec.htlcs.incomings().toSet()
+            }
             remoteCommit.txid == tx.txid -> when (nextRemoteCommit) {
                 null -> emptySet() // their last commitment got confirmed, so no htlcs will be overridden, they will timeout or be fulfilled on chain
                 else -> {
@@ -970,10 +974,6 @@ object Helpers {
                     nextRemoteCommit.spec.htlcs.incomings().toSet() - localCommit.spec.htlcs.outgoings().toSet()
                 }
             }
-            revokedCommitPublished.map { it.commitTx.txid }.contains(tx.txid) -> {
-                // a revoked commitment got confirmed: we will claim its outputs, but we also need to fail htlcs that are pending in the latest commitment
-                (nextRemoteCommit ?: remoteCommit).spec.htlcs.incomings().toSet()
-            }
             else -> emptySet()
         }