Remove unnecessary safeSend from tests

ACINQ · Nov 9, 2023 · 060a0d7 · 060a0d7
1 parent 394b3d8
commit 060a0d7
Showing 1 changed file with 3 additions and 17 deletions.
diff --git a/src/commonTest/kotlin/fr/acinq/lightning/channel/states/QuiescenceTestsCommon.kt b/src/commonTest/kotlin/fr/acinq/lightning/channel/states/QuiescenceTestsCommon.kt
@@ -77,7 +77,7 @@ class QuiescenceTestsCommon : LightningTestSuite() {
         )
         val (alice1, _, _) = initiateQuiescence(alice, bob, sendInitialStfu = false)
         cmds.forEach {
-            safeSend(alice1, listOf(it)).second.findCommandError<ForbiddenDuringQuiescence>()
+            alice1.process(it).second.findCommandError<ForbiddenDuringQuiescence>()
         }
     }
 
@@ -92,12 +92,11 @@ class QuiescenceTestsCommon : LightningTestSuite() {
         )
         val (alice1, bob1, _) = initiateQuiescence(alice, bob, sendInitialStfu = true)
         cmds.forEach {
-            safeSend(alice1, listOf(it)).second.findCommandError<ForbiddenDuringSplice>()
+            alice1.process(it).second.findCommandError<ForbiddenDuringSplice>()
         }
         cmds.forEach {
-            safeSend(bob1, listOf(it)).second.findCommandError<ForbiddenDuringSplice>()
+            bob1.process(it).second.findCommandError<ForbiddenDuringSplice>()
         }
-        safeSend(bob, cmds)
     }
 
     @Test
@@ -459,19 +458,6 @@ class QuiescenceTestsCommon : LightningTestSuite() {
         }
     }
 
-    private fun safeSend(r: LNChannel<Normal>, cmds: List<ChannelCommand>): Pair<LNChannel<Normal>, List<ChannelAction>> {
-        var receiver: LNChannel<Normal> = r
-        val actions = buildList {
-            cmds.forEach {
-                val (r1, a) = receiver.process(it)
-                assertIs<LNChannel<Normal>>(r1)
-                receiver = r1
-                addAll(a)
-            }
-        }
-        return Pair(receiver, actions)
-    }
-
     private fun initiateQuiescence(sender: LNChannel<Normal>, receiver: LNChannel<Normal>, sendInitialStfu: Boolean): Triple<LNChannel<Normal>, LNChannel<Normal>, LightningMessage> {
         val cmd = ChannelCommand.Commitment.Splice.Request(
             replyTo = CompletableDeferred(),