tests: adapt to new htlc_switch architecture

update tests / MockLNWallet to new htlc switch architecture.
Also adapt hold invoice cli commands.

Author: f321x

electrum/commands.py

@@ -1506,7 +1506,7 @@ async def check_hold_invoice(self, payment_hash: str, wallet: Abstract_Wallet =
             payment_key: str = wallet.lnworker._get_payment_key(bfh(payment_hash)).hex()
             htlc_status = wallet.lnworker.received_mpp_htlcs[payment_key]
             result["closest_htlc_expiry_height"] = min(
-                htlc.cltv_abs for _, htlc in htlc_status.htlc_set
+                mpp_htlc.htlc.cltv_abs for mpp_htlc in htlc_status.htlcs
             )
         elif wallet.lnworker.get_preimage_hex(payment_hash) is not None \
                 and payment_hash not in wallet.lnworker.dont_settle_htlcs:

tests/test_commands.py

@@ -540,13 +540,13 @@ async def test_hold_invoice_commands(self, mock_save_db):
             )
 
         mock_htlc1 = mock.Mock()
-        mock_htlc1.cltv_abs = 800_000
-        mock_htlc1.amount_msat = 4_500_000
+        mock_htlc1.htlc.cltv_abs = 800_000
+        mock_htlc1.htlc.amount_msat = 4_500_000
         mock_htlc2 = mock.Mock()
-        mock_htlc2.cltv_abs = 800_144
-        mock_htlc2.amount_msat = 5_500_000
+        mock_htlc2.htlc.cltv_abs = 800_144
+        mock_htlc2.htlc.amount_msat = 5_500_000
         mock_htlc_status = mock.Mock()
-        mock_htlc_status.htlc_set = [(None, mock_htlc1), (None, mock_htlc2)]
+        mock_htlc_status.htlcs = [mock_htlc1, mock_htlc2]
         mock_htlc_status.resolution = RecvMPPResolution.COMPLETE
 
         payment_key = wallet.lnworker._get_payment_key(bytes.fromhex(payment_hash)).hex()

tests/test_lnpeer.py

@@ -301,7 +301,6 @@ async def create_routes_from_invoice(self, amount_msat: int, decoded_invoice: Ln
     set_request_status = LNWallet.set_request_status
     set_payment_status = LNWallet.set_payment_status
     get_payment_status = LNWallet.get_payment_status
-    check_mpp_status = LNWallet.check_mpp_status
     htlc_fulfilled = LNWallet.htlc_fulfilled
     htlc_failed = LNWallet.htlc_failed
     save_preimage = LNWallet.save_preimage
@@ -334,11 +333,9 @@ async def create_routes_from_invoice(self, amount_msat: int, decoded_invoice: Ln
     unregister_hold_invoice = LNWallet.unregister_hold_invoice
     add_payment_info_for_hold_invoice = LNWallet.add_payment_info_for_hold_invoice
 
-    update_mpp_with_received_htlc = LNWallet.update_mpp_with_received_htlc
+    update_or_create_mpp_with_received_htlc = LNWallet.update_or_create_mpp_with_received_htlc
     set_mpp_resolution = LNWallet.set_mpp_resolution
-    is_mpp_amount_reached = LNWallet.is_mpp_amount_reached
     get_mpp_amounts = LNWallet.get_mpp_amounts
-    get_first_timestamp_of_mpp = LNWallet.get_first_timestamp_of_mpp
     bundle_payments = LNWallet.bundle_payments
     get_payment_bundle = LNWallet.get_payment_bundle
     _get_payment_key = LNWallet._get_payment_key
@@ -347,8 +344,14 @@ async def create_routes_from_invoice(self, amount_msat: int, decoded_invoice: Ln
     maybe_cleanup_forwarding = LNWallet.maybe_cleanup_forwarding
     current_target_feerate_per_kw = LNWallet.current_target_feerate_per_kw
     current_low_feerate_per_kw_srk_channel = LNWallet.current_low_feerate_per_kw_srk_channel
-    maybe_cleanup_mpp = LNWallet.maybe_cleanup_mpp
     create_onion_for_route = LNWallet.create_onion_for_route
+    maybe_forward_htlc_set = LNWallet.maybe_forward_htlc_set
+    _maybe_forward_htlc = LNWallet._maybe_forward_htlc
+    _maybe_forward_trampoline = LNWallet._maybe_forward_trampoline
+    _maybe_refuse_to_forward_htlc_that_corresponds_to_payreq_we_created = LNWallet._maybe_refuse_to_forward_htlc_that_corresponds_to_payreq_we_created
+    set_htlc_set_error = LNWallet.set_htlc_set_error
+    is_payment_bundle_complete = LNWallet.is_payment_bundle_complete
+    delete_payment_bundle = LNWallet.delete_payment_bundle
 
 
 class MockTransport:
@@ -709,7 +712,7 @@ async def bob_sends_reest():
 
     @staticmethod
     def _send_fake_htlc(peer: Peer, chan: Channel) -> UpdateAddHtlc:
-        htlc = UpdateAddHtlc(amount_msat=10000, payment_hash=os.urandom(32), cltv_abs=999, timestamp=1)
+        htlc = UpdateAddHtlc(amount_msat=10000, rhash=os.urandom(32).hex(), cltv_abs=999, timestamp=1)
         htlc = chan.add_htlc(htlc)
         peer.send_message(
             "update_add_htlc",

tests/test_lnutil.py

@@ -562,7 +562,7 @@ def test_commitment_tx_with_all_five_HTLCs_untrimmed_minimum_feerate(self):
                           (1, 2000 * 1000),
                           (3, 3000 * 1000),
                           (4, 4000 * 1000)]:
-            htlc_obj[num] = UpdateAddHtlc(amount_msat=msat, payment_hash=bitcoin.sha256(htlc_payment_preimage[num]), cltv_abs=0, htlc_id=None, timestamp=0)
+            htlc_obj[num] = UpdateAddHtlc(amount_msat=msat, rhash=bitcoin.sha256(htlc_payment_preimage[num]).hex(), cltv_abs=0, htlc_id=None, timestamp=0)
         htlcs = [ScriptHtlc(htlc[x], htlc_obj[x]) for x in range(5)]
 
         our_commit_tx = make_commitment(
@@ -848,7 +848,7 @@ def _test_commitment_tx_anchors_test_vectors(self):
                                 has_anchors=True)
                         update_add_htlc = UpdateAddHtlc(
                             amount_msat=test_htlc['amount'],
-                            payment_hash=bitcoin.sha256(bfh(test_htlc['preimage'])),
+                            rhash=bitcoin.sha256(bfh(test_htlc['preimage'])).hex(),
                             cltv_abs=test_htlc['expiry'],
                             htlc_id=None,
                             timestamp=0)