Wallet: SetupSPKM prevent keypool generation in unit tests.

furszy · furszy · commit 7920df28ccf2 · 2020-08-02T23:03:43.000-03:00
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
@@ -7,14 +7,14 @@
 #include "crypter.h"
 #include "script/standard.h"
 
-bool ScriptPubKeyMan::SetupGeneration(bool force)
+bool ScriptPubKeyMan::SetupGeneration(bool newKeypool, bool force)
 {
     if (CanGenerateKeys() && !force) {
         return false;
     }
 
     SetHDSeed(GenerateNewSeed(), force);
-    if (!NewKeyPool()) {
+    if (newKeypool && !NewKeyPool()) {
         return false;
     }
     return true;
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
@@ -35,7 +35,7 @@ class ScriptPubKeyMan {
       * Returns false if already setup or setup fails, true if setup is successful
       * Set force=true to make it re-setup if already setup, used for upgrades
       */
-    bool SetupGeneration(bool force = false);
+    bool SetupGeneration(bool newKeypool = true, bool force = false);
 
     /** Upgrades the wallet to the specified version */
     bool Upgrade(const int& prev_version, std::string& error);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -72,7 +72,7 @@ std::string COutput::ToString() const
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool CWallet::SetupSPKM()
+bool CWallet::SetupSPKM(bool newKeypool)
 {
     if (m_spk_man->SetupGeneration()) {
         LogPrintf("%s : spkm setup completed\n", __func__);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -263,7 +263,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     static const CAmount DEFAULT_STAKE_SPLIT_THRESHOLD = 500 * COIN;
 
     //! Generates hd wallet //
-    bool SetupSPKM();
+    bool SetupSPKM(bool newKeypool = true);
     //! Whether the wallet is hd or not //
     bool IsHDEnabled() const;
 

Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,14 @@`
`7`	`7`	`#include "crypter.h"`
`8`	`8`	`#include "script/standard.h"`
`9`	`9`
`10`		`-bool ScriptPubKeyMan::SetupGeneration(bool force)`
	`10`	`+bool ScriptPubKeyMan::SetupGeneration(bool newKeypool, bool force)`
`11`	`11`	`{`
`12`	`12`	`if (CanGenerateKeys() && !force) {`
`13`	`13`	`return false;`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`SetHDSeed(GenerateNewSeed(), force);`
`17`		`- if (!NewKeyPool()) {`
	`17`	`+ if (newKeypool && !NewKeyPool()) {`
`18`	`18`	`return false;`
`19`	`19`	`}`
`20`	`20`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ std::string COutput::ToString() const`
`72`	`72`
`73`	`73`	`///////////////////////////////////////////////////////////////////////////////////////////////////`
`74`	`74`
`75`		`-bool CWallet::SetupSPKM()`
	`75`	`+bool CWallet::SetupSPKM(bool newKeypool)`
`76`	`76`	`{`
`77`	`77`	`if (m_spk_man->SetupGeneration()) {`
`78`	`78`	`LogPrintf("%s : spkm setup completed\n", __func__);`