Use std::shared_ptr instead of boost::shared_ptr in ScriptForMining

TheBlueMatt · TheBlueMatt · commit 1c95e2f9c94f · 2017-04-07T11:53:43.000+02:00
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -27,7 +27,6 @@
 #include <stdint.h>
 
 #include <boost/assign/list_of.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include <univalue.h>
 
@@ -95,7 +94,7 @@ UniValue getnetworkhashps(const JSONRPCRequest& request)
     return GetNetworkHashPS(request.params.size() > 0 ? request.params[0].get_int() : 120, request.params.size() > 1 ? request.params[1].get_int() : -1);
 }
 
-UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nGenerate, uint64_t nMaxTries, bool keepScript)
+UniValue generateBlocks(std::shared_ptr<CReserveScript> coinbaseScript, int nGenerate, uint64_t nMaxTries, bool keepScript)
 {
     static const int nInnerLoopCount = 0x10000;
     int nHeightStart = 0;
@@ -167,7 +166,7 @@ UniValue generate(const JSONRPCRequest& request)
         nMaxTries = request.params[1].get_int();
     }
 
-    boost::shared_ptr<CReserveScript> coinbaseScript;
+    std::shared_ptr<CReserveScript> coinbaseScript;
     GetMainSignals().ScriptForMining(coinbaseScript);
 
     // If the keypool is exhausted, no script is returned at all.  Catch this.
@@ -208,7 +207,7 @@ UniValue generatetoaddress(const JSONRPCRequest& request)
     if (!address.IsValid())
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Error: Invalid address");
 
-    boost::shared_ptr<CReserveScript> coinbaseScript(new CReserveScript());
+    std::shared_ptr<CReserveScript> coinbaseScript = std::make_shared<CReserveScript>();
     coinbaseScript->reserveScript = GetScriptForDestination(address.Get());
 
     return generateBlocks(coinbaseScript, nGenerate, nMaxTries, false);
diff --git a/src/validationinterface.h b/src/validationinterface.h
@@ -7,7 +7,6 @@
 #define BITCOIN_VALIDATIONINTERFACE_H
 
 #include <boost/signals2/signal.hpp>
-#include <boost/shared_ptr.hpp>
 #include <memory>
 
 #include "primitives/transaction.h" // CTransaction(Ref)
@@ -42,7 +41,7 @@ class CValidationInterface {
     virtual void Inventory(const uint256 &hash) {}
     virtual void ResendWalletTransactions(int64_t nBestBlockTime, CConnman* connman) {}
     virtual void BlockChecked(const CBlock&, const CValidationState&) {}
-    virtual void GetScriptForMining(boost::shared_ptr<CReserveScript>&) {};
+    virtual void GetScriptForMining(std::shared_ptr<CReserveScript>&) {};
     virtual void NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& block) {};
     friend void ::RegisterValidationInterface(CValidationInterface*);
     friend void ::UnregisterValidationInterface(CValidationInterface*);
@@ -77,7 +76,7 @@ struct CMainSignals {
      */
     boost::signals2::signal<void (const CBlock&, const CValidationState&)> BlockChecked;
     /** Notifies listeners that a key for mining is required (coinbase) */
-    boost::signals2::signal<void (boost::shared_ptr<CReserveScript>&)> ScriptForMining;
+    boost::signals2::signal<void (std::shared_ptr<CReserveScript>&)> ScriptForMining;
     /**
      * Notifies listeners that a block which builds directly on our current tip
      * has been received and connected to the headers tree, though not validated yet */
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3376,9 +3376,9 @@ void CWallet::UpdatedTransaction(const uint256 &hashTx)
     }
 }
 
-void CWallet::GetScriptForMining(boost::shared_ptr<CReserveScript> &script)
+void CWallet::GetScriptForMining(std::shared_ptr<CReserveScript> &script)
 {
-    boost::shared_ptr<CReserveKey> rKey(new CReserveKey(this));
+    std::shared_ptr<CReserveKey> rKey = std::make_shared<CReserveKey>(this);
     CPubKey pubkey;
     if (!rKey->GetReservedKey(pubkey))
         return;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -28,8 +28,6 @@
 #include <utility>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-
 extern CWallet* pwalletMain;
 
 /**
@@ -963,7 +961,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
         }
     }
 
-    void GetScriptForMining(boost::shared_ptr<CReserveScript> &script) override;
+    void GetScriptForMining(std::shared_ptr<CReserveScript> &script) override;
     
     unsigned int GetKeyPoolSize()
     {

Original file line number	Diff line number	Diff line change
`@@ -3376,9 +3376,9 @@ void CWallet::UpdatedTransaction(const uint256 &hashTx)`
`3376`	`3376`	`}`
`3377`	`3377`	`}`
`3378`	`3378`
`3379`		`-void CWallet::GetScriptForMining(boost::shared_ptr<CReserveScript> &script)`
	`3379`	`+void CWallet::GetScriptForMining(std::shared_ptr<CReserveScript> &script)`
`3380`	`3380`	`{`
`3381`		`- boost::shared_ptr<CReserveKey> rKey(new CReserveKey(this));`
	`3381`	`+ std::shared_ptr<CReserveKey> rKey = std::make_shared<CReserveKey>(this);`
`3382`	`3382`	`CPubKey pubkey;`
`3383`	`3383`	`if (!rKey->GetReservedKey(pubkey))`
`3384`	`3384`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@`
`28`	`28`	`#include <utility>`
`29`	`29`	`#include <vector>`
`30`	`30`
`31`		`-#include <boost/shared_ptr.hpp>`
`32`		`-`
`33`	`31`	`extern CWallet* pwalletMain;`
`34`	`32`
`35`	`33`	`/**`
`@@ -963,7 +961,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface`
`963`	`961`	`}`
`964`	`962`	`}`
`965`	`963`
`966`		`- void GetScriptForMining(boost::shared_ptr<CReserveScript> &script) override;`
	`964`	`+ void GetScriptForMining(std::shared_ptr<CReserveScript> &script) override;`
`967`	`965`
`968`	`966`	`unsigned int GetKeyPoolSize()`
`969`	`967`	`{`