diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-01-26 20:52:57 +0100 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-03-24 10:28:40 +0100 |
| commit | 1090502c3e90f3f24fdc6c1e74f62d7669697b31 (patch) | |
| tree | a07502ec24d9c5451056ffb2c628850e7ee0d3c9 | |
| parent | 58e148333eb4b7ad87154a8b4d45ff0ebc3c9591 (diff) | |
| download | bitcoin-1090502c3e90f3f24fdc6c1e74f62d7669697b31.tar.xz | |
Fix superfluous cast and code style nits in RPC wallet-hd.py test
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 3 | ||||
| -rwxr-xr-x | test/functional/wallet-hd.py | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 62aefc4bc2..c715da8e9f 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -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()))); diff --git a/test/functional/wallet-hd.py b/test/functional/wallet-hd.py index b17f788433..64a6c92782 100755 --- a/test/functional/wallet-hd.py +++ b/test/functional/wallet-hd.py @@ -42,7 +42,7 @@ class WalletHDTest(BitcoinTestFramework): masterkeyid = self.nodes[1].getwalletinfo()['hdmasterkeyid'] assert_equal(len(masterkeyid), 40) - #create an internal key + # create an internal key change_addr = self.nodes[1].getrawchangeaddress() change_addrV= self.nodes[1].validateaddress(change_addr); assert_equal(change_addrV["hdkeypath"], "m/0'/1'/0'") #first internal child key @@ -70,7 +70,7 @@ class WalletHDTest(BitcoinTestFramework): self.nodes[0].sendtoaddress(non_hd_add, 1) self.nodes[0].generate(1) - #create an internal key (again) + # create an internal key (again) change_addr = self.nodes[1].getrawchangeaddress() change_addrV= self.nodes[1].validateaddress(change_addr); assert_equal(change_addrV["hdkeypath"], "m/0'/1'/1'") #second internal child key @@ -100,7 +100,7 @@ class WalletHDTest(BitcoinTestFramework): #connect_nodes_bi(self.nodes, 0, 1) assert_equal(self.nodes[1].getbalance(), num_hd_adds + 1) - #send a tx and make sure its using the internal chain for the changeoutput + # send a tx and make sure its using the internal chain for the changeoutput txid = self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1) outs = self.nodes[1].decoderawtransaction(self.nodes[1].gettransaction(txid)['hex'])['vout']; keypath = "" @@ -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 () |