From 2a25ea6f1ca6492ab67cac3890f3666519603fcf Mon Sep 17 00:00:00 2001
From: Jonathan Zernik <yzernik@gmail.com>
Date: Fri, 15 Oct 2021 16:51:16 -0700
Subject: [PATCH] Add fixture for sent payment in global conftest (#1600)

---
 tests/conftest.py              | 23 +++++++++++++++++++++++
 tests/core/test_squeak_core.py | 21 ++++++++++++---------
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index a90c0eca..a99c10ff 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -34,6 +34,7 @@ from squeaknode.core.received_payment import ReceivedPayment
 from squeaknode.core.secret_keys import add_tweak
 from squeaknode.core.secret_keys import generate_tweak
 from squeaknode.core.sent_offer import SentOffer
+from squeaknode.core.sent_payment import SentPayment
 from squeaknode.core.squeak_entry import SqueakEntry
 from squeaknode.core.squeak_peer import SqueakPeer
 from squeaknode.core.squeaks import get_hash
@@ -369,3 +370,25 @@ def received_payment(
         settle_index=settle_index,
         peer_address=peer_address,
     )
+
+
+@pytest.fixture
+def sent_payment(
+        squeak_hash,
+        payment_hash,
+        secret_key,
+        price_msat,
+        seller_pubkey,
+        peer_address,
+):
+    yield SentPayment(
+        sent_payment_id=None,
+        created_time_ms=None,
+        peer_address=peer_address,
+        squeak_hash=squeak_hash,
+        payment_hash=payment_hash,
+        secret_key=secret_key,
+        price_msat=price_msat,
+        node_pubkey=seller_pubkey,
+        valid=True,
+    )
diff --git a/tests/core/test_squeak_core.py b/tests/core/test_squeak_core.py
index b25ab762..2e9b2e7c 100644
--- a/tests/core/test_squeak_core.py
+++ b/tests/core/test_squeak_core.py
@@ -24,7 +24,6 @@ import pytest
 from squeaknode.bitcoin.bitcoin_client import BitcoinClient
 from squeaknode.bitcoin.block_info import BlockInfo
 from squeaknode.core.squeak_core import SqueakCore
-from squeaknode.core.squeaks import get_hash
 from squeaknode.core.squeaks import make_squeak_with_block
 from squeaknode.lightning.info import Info
 from squeaknode.lightning.invoice import Invoice
@@ -277,7 +276,7 @@ def unpacked_offer(squeak_core, squeak, packaged_offer, peer_address):
 
 
 @pytest.fixture
-def sent_payment(squeak_core, unpacked_offer):
+def completed_payment(squeak_core, unpacked_offer):
     yield squeak_core.pay_offer(unpacked_offer)
 
 
@@ -440,12 +439,16 @@ def test_unpacked_offer_bad_payment_point_skip_check(
     assert unpacked_offer == received_offer
 
 
-def test_sent_payment(sent_payment, squeak, price_msat, secret_key, seller_pubkey):
+def test_completed_payment(
+        completed_payment,
+        squeak,
+        price_msat,
+        secret_key,
+        seller_pubkey,
+        sent_payment,
+):
 
-    assert sent_payment.squeak_hash == get_hash(squeak)
-    assert sent_payment.price_msat == price_msat
-    assert sent_payment.secret_key == secret_key
-    assert sent_payment.node_pubkey == seller_pubkey
+    assert completed_payment == sent_payment
 
 
 def test_send_payment_with_failure(squeak_core_with_failed_payment, unpacked_offer):
@@ -455,10 +458,10 @@ def test_send_payment_with_failure(squeak_core_with_failed_payment, unpacked_off
     assert "Payment failed with error" in str(excinfo.value)
 
 
-def test_unlock_squeak(squeak_core, squeak, squeak_content, sent_payment):
+def test_unlock_squeak(squeak_core, squeak, squeak_content, completed_payment):
     decrypted_content = squeak_core.get_decrypted_content(
         squeak,
-        sent_payment.secret_key,
+        completed_payment.secret_key,
     )
 
     assert decrypted_content == squeak_content