From 75f1c58a66faa04b3f0d55f361b99748b2576d8e Mon Sep 17 00:00:00 2001
From: Richard Myers <remyers@yakshaver.org>
Date: Wed, 23 Nov 2022 16:44:50 +0100
Subject: [PATCH] Remove unused/unsafe AbortSwap command

---
 .../scala/fr/acinq/eclair/plugins/peerswap/SwapCommands.scala    | 1 -
 .../main/scala/fr/acinq/eclair/plugins/peerswap/SwapMaker.scala  | 1 -
 .../main/scala/fr/acinq/eclair/plugins/peerswap/SwapTaker.scala  | 1 -
 3 files changed, 3 deletions(-)

diff --git a/plugins/peerswap/src/main/scala/fr/acinq/eclair/plugins/peerswap/SwapCommands.scala b/plugins/peerswap/src/main/scala/fr/acinq/eclair/plugins/peerswap/SwapCommands.scala
index e41ebaadbf..db55728fd9 100644
--- a/plugins/peerswap/src/main/scala/fr/acinq/eclair/plugins/peerswap/SwapCommands.scala
+++ b/plugins/peerswap/src/main/scala/fr/acinq/eclair/plugins/peerswap/SwapCommands.scala
@@ -35,7 +35,6 @@ object SwapCommands {
   case class StartSwapInSender(amount: Satoshi, swapId: String, shortChannelId: ShortChannelId) extends SwapCommand
   case class StartSwapOutReceiver(request: SwapOutRequest) extends SwapCommand
   case class RestoreSwap(swapData: SwapData) extends SwapCommand
-  case object AbortSwap extends SwapCommand
 
   sealed trait CreateSwapMessages extends SwapCommand
   case object StateTimeout extends CreateSwapMessages with AwaitAgreementMessages with CreateOpeningTxMessages with ClaimSwapCsvMessages with WaitCsvMessages with AwaitFeePaymentMessages with ClaimSwapMessages with PayFeeInvoiceMessages  with SendAgreementMessages
diff --git a/plugins/peerswap/src/main/scala/fr/acinq/eclair/plugins/peerswap/SwapMaker.scala b/plugins/peerswap/src/main/scala/fr/acinq/eclair/plugins/peerswap/SwapMaker.scala
index 747d0461fb..db797e007f 100644
--- a/plugins/peerswap/src/main/scala/fr/acinq/eclair/plugins/peerswap/SwapMaker.scala
+++ b/plugins/peerswap/src/main/scala/fr/acinq/eclair/plugins/peerswap/SwapMaker.scala
@@ -126,7 +126,6 @@ object SwapMaker {
             case Failure(e) => context.log.error(s"could not restore swap sender with invalid shortChannelId: $d, $e")
               Behaviors.stopped
           }
-        case AbortSwap => Behaviors.stopped
       }
     }
 }
diff --git a/plugins/peerswap/src/main/scala/fr/acinq/eclair/plugins/peerswap/SwapTaker.scala b/plugins/peerswap/src/main/scala/fr/acinq/eclair/plugins/peerswap/SwapTaker.scala
index 8a54122265..8cdc6f11e5 100644
--- a/plugins/peerswap/src/main/scala/fr/acinq/eclair/plugins/peerswap/SwapTaker.scala
+++ b/plugins/peerswap/src/main/scala/fr/acinq/eclair/plugins/peerswap/SwapTaker.scala
@@ -133,7 +133,6 @@ object SwapTaker {
             case Failure(e) => context.log.error(s"could not restore swap receiver with invalid shortChannelId: $d, $e")
               Behaviors.stopped
           }
-        case AbortSwap => Behaviors.stopped
       }
     }
 }