(Partial) Merge bitcoin#15492: [rpc] remove deprecated generate method

MarcoFalke · vijaydasmp · commit 8946b234a8ea · 2021-11-13T16:58:59.000+05:30
07cae52 [wallet] remove unused GetScriptForMining (Sjors Provoost) 8bb3e4c [rpc] remove deprecated generate method (Sjors Provoost) Pull request description: As announced in v0.18, the wallet generate rpc method is deprecated and will be fully removed in v0.19. Clients should transition to using the node rpc method `generatetoaddress`. Tree-SHA512: 9e5e913b59f3e18440b2b7b356124c7b87ad19f81a1ab6ada06a6c396b84e734895465f569296f1ba8c12abf74863bab5fd77765c9e806c239713aa83a59485f
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4600,17 +4600,6 @@ void CWallet::MarkReserveKeysAsUsed(int64_t keypool_id)
     }
 }
 
-void CWallet::GetScriptForMining(std::shared_ptr<CReserveScript> &script)
-{
-    std::shared_ptr<CReserveKey> rKey = std::make_shared<CReserveKey>(this);
-    CPubKey pubkey;
-    if (!rKey->GetReservedKey(pubkey, false))
-        return;
-
-    script = rKey;
-    script->reserveScript = CScript() << ToByteVector(pubkey) << OP_CHECKSIG;
-}
-
 void CWallet::LockCoin(const COutPoint& output)
 {
     AssertLockHeld(cs_wallet); // setLockedCoins
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -1148,8 +1148,6 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface
 
     const std::string& GetLabelName(const CScript& scriptPubKey) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
 
-    void GetScriptForMining(std::shared_ptr<CReserveScript> &script);
-
     unsigned int GetKeyPoolSize() EXCLUSIVE_LOCKS_REQUIRED(cs_wallet)
     {
         AssertLockHeld(cs_wallet); // set{Ex,In}ternalKeyPool

Original file line number	Diff line number	Diff line change
`@@ -4600,17 +4600,6 @@ void CWallet::MarkReserveKeysAsUsed(int64_t keypool_id)`
`4600`	`4600`	`}`
`4601`	`4601`	`}`
`4602`	`4602`
`4603`		`-void CWallet::GetScriptForMining(std::shared_ptr<CReserveScript> &script)`
`4604`		`-{`
`4605`		`- std::shared_ptr<CReserveKey> rKey = std::make_shared<CReserveKey>(this);`
`4606`		`- CPubKey pubkey;`
`4607`		`- if (!rKey->GetReservedKey(pubkey, false))`
`4608`		`- return;`
`4609`		`-`
`4610`		`- script = rKey;`
`4611`		`- script->reserveScript = CScript() << ToByteVector(pubkey) << OP_CHECKSIG;`
`4612`		`-}`
`4613`		`-`
`4614`	`4603`	`void CWallet::LockCoin(const COutPoint& output)`
`4615`	`4604`	`{`
`4616`	`4605`	`AssertLockHeld(cs_wallet); // setLockedCoins`
Original file line number	Diff line number	Diff line change
`@@ -1148,8 +1148,6 @@ class CWallet final : public CCryptoKeyStore, public CValidationInterface`
`1148`	`1148`
`1149`	`1149`	`const std::string& GetLabelName(const CScript& scriptPubKey) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);`
`1150`	`1150`
`1151`		`- void GetScriptForMining(std::shared_ptr<CReserveScript> &script);`
`1152`		`-`
`1153`	`1151`	`unsigned int GetKeyPoolSize() EXCLUSIVE_LOCKS_REQUIRED(cs_wallet)`
`1154`	`1152`	`{`
`1155`	`1153`	`AssertLockHeld(cs_wallet); // set{Ex,In}ternalKeyPool`