Merge pull request #3704 from gavinandresen/wallet_lock_fixes

Wallet locking fixes for -DDEBUG_LOCKORDER
This commit is contained in:
Gavin Andresen
2014-02-24 14:39:23 -05:00
4 changed files with 31 additions and 23 deletions

View File

@@ -8,6 +8,8 @@ if [ $# -lt 1 ]; then
exit 1
fi
set -f
BITCOIND=${1}/bitcoind
CLI=${1}/bitcoin-cli
@@ -23,13 +25,13 @@ D=$(mktemp -d test.XXXXX)
D1=${D}/node1
CreateDataDir $D1 port=11000 rpcport=11001
B1ARGS="-datadir=$D1 -debug"
B1ARGS="-datadir=$D1"
$BITCOIND $B1ARGS &
B1PID=$!
D2=${D}/node2
CreateDataDir $D2 port=11010 rpcport=11011
B2ARGS="-datadir=$D2 -debug"
B2ARGS="-datadir=$D2"
$BITCOIND $B2ARGS &
B2PID=$!