nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: use function to calculate additional fee

Browse Source 
This will reduce flakiness in case the ancestor size differs due
to changes in signature size.
This commit is contained in:
jp1ac4 2024-03-28 10:49:07 +00:00
parent deb75884bf
commit 8078a2791a
No known key found for this signature in database
GPG Key ID: A7ACD32423568D7B
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/test_spend.py
View File

@ -9,6 +9,15 @@ from test_framework.utils import (
) )
def additional_fees(anc_vsize, anc_fee, target_feerate):
"""The additional fee which must have been computed by lianad."""
computed_anc_vsize = int(anc_fee / target_feerate)
print(f"c ", computed_anc_vsize)
extra_vsize = anc_vsize - computed_anc_vsize
print("e ", extra_vsize)
return extra_vsize * target_feerate
def test_spend_change(lianad, bitcoind): def test_spend_change(lianad, bitcoind):
"""We can spend a coin that was received on a change address.""" """We can spend a coin that was received on a change address."""
# Receive a coin on a receive address # Receive a coin on a receive address
@ -179,15 +188,13 @@ def test_coin_marked_spent(lianad, bitcoind):
psbt = PSBT.from_base64(res["psbt"]) psbt = PSBT.from_base64(res["psbt"])
sign_and_broadcast(psbt) sign_and_broadcast(psbt)
assert len(psbt.o) == 4 assert len(psbt.o) == 4
assert bitcoind.rpc.getmempoolentry(deposit_d)["ancestorsize"] == 165 anc_vsize = bitcoind.rpc.getmempoolentry(deposit_d)["ancestorsize"]
assert bitcoind.rpc.getmempoolentry(deposit_d)["fees"]["ancestor"] * COIN == 165 anc_fees = int(bitcoind.rpc.getmempoolentry(deposit_d)["fees"]["ancestor"] * COIN)
# ancestor vsize at feerate 2 sat/vb = ancestor_fee / 2 = 165 / 2 = 82 additional_fee = additional_fees(anc_vsize, anc_fees, 2)
# extra_weight <= (extra vsize * witness factor) = (165 - 82) * 4 = 332
# additional fee at 2 sat/vb (0.5 sat/wu) = 332 * 0.5 = 166
assert len(res["warnings"]) == 1 assert len(res["warnings"]) == 1
assert ( assert (
res["warnings"][0] res["warnings"][0]
== "An additional fee of 166 sats has been added to pay for ancestors at the target feerate." == f"An additional fee of {additional_fee} sats has been added to pay for ancestors at the target feerate."
) )
# All the spent coins must have been detected as such # All the spent coins must have been detected as such
@ -322,14 +329,6 @@ def test_coin_selection(lianad, bitcoind):
dest_addr_2 = bitcoind.rpc.getnewaddress() dest_addr_2 = bitcoind.rpc.getnewaddress()
# If feerate is higher than ancestor, we'll need to pay extra. # If feerate is higher than ancestor, we'll need to pay extra.
def additional_fees(anc_vsize, anc_fee, target_feerate):
"""The additional fee which must have been computed by lianad."""
computed_anc_vsize = int(anc_fee / target_feerate)
print(f"c ", computed_anc_vsize)
extra_vsize = anc_vsize - computed_anc_vsize
print("e ", extra_vsize)
return extra_vsize * target_feerate
# Try 10 sat/vb: # Try 10 sat/vb:
feerate = 10 feerate = 10
spend_res_2 = lianad.rpc.createspend({dest_addr_2: 10_000}, [], feerate) spend_res_2 = lianad.rpc.createspend({dest_addr_2: 10_000}, [], feerate)