aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorJonas Schnelli <dev@jonasschnelli.ch>2016-08-01 15:18:15 +0200
committerJonas Schnelli <dev@jonasschnelli.ch>2016-08-19 16:23:37 +0200
commit7e5d94df1fb09ed7ee7ed50032f876972ef39489 (patch)
tree95b287c2d39892976669f7d31fbca1cfbfa26354 /src/wallet
parentea268747b6d417a406977e9b4931badce29b9d7a (diff)
downloadbitcoin-7e5d94df1fb09ed7ee7ed50032f876972ef39489.tar.xz
[Wallet] Trivial cleanup of HD wallet changes
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/wallet.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index ee9254050c..e2dea52121 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;
@@ -3323,7 +3323,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");