aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-23 00:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

channeld: don't exchange my_current_per_commitment_point if option_static_remotekey

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-09-10 12:57:51 +09:30
committed by neil saitug
parent ee3480e56b
commit 0861279b65
5 changed files with 96 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_connection.py
View File

@@ -1618,7 +1618,12 @@ def test_dataloss_protection(node_factory, bitcoind):
orig_db = open(dbpath, "rb").read()
l2.start()
# l1 should have sent WIRE_CHANNEL_REESTABLISH with option_data_loss_protect.
if EXPERIMENTAL_FEATURES:
# No my_current_per_commitment_point with option_static_remotekey
my_current_per_commitment_point_regex = ""
else:
my_current_per_commitment_point_regex = "0[23][0-9a-f]{64}"
# l1 should have sent WIRE_CHANNEL_REESTABLISH with extra fields.
l1.daemon.wait_for_log(r"\[OUT\] 0088"
# channel_id
"[0-9a-f]{64}"
@@ -1630,8 +1635,9 @@ def test_dataloss_protection(node_factory, bitcoind):
# trigger a fee-update and commit, hence this may not
# be zero)
"[0-9a-f]{64}"
# my_current_per_commitment_point
"0[23][0-9a-f]{64}")
# my_current_per_commitment_point (maybe)
+ my_current_per_commitment_point_regex + "'$")
# After an htlc, we should get different results (two more commits)
l1.pay(l2, 200000000)
@@ -1642,7 +1648,7 @@ def test_dataloss_protection(node_factory, bitcoind):
l2.restart()
# l1 should have sent WIRE_CHANNEL_REESTABLISH with option_data_loss_protect.
# l1 should have sent WIRE_CHANNEL_REESTABLISH with extra fields.
l1.daemon.wait_for_log(r"\[OUT\] 0088"
# channel_id
"[0-9a-f]{64}"
@@ -1652,8 +1658,8 @@ def test_dataloss_protection(node_factory, bitcoind):
"000000000000000[1-9]"
# your_last_per_commitment_secret
"[0-9a-f]{64}"
# my_current_per_commitment_point
"0[23][0-9a-f]{64}")
# my_current_per_commitment_point (maybe)
+ my_current_per_commitment_point_regex + "'$")
# Now, move l2 back in time.
l2.stop()