Skip to content

Commit 573bcd7

Browse files
wallet, refactor: Remove unused SetupGeneration
SetupGeneration was supposed to be the function that all SPKMs used to setup automatic generation, but it didn't work out that way and ended up being legacy only. It should be deleted at this point.
1 parent 5431f2d commit 573bcd7

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

src/wallet/scriptpubkeyman.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,6 @@ class ScriptPubKeyMan
112112
*/
113113
virtual std::vector<WalletDestination> MarkUnusedAddresses(const CScript& script) { return {}; }
114114

115-
/** Sets up the key generation stuff, i.e. generates new HD seeds and sets them as active.
116-
* Returns false if already setup or setup fails, true if setup is successful
117-
* Set force=true to make it re-setup if already setup, used for upgrades
118-
*/
119-
virtual bool SetupGeneration(bool force = false) { return false; }
120-
121115
/* Returns true if HD is enabled */
122116
virtual bool IsHDEnabled() const { return false; }
123117

src/wallet/wallet.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2870,7 +2870,6 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
28702870

28712871
if ((wallet_creation_flags & WALLET_FLAG_EXTERNAL_SIGNER) || !(wallet_creation_flags & (WALLET_FLAG_DISABLE_PRIVATE_KEYS | WALLET_FLAG_BLANK_WALLET))) {
28722872
walletInstance->SetupDescriptorScriptPubKeyMans();
2873-
// SetupDescriptorScriptPubKeyMans already calls SetupGeneration for us so we don't need to call SetupGeneration separately
28742873
}
28752874

28762875
if (chain) {

0 commit comments

Comments
 (0)