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

test: detect segwit correctly, assume master branch.

Browse Source 
Segwit was merged, but the strings changed between there and segwit4
(also, my BIP9 patch changed the output).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-06-25 14:07:47 +09:30
parent 1dbe001fdc
commit 2436207a7a
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -15,9 +15,6 @@ advertise their IP addresses, publish routes and fees, and use that
information to pay specific nodes. These details are currently being information to pay specific nodes. These details are currently being
hashed out on the [mailing list](https://lists.linuxfoundation.org/mailman/listinfo/lightning-dev) and the IRC channel [#lightning-dev](https://botbot.me/freenode/lightning-dev/) on Freenode. hashed out on the [mailing list](https://lists.linuxfoundation.org/mailman/listinfo/lightning-dev) and the IRC channel [#lightning-dev](https://botbot.me/freenode/lightning-dev/) on Freenode.
The protocol requires features not currently in bitcoin, so you will need
Pieter Wuille's Segregated Witness bitcoind: https://github.com/sipa/bitcoin/tree/segwit4
Final note: This is very much a testbed and work in progress; expect Final note: This is very much a testbed and work in progress; expect
All The Things to change, all the time. All The Things to change, all the time.

2
daemon/test/scripts/generate-block.sh
View File

@@ -10,7 +10,7 @@ INIT=$1
if [ -n "$INIT" ]; then if [ -n "$INIT" ]; then
# To activate segwit via BIP9, we need at least 432 blocks! # To activate segwit via BIP9, we need at least 432 blocks!
$CLI generate 432 $CLI generate 432
if $CLI getblockchaininfo | tr -s '\012\011 ' ' ' | grep -q '{ "id": "witness", "status": "active" }'; then : if $CLI getblockchaininfo | tr -s '\012\011 ' ' ' | grep -q '"segwit": { "status": "active",'; then :
else else
echo "Segwit not activated after 432 blocks?" >&2 echo "Segwit not activated after 432 blocks?" >&2
$CLI getblockchaininfo >&2 $CLI getblockchaininfo >&2

4
daemon/test/scripts/setup.sh
View File

@@ -29,10 +29,10 @@ while ! $CLI getinfo >/dev/null 2>&1; do
done done
# Make sure they have segwit support! # Make sure they have segwit support!
if $CLI getblockchaininfo | grep -q '"witness"'; then : if $CLI getblockchaininfo | grep -q '"segwit"'; then :
else else
echo This bitcoind does not have segwit support. >&2 echo This bitcoind does not have segwit support. >&2
echo Please install one from https://github.com/sipa/bitcoin/tree/segwit4 >&2 echo Please install a recent one >&2
exit 1 exit 1
fi fi