Merge #8443: [Wallet] Trivial cleanup of HD wallet changes
7e5d94d
[Wallet] Trivial cleanup of HD wallet changes (Jonas Schnelli)
This commit is contained in:
commit
56ac046960
1 changed files with 1 additions and 2 deletions
|
@ -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");
|
||||
|
|
Loading…
Reference in a new issue