aboutsummaryrefslogtreecommitdiff
path: root/qa/rpc-tests/util.sh
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2014-02-15 16:38:28 -0500
committerGavin Andresen <gavinandresen@gmail.com>2014-02-26 11:53:51 -0500
commit93a18a3650292afbb441a47d1fa1b94aeb0164e3 (patch)
tree36382e2077820d469fd1257ee35375a86206a878 /qa/rpc-tests/util.sh
parenta16ad1c0f465935d437bd9ae9875b28be49ec65b (diff)
downloadbitcoin-93a18a3650292afbb441a47d1fa1b94aeb0164e3.tar.xz
Remove CWalletTx::vfSpent
Use the spent outpoint multimap to figure out which wallet transaction outputs are unspent, instead of a vfSpent array that is saved to disk.
Diffstat (limited to 'qa/rpc-tests/util.sh')
-rw-r--r--qa/rpc-tests/util.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/qa/rpc-tests/util.sh b/qa/rpc-tests/util.sh
index d1e4c941cc..9001c42fbc 100644
--- a/qa/rpc-tests/util.sh
+++ b/qa/rpc-tests/util.sh
@@ -41,8 +41,9 @@ function AssertEqual {
# CheckBalance -datadir=... amount account minconf
function CheckBalance {
+ declare -i EXPECT="$2"
B=$( $CLI $1 getbalance $3 $4 )
- if (( $( echo "$B == $2" | bc ) == 0 ))
+ if (( $( echo "$B == $EXPECT" | bc ) == 0 ))
then
echoerr "bad balance: $B (expected $2)"
exit 1
@@ -87,5 +88,5 @@ function SendRawTxn {
# Use: GetBlocks <datadir>
# returns number of blocks from getinfo
function GetBlocks {
- ExtractKey blocks "$( $CLI $1 getinfo )"
+ $CLI $1 getblockcount
}