LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve regtest.sh with wait functions

Browse source
This commit is contained in:
ThomasV 2019-07-03 08:40:18 +02:00
parent 6b90d501ab
commit 4d76e84218
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
electrum/tests/regtest/regtest.sh
View file

@ -15,6 +15,22 @@ function new_blocks()
$bitcoin_cli generatetoaddress $1 $($bitcoin_cli getnewaddress) > /dev/null $bitcoin_cli generatetoaddress $1 $($bitcoin_cli getnewaddress) > /dev/null
} }
function wait_until_funded()
{
while alice_balance=$($alice getbalance | jq '.confirmed' | tr -d '"') && [ $alice_balance != "1" ]; do
echo "waiting for alice balance"
sleep 1
done
}
function wait_until_channel_open()
{
while channel_state=$($alice list_channels | jq '.[] | .state' | tr -d '"') && [ $channel_state != "OPEN" ]; do
echo "waiting for channel open"
sleep 1
done
}
if [[ $# -eq 0 ]]; then if [[ $# -eq 0 ]]; then
echo "syntax: init|start|open|status|pay|close|stop" echo "syntax: init|start|open|status|pay|close|stop"
exit 1 exit 1
@ -87,8 +103,8 @@ fi
if [[ $1 == "breach" ]]; then if [[ $1 == "breach" ]]; then
bob_node=$($bob nodeid) bob_node=$($bob nodeid)
channel=$($alice open_channel $bob_node 0.15) channel=$($alice open_channel $bob_node 0.15)
new_blocks 6 new_blocks 3
sleep 10 wait_until_channel_open
request=$($bob addinvoice 0.01 "blah") request=$($bob addinvoice 0.01 "blah")
echo "alice pays" echo "alice pays"
$alice lnpay $request $alice lnpay $request
@ -161,19 +177,12 @@ if [[ $1 == "breach_with_unspent_htlc" ]]; then
$bob daemon stop $bob daemon stop
ELECTRUM_DEBUG_LIGHTNING_SETTLE_DELAY=3 $bob daemon -s 127.0.0.1:51001:t start ELECTRUM_DEBUG_LIGHTNING_SETTLE_DELAY=3 $bob daemon -s 127.0.0.1:51001:t start
$bob daemon load_wallet $bob daemon load_wallet
while alice_balance=$($alice getbalance | jq '.confirmed' | tr -d '"') && [ $alice_balance != "1" ]; do wait_until_funded
echo "waiting for alice balance"
sleep 1
done
echo "alice opens channel" echo "alice opens channel"
bob_node=$($bob nodeid) bob_node=$($bob nodeid)
channel=$($alice open_channel $bob_node 0.15) channel=$($alice open_channel $bob_node 0.15)
new_blocks 3 new_blocks 3
channel_state="" wait_until_channel_open
while channel_state=$($alice list_channels | jq '.[] | .state' | tr -d '"') && [ $channel_state != "OPEN" ]; do
echo "waiting for channel open"
sleep 1
done
echo "alice pays bob" echo "alice pays bob"
invoice=$($bob addinvoice 0.05 "test") invoice=$($bob addinvoice 0.05 "test")
$alice lnpay $invoice --timeout=1 || true $alice lnpay $invoice --timeout=1 || true
@ -224,19 +233,12 @@ if [[ $1 == "breach_with_spent_htlc" ]]; then
$bob daemon stop $bob daemon stop
ELECTRUM_DEBUG_LIGHTNING_SETTLE_DELAY=3 $bob daemon -s 127.0.0.1:51001:t start ELECTRUM_DEBUG_LIGHTNING_SETTLE_DELAY=3 $bob daemon -s 127.0.0.1:51001:t start
$bob daemon load_wallet $bob daemon load_wallet
while alice_balance=$($alice getbalance | jq '.confirmed' | tr -d '"') && [ $alice_balance != "1" ]; do wait_until_funded
echo "waiting for alice balance"
sleep 1
done
echo "alice opens channel" echo "alice opens channel"
bob_node=$($bob nodeid) bob_node=$($bob nodeid)
channel=$($alice open_channel $bob_node 0.15) channel=$($alice open_channel $bob_node 0.15)
new_blocks 3 new_blocks 3
channel_state="" wait_until_channel_open
while channel_state=$($alice list_channels | jq '.[] | .state' | tr -d '"') && [ $channel_state != "OPEN" ]; do
echo "waiting for channel open"
sleep 1
done
echo "alice pays bob" echo "alice pays bob"
invoice=$($bob addinvoice 0.05 "test") invoice=$($bob addinvoice 0.05 "test")
$alice lnpay $invoice --timeout=1 || true $alice lnpay $invoice --timeout=1 || true