@@ -72,6 +72,9 @@ server_sleep_til_boot() {
72
72
client_sleep_til_boot () {
73
73
while ! client_rpc ping > /dev/null 2>&1 ; do sleep 0.1; done
74
74
}
75
+ server_sleep_til_shutdown () {
76
+ while server_rpc ping > /dev/null 2>&1 ; do sleep 0.1; done
77
+ }
75
78
76
79
mkdir -p " $SERVER_DATADIR " " $CLIENT_DATADIR "
77
80
@@ -109,7 +112,7 @@ echo "-- IBDing the blocks (height=$BASE_HEIGHT) required to the server node..."
109
112
110
113
echo
111
114
echo " -- Creating snapshot at ~ height $BASE_HEIGHT ($UTXO_DAT_FILE )..."
112
- sleep 2
115
+ server_sleep_til_shutdown # wait for stopatheight to be hit
113
116
./src/bitcoind -logthreadnames=1 $SERVER_PORTS \
114
117
-datadir=" $SERVER_DATADIR " $EARLY_IBD_FLAGS -connect=0 -listen=0 > /dev/null &
115
118
SERVER_PID=" $! "
@@ -124,8 +127,7 @@ RPC_AU=$(jq -r .txoutset_hash < "$DUMP_OUTPUT")
124
127
RPC_NCHAINTX=$( jq -r .nchaintx < " $DUMP_OUTPUT " )
125
128
RPC_BLOCKHASH=$( jq -r .base_hash < " $DUMP_OUTPUT " )
126
129
127
- # Wait for server to shutdown...
128
- while server_rpc ping > /dev/null 2>&1 ; do sleep 0.1; done
130
+ server_sleep_til_shutdown
129
131
130
132
echo
131
133
echo " -- Now: add the following to CMainParams::m_assumeutxo_data"
@@ -186,9 +188,7 @@ echo " Press CTRL+C after you're satisfied to exit the demo"
186
188
echo
187
189
read -p " Press [enter] to continue"
188
190
189
- while kill -0 " $CLIENT_PID " ; do
190
- sleep 1
191
- done
191
+ client_sleep_til_boot
192
192
./src/bitcoind $CLIENT_PORTS $ALL_INDEXES -logthreadnames=1 -datadir=" $CLIENT_DATADIR " -connect=0 \
193
193
-addnode=127.0.0.1:$SERVER_PORT " $EARLY_IBD_FLAGS " > /dev/null &
194
194
CLIENT_PID=" $! "
0 commit comments