lukechilds
/
electrum
mirror of https://github.com/lukechilds/electrum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

tests/regtest: stop using "bitcoin-cli generate" (deprecated)

dependabot/pip/contrib/deterministic-build/ecdsa-0.13.3
SomberNight 6 years ago
committed by ThomasV
parent
84c6a464e8
commit
60cd885f74
2 changed files with 15 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      electrum/tests/regtest/regtest.sh
  2. 2
      electrum/tests/regtest/start_bitcoind.sh

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

@ -8,6 +8,8 @@ alice="./run_electrum --regtest --lightning -D /tmp/alice"
bob="./run_electrum --regtest --lightning -D /tmp/bob" bob="./run_electrum --regtest --lightning -D /tmp/bob"
carol="./run_electrum --regtest --lightning -D /tmp/carol" carol="./run_electrum --regtest --lightning -D /tmp/carol"
bitcoin_cli="bitcoin-cli -rpcuser=doggman -rpcpassword=donkey -rpcport=18554 -regtest"
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
@ -19,9 +21,9 @@ if [[ $1 == "init" ]]; then
$bob create > /dev/null $bob create > /dev/null
$carol create > /dev/null $carol create > /dev/null
$bob setconfig lightning_listen localhost:9735 $bob setconfig lightning_listen localhost:9735
bitcoin-cli -regtest sendtoaddress $($alice getunusedaddress) 1 $bitcoin_cli sendtoaddress $($alice getunusedaddress) 1
bitcoin-cli -regtest sendtoaddress $($carol getunusedaddress) 1 $bitcoin_cli sendtoaddress $($carol getunusedaddress) 1
bitcoin-cli -regtest generate 1 > /dev/null $bitcoin_cli generatetoaddress 1 $($bitcoin_cli getnewaddress) > /dev/null
fi fi
# start daemons. Bob is started first because he is listening # start daemons. Bob is started first because he is listening
@ -46,7 +48,7 @@ if [[ $1 == "open" ]]; then
channel_id1=$($alice open_channel $bob_node 0.001 --channel_push 0.001) channel_id1=$($alice open_channel $bob_node 0.001 --channel_push 0.001)
channel_id2=$($carol open_channel $bob_node 0.001 --channel_push 0.001) channel_id2=$($carol open_channel $bob_node 0.001 --channel_push 0.001)
echo "mining 3 blocks" echo "mining 3 blocks"
bitcoin-cli -regtest generate 3 $bitcoin_cli generatetoaddress 3 $($bitcoin_cli getnewaddress)
sleep 10 # time for channelDB sleep 10 # time for channelDB
fi fi
@ -66,7 +68,7 @@ if [[ $1 == "close" ]]; then
$alice close_channel $chan1 $alice close_channel $chan1
$carol close_channel $chan2 $carol close_channel $chan2
echo "mining 1 block" echo "mining 1 block"
bitcoin-cli -regtest generate 1 $bitcoin_cli generatetoaddress 1 $($bitcoin_cli getnewaddress)
fi fi
if [[ $1 == "breach" ]]; then if [[ $1 == "breach" ]]; then
@ -74,13 +76,13 @@ if [[ $1 == "breach" ]]; then
channel=$($alice open_channel $bob_node 0.15) channel=$($alice open_channel $bob_node 0.15)
sleep 3 sleep 3
ctx=$($alice get_channel_ctx $channel | jq '.hex' | tr -d '"') ctx=$($alice get_channel_ctx $channel | jq '.hex' | tr -d '"')
bitcoin-cli generate 6 > /dev/null $bitcoin_cli generatetoaddress 6 $($bitcoin_cli getnewaddress) > /dev/null
sleep 10 sleep 10
request=$($bob addinvoice 0.01 "blah") request=$($bob addinvoice 0.01 "blah")
$alice lnpay $request $alice lnpay $request
bitcoin-cli sendrawtransaction $ctx $bitcoin_cli sendrawtransaction $ctx
sleep 12 sleep 12
bitcoin-cli generate 2 > /dev/null $bitcoin_cli generatetoaddress 2 $($bitcoin_cli getnewaddress) > /dev/null
sleep 12 sleep 12
balance=$($bob getbalance | jq '.confirmed | tonumber') balance=$($bob getbalance | jq '.confirmed | tonumber')
echo "balance of bob after breach: $balance" echo "balance of bob after breach: $balance"
@ -97,7 +99,7 @@ if [[ $1 == "redeem_htlcs" ]]; then
# alice opens channel # alice opens channel
bob_node=$($bob nodeid) bob_node=$($bob nodeid)
$alice open_channel $bob_node 0.15 $alice open_channel $bob_node 0.15
bitcoin-cli generate 6 > /dev/null $bitcoin_cli generatetoaddress 6 $($bitcoin_cli getnewaddress) > /dev/null
sleep 10 sleep 10
# alice pays bob # alice pays bob
invoice=$($bob addinvoice 0.05 "test") invoice=$($bob addinvoice 0.05 "test")
@ -115,12 +117,12 @@ if [[ $1 == "redeem_htlcs" ]]; then
# alice force closes the channel # alice force closes the channel
chan_id=$($alice list_channels | jq -r ".[0].channel_point") chan_id=$($alice list_channels | jq -r ".[0].channel_point")
$alice close_channel $chan_id --force $alice close_channel $chan_id --force
bitcoin-cli generate 1 > /dev/null $bitcoin_cli generatetoaddress 1 $($bitcoin_cli getnewaddress) > /dev/null
sleep 5 sleep 5
echo "alice balance after closing channel:" $($alice getbalance) echo "alice balance after closing channel:" $($alice getbalance)
bitcoin-cli generate 144 > /dev/null $bitcoin_cli generatetoaddress 144 $($bitcoin_cli getnewaddress) > /dev/null
sleep 10 sleep 10
bitcoin-cli generate 1 > /dev/null $bitcoin_cli generatetoaddress 1 $($bitcoin_cli getnewaddress) > /dev/null
sleep 10 sleep 10
echo "alice balance after 144 blocks:" $($alice getbalance) echo "alice balance after 144 blocks:" $($alice getbalance)
balance_after=$($alice getbalance | jq '[.confirmed, .unconfirmed] | to_entries | map(select(.value != null).value) | map(tonumber) | add ') balance_after=$($alice getbalance | jq '[.confirmed, .unconfirmed] | to_entries | map(select(.value != null).value) | map(tonumber) | add ')

2
electrum/tests/regtest/start_bitcoind.sh
View File

@ -17,7 +17,7 @@ rpcport=18554
EOF EOF
rm -rf ~/.bitcoin/regtest rm -rf ~/.bitcoin/regtest
screen -S bitcoind -X quit || true screen -S bitcoind -X quit || true
screen -S bitcoind -m -d bitcoind -regtest -deprecatedrpc=generate screen -S bitcoind -m -d bitcoind -regtest
sleep 6 sleep 6
addr=$(bitcoin-cli getnewaddress) addr=$(bitcoin-cli getnewaddress)
bitcoin-cli generatetoaddress 150 $addr > /dev/null bitcoin-cli generatetoaddress 150 $addr > /dev/null

Write Preview
Loading…
Cancel
Save