BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix superfluous cast and code style nits in RPC wallet-hd.py test

This commit is contained in:
Jonas Schnelli 2017-01-26 20:52:57 +01:00
parent 58e148333e
commit 1090502c3e
No known key found for this signature in database
GPG Key ID: 1EB776BB03C7922D
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wallet/rpcwallet.cpp
View File

@ -2438,7 +2438,8 @@ UniValue getwalletinfo(const JSONRPCRequest& request)
LOCK2(cs_main, pwallet->cs_wallet);
UniValue obj(UniValue::VOBJ);
size_t kpExternalSize = (int)pwallet->KeypoolCountExternalKeys();
size_t kpExternalSize = pwalletMain->KeypoolCountExternalKeys();
obj.push_back(Pair("walletversion", pwallet->GetVersion()));
obj.push_back(Pair("balance", ValueFromAmount(pwallet->GetBalance())));
obj.push_back(Pair("unconfirmed_balance", ValueFromAmount(pwallet->GetUnconfirmedBalance())));

2
test/functional/wallet-hd.py
View File

@ -108,7 +108,7 @@ class WalletHDTest(BitcoinTestFramework):
if out['value'] != 1:
keypath = self.nodes[1].validateaddress(out['scriptPubKey']['addresses'][0])['hdkeypath']
assert(keypath[0:7] == "m/0'/1'")
assert_equal(keypath[0:7], "m/0'/1'")
if __name__ == '__main__':
WalletHDTest().main ()