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

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())));

test/functional/wallet-hd.py

@@ -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 ()