diff options
| author | Matt Corallo <git@bluematt.me> | 2017-01-19 15:47:03 -0500 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2017-04-07 11:53:43 +0200 |
| commit | 91f1e6ce5e7854435196464aace0dcf7ce21dd5a (patch) | |
| tree | fc112b0d20886257053cfa5cf67a36cb044aafd3 | |
| parent | acad82f375615d8d238c7d819a48acd7900329f2 (diff) | |
| download | bitcoin-91f1e6ce5e7854435196464aace0dcf7ce21dd5a.tar.xz | |
Remove dead-code tracking of requests for blocks we generated
| -rw-r--r-- | src/validationinterface.cpp | 3 | ||||
| -rw-r--r-- | src/validationinterface.h | 3 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 5 |
3 files changed, 0 insertions, 11 deletions
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp index 4d8d7d3678..0f699328c7 100644 --- a/src/validationinterface.cpp +++ b/src/validationinterface.cpp @@ -23,12 +23,10 @@ void RegisterValidationInterface(CValidationInterface* pwalletIn) { g_signals.Broadcast.connect(boost::bind(&CValidationInterface::ResendWalletTransactions, pwalletIn, _1, _2)); g_signals.BlockChecked.connect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, _1, _2)); g_signals.ScriptForMining.connect(boost::bind(&CValidationInterface::GetScriptForMining, pwalletIn, _1)); - g_signals.BlockFound.connect(boost::bind(&CValidationInterface::ResetRequestCount, pwalletIn, _1)); g_signals.NewPoWValidBlock.connect(boost::bind(&CValidationInterface::NewPoWValidBlock, pwalletIn, _1, _2)); } void UnregisterValidationInterface(CValidationInterface* pwalletIn) { - g_signals.BlockFound.disconnect(boost::bind(&CValidationInterface::ResetRequestCount, pwalletIn, _1)); g_signals.ScriptForMining.disconnect(boost::bind(&CValidationInterface::GetScriptForMining, pwalletIn, _1)); g_signals.BlockChecked.disconnect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, _1, _2)); g_signals.Broadcast.disconnect(boost::bind(&CValidationInterface::ResendWalletTransactions, pwalletIn, _1, _2)); @@ -43,7 +41,6 @@ void UnregisterValidationInterface(CValidationInterface* pwalletIn) { } void UnregisterAllValidationInterfaces() { - g_signals.BlockFound.disconnect_all_slots(); g_signals.ScriptForMining.disconnect_all_slots(); g_signals.BlockChecked.disconnect_all_slots(); g_signals.Broadcast.disconnect_all_slots(); diff --git a/src/validationinterface.h b/src/validationinterface.h index ddb0afbb4d..baa04fe312 100644 --- a/src/validationinterface.h +++ b/src/validationinterface.h @@ -43,7 +43,6 @@ protected: virtual void ResendWalletTransactions(int64_t nBestBlockTime, CConnman* connman) {} virtual void BlockChecked(const CBlock&, const CValidationState&) {} virtual void GetScriptForMining(boost::shared_ptr<CReserveScript>&) {}; - virtual void ResetRequestCount(const uint256 &hash) {}; virtual void NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& block) {}; friend void ::RegisterValidationInterface(CValidationInterface*); friend void ::UnregisterValidationInterface(CValidationInterface*); @@ -79,8 +78,6 @@ 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; - /** Notifies listeners that a block has been successfully mined */ - boost::signals2::signal<void (const uint256 &)> BlockFound; /** * 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.h b/src/wallet/wallet.h index d7890ba0ca..127ffd6cf3 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -964,11 +964,6 @@ public: } void GetScriptForMining(boost::shared_ptr<CReserveScript> &script) override; - void ResetRequestCount(const uint256 &hash) override - { - LOCK(cs_wallet); - mapRequestCount[hash] = 0; - }; unsigned int GetKeyPoolSize() { |