AaronFiore/electrum
1
0
Fork 0
Code Activity

regtest backups: test both cases (onchain and imported)

Browse Source 
lnpeer: call close_and_cleanup() after we force close,
or the above test will fail.
This commit is contained in:
ThomasV
2021-03-29 19:08:22 +02:00
parent e38dabf502
commit 8b95b2127d
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
electrum/lnpeer.py
View File

@@ -1081,6 +1081,7 @@ class Peer(Logger):
elif we_are_ahead: elif we_are_ahead:
self.logger.warning(f"channel_reestablish ({chan.get_id_for_log()}): we are ahead of remote! trying to force-close.") self.logger.warning(f"channel_reestablish ({chan.get_id_for_log()}): we are ahead of remote! trying to force-close.")
await self.lnworker.try_force_closing(chan_id) await self.lnworker.try_force_closing(chan_id)
self.close_and_cleanup()
return return
chan.peer_state = PeerState.GOOD chan.peer_state = PeerState.GOOD

14
electrum/tests/regtest/regtest.sh
View File

@@ -137,15 +137,12 @@ if [[ $1 == "backup" ]]; then
wait_for_balance alice 1 wait_for_balance alice 1
echo "alice opens channel" echo "alice opens channel"
bob_node=$($bob nodeid) bob_node=$($bob nodeid)
channel1=$($alice open_channel $bob_node 0.15)
$alice setconfig use_recoverable_channels False $alice setconfig use_recoverable_channels False
channel=$($alice open_channel $bob_node 0.15) channel2=$($alice open_channel $bob_node 0.15)
echo "channel point: $channel"
new_blocks 3 new_blocks 3
wait_until_channel_open alice wait_until_channel_open alice
backup=$($alice export_channel_backup $channel) backup=$($alice export_channel_backup $channel2)
request=$($bob add_lightning_request 0.01 -m "blah" | jq -r ".invoice")
echo "alice pays"
$alice lnpay $request
seed=$($alice getseed) seed=$($alice getseed)
$alice stop $alice stop
mv /tmp/alice/regtest/wallets/default_wallet /tmp/alice/regtest/wallets/default_wallet.old mv /tmp/alice/regtest/wallets/default_wallet /tmp/alice/regtest/wallets/default_wallet.old
@@ -153,8 +150,9 @@ if [[ $1 == "backup" ]]; then
$alice daemon -d $alice daemon -d
$alice load_wallet $alice load_wallet
$alice import_channel_backup $backup $alice import_channel_backup $backup
$alice request_force_close $channel $alice request_force_close $channel1
wait_for_balance alice 0.989 $alice request_force_close $channel2
wait_for_balance alice 0.998
fi fi