From e9c25dbe65b54bfe72865aef9652139440c3c1dd Mon Sep 17 00:00:00 2001
From: jerryfletcher21 <jerryfletcher@cock.email>
Date: Sat, 15 Jun 2024 17:25:17 +0200
Subject: [PATCH 1/3] fix some tests

---
 api/logics.py                | 7 ++++---
 tests/test_trade_pipeline.py | 4 ++--
 tests/utils/pgp.py           | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/api/logics.py b/api/logics.py
index 7049e21c..72122288 100644
--- a/api/logics.py
+++ b/api/logics.py
@@ -736,9 +736,10 @@ class Logics:
             valid = cls.create_onchain_payment(
                 order, user, preliminary_amount=context["invoice_amount"]
             )
-            order.log(
-                f"Suggested mining fee is {order.payout_tx.suggested_mining_fee_rate} Sats/vbyte, the swap fee rate is {order.payout_tx.swap_fee_rate}%"
-            )
+            if order.payout_tx is not None:
+                order.log(
+                    f"Suggested mining fee is {order.payout_tx.suggested_mining_fee_rate} Sats/vbyte, the swap fee rate is {order.payout_tx.swap_fee_rate}%"
+                )
             if not valid:
                 context["swap_allowed"] = False
                 context[
diff --git a/tests/test_trade_pipeline.py b/tests/test_trade_pipeline.py
index 32a39c9e..d27b0197 100644
--- a/tests/test_trade_pipeline.py
+++ b/tests/test_trade_pipeline.py
@@ -1012,8 +1012,8 @@ class TradeTest(BaseAPITestCase):
         invoice = add_invoice("robot", response.json()["earned_rewards"])
         signed_payout_invoice = sign_message(
             invoice,
-            passphrase_path=f"tests/robots/{trade.taker_index}/token",
-            private_key_path=f"tests/robots/{trade.taker_index}/enc_priv_key",
+            passphrase_path=f"tests/robots/{trade.maker_index}/token",
+            private_key_path=f"tests/robots/{trade.maker_index}/enc_priv_key",
         )
         body = {
             "invoice": signed_payout_invoice,
diff --git a/tests/utils/pgp.py b/tests/utils/pgp.py
index a269ef7e..7150c64f 100644
--- a/tests/utils/pgp.py
+++ b/tests/utils/pgp.py
@@ -10,11 +10,11 @@ def sign_message(message, private_key_path, passphrase_path):
     with open(passphrase_path, "r") as f:
         passphrase = f.read()
 
-    gpg.import_keys(private_key, passphrase=passphrase)
+    import_result = gpg.import_keys(private_key, passphrase=passphrase)
 
-    # keyid=import_result.fingerprints[0]
     signed_message = gpg.sign(
-        message, passphrase=passphrase, extra_args=["--digest-algo", "SHA512"]
+        message, keyid=import_result.fingerprints[0], passphrase=passphrase,
+        extra_args=["--digest-algo", "SHA512"]
     )
 
     # [print(name, getattr(signed_message, name)) for name in dir(signed_message) if not callable(getattr(signed_message, name))]

From 7bfafc933ee4d165bddcd3aa111e4a890555a0c9 Mon Sep 17 00:00:00 2001
From: jerryfletcher21 <jerryfletcher@cock.email>
Date: Mon, 17 Jun 2024 01:56:33 +0200
Subject: [PATCH 2/3] fix test_withdraw_reward_after_unilateral_cancel

---
 tests/test_trade_pipeline.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test_trade_pipeline.py b/tests/test_trade_pipeline.py
index d27b0197..60698fad 100644
--- a/tests/test_trade_pipeline.py
+++ b/tests/test_trade_pipeline.py
@@ -1000,7 +1000,7 @@ class TradeTest(BaseAPITestCase):
 
         # Fetch amount of rewards for taker
         path = reverse("robot")
-        taker_headers = trade.get_robot_auth(trade.maker_index)
+        taker_headers = trade.get_robot_auth(trade.taker_index)
         response = self.client.get(path, **taker_headers)
 
         self.assertEqual(response.status_code, 200)
@@ -1012,8 +1012,8 @@ class TradeTest(BaseAPITestCase):
         invoice = add_invoice("robot", response.json()["earned_rewards"])
         signed_payout_invoice = sign_message(
             invoice,
-            passphrase_path=f"tests/robots/{trade.maker_index}/token",
-            private_key_path=f"tests/robots/{trade.maker_index}/enc_priv_key",
+            passphrase_path=f"tests/robots/{trade.taker_index}/token",
+            private_key_path=f"tests/robots/{trade.taker_index}/enc_priv_key",
         )
         body = {
             "invoice": signed_payout_invoice,

From 5e26e3ab938bd7af79959b862761e26b12d1444c Mon Sep 17 00:00:00 2001
From: jerryfletcher21 <jerryfletcher@cock.email>
Date: Thu, 20 Jun 2024 19:26:42 +0200
Subject: [PATCH 3/3] remove payout_tx check in logics.py

---
 api/logics.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/api/logics.py b/api/logics.py
index 72122288..7049e21c 100644
--- a/api/logics.py
+++ b/api/logics.py
@@ -736,10 +736,9 @@ class Logics:
             valid = cls.create_onchain_payment(
                 order, user, preliminary_amount=context["invoice_amount"]
             )
-            if order.payout_tx is not None:
-                order.log(
-                    f"Suggested mining fee is {order.payout_tx.suggested_mining_fee_rate} Sats/vbyte, the swap fee rate is {order.payout_tx.swap_fee_rate}%"
-                )
+            order.log(
+                f"Suggested mining fee is {order.payout_tx.suggested_mining_fee_rate} Sats/vbyte, the swap fee rate is {order.payout_tx.swap_fee_rate}%"
+            )
             if not valid:
                 context["swap_allowed"] = False
                 context[