tfollow-up 17a893441a88eb1b3bc89fd960edfc28140e266f: fix regtest - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 8eaf0004e1bc78740b95f0daa2a0512a5ca2fe12
DIR parent 8480989fb7ec824f87553458d1b5fb2d7c43af08
HTML Author: ThomasV <thomasv@electrum.org>
Date: Fri, 6 Mar 2020 10:26:11 +0100
follow-up 17a893441a88eb1b3bc89fd960edfc28140e266f: fix regtest
Diffstat:
M electrum/tests/regtest/regtest.sh | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
---
DIR diff --git a/electrum/tests/regtest/regtest.sh b/electrum/tests/regtest/regtest.sh
t@@ -172,8 +172,8 @@ if [[ $1 == "redeem_htlcs" ]]; then
# alice pays bob
invoice=$($bob add_lightning_request 0.05 -m "test")
$alice lnpay $invoice --timeout=1 || true
- settled=$($alice list_channels | jq '.[] | .local_htlcs | .settles | length')
- if [[ "$settled" != "0" ]]; then
+ unsettled=$($alice list_channels | jq '.[] | .local_unsettled_sent')
+ if [[ "$unsettled" == "0" ]]; then
echo 'enable_htlc_settle did not work'
exit 1
fi
t@@ -214,16 +214,16 @@ if [[ $1 == "breach_with_unspent_htlc" ]]; then
echo "alice pays bob"
invoice=$($bob add_lightning_request 0.05 -m "test")
$alice lnpay $invoice --timeout=1 || true
- settled=$($alice list_channels | jq '.[] | .local_htlcs | .settles | length')
- if [[ "$settled" != "0" ]]; then
- echo "enable_htlc_settle did not work, $settled != 0"
+ unsettled=$($alice list_channels | jq '.[] | .local_unsettled_sent')
+ if [[ "$unsettled" == "0" ]]; then
+ echo "enable_htlc_settle did not work, $unsettled"
exit 1
fi
ctx=$($alice get_channel_ctx $channel --iknowwhatimdoing)
$bob enable_htlc_settle true
- settled=$($alice list_channels | jq '.[] | .local_htlcs | .settles | length')
- if [[ "$settled" != "1" ]]; then
- echo "enable_htlc_settle did not work, $settled != 1"
+ unsettled=$($alice list_channels | jq '.[] | .local_unsettled_sent')
+ if [[ "$unsettled" != "0" ]]; then
+ echo "enable_htlc_settle did not work, $unsettled"
exit 1
fi
echo "alice breaches with old ctx"
t@@ -244,16 +244,16 @@ if [[ $1 == "breach_with_spent_htlc" ]]; then
invoice=$($bob add_lightning_request 0.05 -m "test")
$alice lnpay $invoice --timeout=1 || true
ctx=$($alice get_channel_ctx $channel --iknowwhatimdoing)
- settled=$($alice list_channels | jq '.[] | .local_htlcs | .settles | length')
- if [[ "$settled" != "0" ]]; then
- echo "enable_htlc_settle did not work, $settled != 0"
+ unsettled=$($alice list_channels | jq '.[] | .local_unsettled_sent')
+ if [[ "$unsettled" == "0" ]]; then
+ echo "enable_htlc_settle did not work, $unsettled"
exit 1
fi
cp /tmp/alice/regtest/wallets/default_wallet /tmp/alice/regtest/wallets/toxic_wallet
$bob enable_htlc_settle true
- settled=$($alice list_channels | jq '.[] | .local_htlcs | .settles | length')
- if [[ "$settled" != "1" ]]; then
- echo "enable_htlc_settle did not work, $settled != 1"
+ unsettled=$($alice list_channels | jq '.[] | .local_unsettled_sent')
+ if [[ "$unsettled" != "0" ]]; then
+ echo "enable_htlc_settle did not work, $unsettled"
exit 1
fi
echo $($bob getbalance)