aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Schnelli <dev@jonasschnelli.ch>2016-07-15 10:34:08 +0200
committerJonas Schnelli <dev@jonasschnelli.ch>2016-07-15 10:34:08 +0200
commit7945088d413819d8cf1772fd25e0f355c84c64d6 (patch)
treec9e12d68fcedec95562353802e7eac48b6cc6c31
parent68d7682b9f8c0f548e0a9ef03296320b8ae3960d (diff)
downloadbitcoin-7945088d413819d8cf1772fd25e0f355c84c64d6.tar.xz
[Wallet] comsetic non-code changes for the HD feature
-rwxr-xr-xqa/rpc-tests/wallet-hd.py4
-rw-r--r--src/wallet/rpcwallet.cpp4
-rw-r--r--src/wallet/wallet.h6
-rw-r--r--src/wallet/walletdb.h4
4 files changed, 9 insertions, 9 deletions
diff --git a/qa/rpc-tests/wallet-hd.py b/qa/rpc-tests/wallet-hd.py
index f3ae69e106..c738ee2207 100755
--- a/qa/rpc-tests/wallet-hd.py
+++ b/qa/rpc-tests/wallet-hd.py
@@ -47,10 +47,10 @@ class WalletHDTest(BitcoinTestFramework):
self.nodes[0].generate(101)
hd_add = None
num_hd_adds = 300
- for _ in range(num_hd_adds):
+ for i in range(num_hd_adds):
hd_add = self.nodes[1].getnewaddress()
hd_info = self.nodes[1].validateaddress(hd_add)
- assert_equal(hd_info["hdkeypath"], "m/0'/0'/"+str(_+1)+"'")
+ assert_equal(hd_info["hdkeypath"], "m/0'/0'/"+str(i+1)+"'")
assert_equal(hd_info["hdmasterkeyid"], masterkeyid)
self.nodes[0].sendtoaddress(hd_add, 1)
self.nodes[0].generate(1)
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index f4625743b3..960d193e5d 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2269,7 +2269,7 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp)
" \"keypoolsize\": xxxx, (numeric) how many new keys are pre-generated\n"
" \"unlocked_until\": ttt, (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
" \"paytxfee\": x.xxxx, (numeric) the transaction fee configuration, set in " + CURRENCY_UNIT + "/kB\n"
- " \"masterkeyid\": \"<hash160>\", (string) the Hash160 of the hd master pubkey\n"
+ " \"masterkeyid\": \"<hash160>\", (string) the Hash160 of the HD master pubkey\n"
"}\n"
"\nExamples:\n"
+ HelpExampleCli("getwalletinfo", "")
@@ -2291,7 +2291,7 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp)
obj.push_back(Pair("paytxfee", ValueFromAmount(payTxFee.GetFeePerK())));
CKeyID masterKeyID = pwalletMain->GetHDChain().masterKeyID;
if (!masterKeyID.IsNull())
- obj.push_back(Pair("masterkeyid",masterKeyID.GetHex()));
+ obj.push_back(Pair("masterkeyid", masterKeyID.GetHex()));
return obj;
}
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index d58cb7b0e4..e9d669a7d1 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -577,7 +577,7 @@ private:
void SyncMetaData(std::pair<TxSpends::iterator, TxSpends::iterator>);
- /* the hd chain data model (external chain counters) */
+ /* the HD chain data model (external chain counters) */
CHDChain hdChain;
public:
@@ -896,10 +896,10 @@ public:
bool BackupWallet(const std::string& strDest);
- /* Set the hd chain model (chain child index counters) */
+ /* Set the HD chain model (chain child index counters) */
bool SetHDChain(const CHDChain& chain, bool memonly);
- /* Set the current hd master key (will reset the chain child index counters) */
+ /* Set the current HD master key (will reset the chain child index counters) */
bool SetHDMasterKey(const CKey& key);
const CHDChain& GetHDChain() { return hdChain; }
};
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 42179f2288..5addd5c5c0 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -41,7 +41,7 @@ enum DBErrors
DB_NEED_REWRITE
};
-/* simple hd chain data model */
+/* simple HD chain data model */
class CHDChain
{
public:
@@ -79,7 +79,7 @@ public:
int nVersion;
int64_t nCreateTime; // 0 means unknown
std::string hdKeypath; //optional HD/bip32 keypath
- CKeyID hdMasterKeyID; //id of the hd masterkey used to derive this key
+ CKeyID hdMasterKeyID; //id of the HD masterkey used to derive this key
CKeyMetadata()
{