lnchannel: add more type hints

2020-03-30 03:49:50 +02:00
parent db84de5493
commit 79d57784c1
5 changed files with 160 additions and 103 deletions
--- a/electrum/tests/test_lnchannel.py
+++ b/electrum/tests/test_lnchannel.py
@@ -786,15 +786,15 @@ class TestChanReserve(ElectrumTestCase):
        alice_idx = self.alice_channel.add_htlc(htlc_dict).htlc_id
        bob_idx = self.bob_channel.receive_htlc(htlc_dict).htlc_id
        force_state_transition(self.alice_channel, self.bob_channel)
-        self.check_bals(one_bitcoin_in_msat*3\
-                - self.alice_channel.pending_local_fee(),
-                  one_bitcoin_in_msat*5)
+        self.check_bals(one_bitcoin_in_msat * 3
+                        - self.alice_channel.get_next_fee(LOCAL),
+                        one_bitcoin_in_msat * 5)
        self.bob_channel.settle_htlc(paymentPreimage, bob_idx)
        self.alice_channel.receive_htlc_settle(paymentPreimage, alice_idx)
        force_state_transition(self.alice_channel, self.bob_channel)
-        self.check_bals(one_bitcoin_in_msat*3\
-                - self.alice_channel.pending_local_fee(),
-                  one_bitcoin_in_msat*7)
+        self.check_bals(one_bitcoin_in_msat * 3
+                        - self.alice_channel.get_next_fee(LOCAL),
+                        one_bitcoin_in_msat * 7)
        # And now let Bob add an HTLC of 1 BTC. This will take Bob's balance
        # all the way down to his channel reserve, but since he is not paying
        # the fee this is okay.
@@ -802,9 +802,9 @@ class TestChanReserve(ElectrumTestCase):
        self.bob_channel.add_htlc(htlc_dict)
        self.alice_channel.receive_htlc(htlc_dict)
        force_state_transition(self.alice_channel, self.bob_channel)
-        self.check_bals(one_bitcoin_in_msat*3\
-                - self.alice_channel.pending_local_fee(),
-                  one_bitcoin_in_msat*6)
+        self.check_bals(one_bitcoin_in_msat * 3 \
+                        - self.alice_channel.get_next_fee(LOCAL),
+                        one_bitcoin_in_msat * 6)

    def check_bals(self, amt1, amt2):
        self.assertEqual(self.alice_channel.available_to_spend(LOCAL), amt1)
@@ -840,7 +840,7 @@ class TestDust(ElectrumTestCase):
        self.assertEqual(len(alice_ctx.outputs()), 3)
        self.assertEqual(len(bob_ctx.outputs()), 2)
        default_fee = calc_static_fee(0)
-        self.assertEqual(bob_channel.pending_local_fee(), default_fee + htlcAmt)
+        self.assertEqual(bob_channel.get_next_fee(LOCAL), default_fee + htlcAmt)
        bob_channel.settle_htlc(paymentPreimage, bobHtlcIndex)
        alice_channel.receive_htlc_settle(paymentPreimage, aliceHtlcIndex)
        force_state_transition(bob_channel, alice_channel)
--- a/electrum/tests/test_lnutil.py
+++ b/electrum/tests/test_lnutil.py
@@ -510,13 +510,23 @@ class TestLNUtil(ElectrumTestCase):
        htlcs = [ScriptHtlc(htlc[x], htlc_obj[x]) for x in range(5)]

        our_commit_tx = make_commitment(
-            commitment_number,
-            local_funding_pubkey, remote_funding_pubkey, remotepubkey,
-            local_payment_basepoint, remote_payment_basepoint,
-            local_revocation_pubkey, local_delayedpubkey, local_delay,
-            funding_tx_id, funding_output_index, funding_amount_satoshi,
-            to_local_msat, to_remote_msat, local_dust_limit_satoshi,
-            calc_fees_for_commitment_tx(num_htlcs=len(htlcs), feerate=local_feerate_per_kw, is_local_initiator=True), htlcs=htlcs)
+            ctn=commitment_number,
+            local_funding_pubkey=local_funding_pubkey,
+            remote_funding_pubkey=remote_funding_pubkey,
+            remote_payment_pubkey=remotepubkey,
+            funder_payment_basepoint=local_payment_basepoint,
+            fundee_payment_basepoint=remote_payment_basepoint,
+            revocation_pubkey=local_revocation_pubkey,
+            delayed_pubkey=local_delayedpubkey,
+            to_self_delay=local_delay,
+            funding_txid=funding_tx_id,
+            funding_pos=funding_output_index,
+            funding_sat=funding_amount_satoshi,
+            local_amount=to_local_msat,
+            remote_amount=to_remote_msat,
+            dust_limit_sat=local_dust_limit_satoshi,
+            fees_per_participant=calc_fees_for_commitment_tx(num_htlcs=len(htlcs), feerate=local_feerate_per_kw, is_local_initiator=True),
+            htlcs=htlcs)
        self.sign_and_insert_remote_sig(our_commit_tx, remote_funding_pubkey, remote_signature, local_funding_pubkey, local_funding_privkey)
        self.assertEqual(str(our_commit_tx), output_commit_tx)

@@ -587,13 +597,23 @@ class TestLNUtil(ElectrumTestCase):
        output_commit_tx= "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8001c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de8431100400473044022031a82b51bd014915fe68928d1abf4b9885353fb896cac10c3fdd88d7f9c7f2e00220716bda819641d2c63e65d3549b6120112e1aeaf1742eed94a471488e79e206b101473044022064901950be922e62cbe3f2ab93de2b99f37cff9fc473e73e394b27f88ef0731d02206d1dfa227527b4df44a07599289e207d6fd9cca60c0365682dcd3deaf739567e01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220"

        our_commit_tx = make_commitment(
-            commitment_number,
-            local_funding_pubkey, remote_funding_pubkey, remotepubkey,
-            local_payment_basepoint, remote_payment_basepoint,
-            local_revocation_pubkey, local_delayedpubkey, local_delay,
-            funding_tx_id, funding_output_index, funding_amount_satoshi,
-            to_local_msat, to_remote_msat, local_dust_limit_satoshi,
-            calc_fees_for_commitment_tx(num_htlcs=0, feerate=local_feerate_per_kw, is_local_initiator=True), htlcs=[])
+            ctn=commitment_number,
+            local_funding_pubkey=local_funding_pubkey,
+            remote_funding_pubkey=remote_funding_pubkey,
+            remote_payment_pubkey=remotepubkey,
+            funder_payment_basepoint=local_payment_basepoint,
+            fundee_payment_basepoint=remote_payment_basepoint,
+            revocation_pubkey=local_revocation_pubkey,
+            delayed_pubkey=local_delayedpubkey,
+            to_self_delay=local_delay,
+            funding_txid=funding_tx_id,
+            funding_pos=funding_output_index,
+            funding_sat=funding_amount_satoshi,
+            local_amount=to_local_msat,
+            remote_amount=to_remote_msat,
+            dust_limit_sat=local_dust_limit_satoshi,
+            fees_per_participant=calc_fees_for_commitment_tx(num_htlcs=0, feerate=local_feerate_per_kw, is_local_initiator=True),
+            htlcs=[])
        self.sign_and_insert_remote_sig(our_commit_tx, remote_funding_pubkey, remote_signature, local_funding_pubkey, local_funding_privkey)

        self.assertEqual(str(our_commit_tx), output_commit_tx)
@@ -606,13 +626,23 @@ class TestLNUtil(ElectrumTestCase):
        output_commit_tx= "02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8001c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de8431100400473044022031a82b51bd014915fe68928d1abf4b9885353fb896cac10c3fdd88d7f9c7f2e00220716bda819641d2c63e65d3549b6120112e1aeaf1742eed94a471488e79e206b101473044022064901950be922e62cbe3f2ab93de2b99f37cff9fc473e73e394b27f88ef0731d02206d1dfa227527b4df44a07599289e207d6fd9cca60c0365682dcd3deaf739567e01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220"

        our_commit_tx = make_commitment(
-            commitment_number,
-            local_funding_pubkey, remote_funding_pubkey, remotepubkey,
-            local_payment_basepoint, remote_payment_basepoint,
-            local_revocation_pubkey, local_delayedpubkey, local_delay,
-            funding_tx_id, funding_output_index, funding_amount_satoshi,
-            to_local_msat, to_remote_msat, local_dust_limit_satoshi,
-            calc_fees_for_commitment_tx(num_htlcs=0, feerate=local_feerate_per_kw, is_local_initiator=True), htlcs=[])
+            ctn=commitment_number,
+            local_funding_pubkey=local_funding_pubkey,
+            remote_funding_pubkey=remote_funding_pubkey,
+            remote_payment_pubkey=remotepubkey,
+            funder_payment_basepoint=local_payment_basepoint,
+            fundee_payment_basepoint=remote_payment_basepoint,
+            revocation_pubkey=local_revocation_pubkey,
+            delayed_pubkey=local_delayedpubkey,
+            to_self_delay=local_delay,
+            funding_txid=funding_tx_id,
+            funding_pos=funding_output_index,
+            funding_sat=funding_amount_satoshi,
+            local_amount=to_local_msat,
+            remote_amount=to_remote_msat,
+            dust_limit_sat=local_dust_limit_satoshi,
+            fees_per_participant=calc_fees_for_commitment_tx(num_htlcs=0, feerate=local_feerate_per_kw, is_local_initiator=True),
+            htlcs=[])
        self.sign_and_insert_remote_sig(our_commit_tx, remote_funding_pubkey, remote_signature, local_funding_pubkey, local_funding_privkey)

        self.assertEqual(str(our_commit_tx), output_commit_tx)
@@ -662,15 +692,24 @@ class TestLNUtil(ElectrumTestCase):
        # to_remote amount 3000000 P2WPKH(0394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b)
        remote_signature = "3045022100f51d2e566a70ba740fc5d8c0f07b9b93d2ed741c3c0860c613173de7d39e7968022041376d520e9c0e1ad52248ddf4b22e12be8763007df977253ef45a4ca3bdb7c0"
        # local_signature = 3044022051b75c73198c6deee1a875871c3961832909acd297c6b908d59e3319e5185a46022055c419379c5051a78d00dbbce11b5b664a0c22815fbcc6fcef6b1937c3836939
-        htlcs=[]
        our_commit_tx = make_commitment(
-            commitment_number,
-            local_funding_pubkey, remote_funding_pubkey, remotepubkey,
-            local_payment_basepoint, remote_payment_basepoint,
-            local_revocation_pubkey, local_delayedpubkey, local_delay,
-            funding_tx_id, funding_output_index, funding_amount_satoshi,
-            to_local_msat, to_remote_msat, local_dust_limit_satoshi,
-            calc_fees_for_commitment_tx(num_htlcs=0, feerate=local_feerate_per_kw, is_local_initiator=True), htlcs=[])
+            ctn=commitment_number,
+            local_funding_pubkey=local_funding_pubkey,
+            remote_funding_pubkey=remote_funding_pubkey,
+            remote_payment_pubkey=remotepubkey,
+            funder_payment_basepoint=local_payment_basepoint,
+            fundee_payment_basepoint=remote_payment_basepoint,
+            revocation_pubkey=local_revocation_pubkey,
+            delayed_pubkey=local_delayedpubkey,
+            to_self_delay=local_delay,
+            funding_txid=funding_tx_id,
+            funding_pos=funding_output_index,
+            funding_sat=funding_amount_satoshi,
+            local_amount=to_local_msat,
+            remote_amount=to_remote_msat,
+            dust_limit_sat=local_dust_limit_satoshi,
+            fees_per_participant=calc_fees_for_commitment_tx(num_htlcs=0, feerate=local_feerate_per_kw, is_local_initiator=True),
+            htlcs=[])
        self.sign_and_insert_remote_sig(our_commit_tx, remote_funding_pubkey, remote_signature, local_funding_pubkey, local_funding_privkey)
        ref_commit_tx_str = '02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8002c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de84311054a56a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400473044022051b75c73198c6deee1a875871c3961832909acd297c6b908d59e3319e5185a46022055c419379c5051a78d00dbbce11b5b664a0c22815fbcc6fcef6b1937c383693901483045022100f51d2e566a70ba740fc5d8c0f07b9b93d2ed741c3c0860c613173de7d39e7968022041376d520e9c0e1ad52248ddf4b22e12be8763007df977253ef45a4ca3bdb7c001475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220'
        self.assertEqual(str(our_commit_tx), ref_commit_tx_str)