diff options
author | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-08-19 18:39:08 +0200 |
---|---|---|
committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-08-19 18:39:19 +0200 |
commit | 56ac0469609ad41e0ce3f002e87bd3d006c5c953 (patch) | |
tree | 325f54d4ac1ba89f71358df0e45f0da71a91421a /src | |
parent | f4e777819c54fe0e386de517a201053698556236 (diff) | |
parent | 7e5d94df1fb09ed7ee7ed50032f876972ef39489 (diff) | |
download | bitcoin-56ac0469609ad41e0ce3f002e87bd3d006c5c953.tar.xz |
Merge #8443: [Wallet] Trivial cleanup of HD wallet changes
7e5d94d [Wallet] Trivial cleanup of HD wallet changes (Jonas Schnelli)
Diffstat (limited to 'src')
-rw-r--r-- | src/wallet/wallet.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 05bb357257..55936c0bbf 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1200,7 +1200,7 @@ CPubKey CWallet::GenerateNewHDMasterKey() // write the key&metadata to the database if (!AddKeyPubKey(key, pubkey)) - throw std::runtime_error("CWallet::GenerateNewKey(): AddKey failed"); + throw std::runtime_error(std::string(__func__)+": AddKeyPubKey failed"); } return pubkey; @@ -3324,7 +3324,6 @@ bool CWallet::InitLoadWallet() // Create new keyUser and set as default key if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) && walletInstance->hdChain.masterKeyID.IsNull()) { // generate a new master key - CKey key; CPubKey masterPubKey = walletInstance->GenerateNewHDMasterKey(); if (!walletInstance->SetHDMasterKey(masterPubKey)) throw std::runtime_error("CWallet::GenerateNewKey(): Storing master key failed"); |