miner: rename UpdateRequestCount signal to ResetRequestCount

jonasschnelli · jonasschnelli · commit a7b9623d189e · 2015-07-01T16:09:58.000+02:00
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -411,7 +411,7 @@ static bool ProcessBlockFound(CBlock* pblock, const CChainParams& chainparams)
     }
 
     // Inform about the new block
-    GetMainSignals().BlockFound(*pblock);
+    GetMainSignals().BlockFound(pblock->GetHash());
 
     // Process this block the same as if we had received it from another node
     CValidationState state;
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
@@ -20,11 +20,11 @@ void RegisterValidationInterface(CValidationInterface* pwalletIn) {
     g_signals.Broadcast.connect(boost::bind(&CValidationInterface::ResendWalletTransactions, pwalletIn, _1));
     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::UpdateRequestCount, pwalletIn, _1));
+    g_signals.BlockFound.connect(boost::bind(&CValidationInterface::ResetRequestCount, pwalletIn, _1));
 }
 
 void UnregisterValidationInterface(CValidationInterface* pwalletIn) {
-    g_signals.BlockFound.disconnect(boost::bind(&CValidationInterface::UpdateRequestCount, pwalletIn, _1));
+    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));
diff --git a/src/validationinterface.h b/src/validationinterface.h
@@ -37,7 +37,7 @@ class CValidationInterface {
     virtual void ResendWalletTransactions(int64_t nBestBlockTime) {}
     virtual void BlockChecked(const CBlock&, const CValidationState&) {}
     virtual void GetScriptForMining(boost::shared_ptr<CReserveScript>&) {};
-    virtual void UpdateRequestCount(const CBlock&) {};
+    virtual void ResetRequestCount(const uint256 &hash) {};
     friend void ::RegisterValidationInterface(CValidationInterface*);
     friend void ::UnregisterValidationInterface(CValidationInterface*);
     friend void ::UnregisterAllValidationInterfaces();
@@ -59,7 +59,7 @@ struct CMainSignals {
     /** 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 CBlock&)> BlockFound;
+    boost::signals2::signal<void (const uint256 &)> BlockFound;
 };
 
 CMainSignals& GetMainSignals();
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -683,10 +683,10 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     }
 
     void GetScriptForMining(boost::shared_ptr<CReserveScript> &script);
-    void UpdateRequestCount(const CBlock& block)
+    void ResetRequestCount(const uint256 &hash)
     {
         LOCK(cs_wallet);
-        mapRequestCount[block.GetHash()] = 0;
+        mapRequestCount[hash] = 0;
     };
     
     unsigned int GetKeyPoolSize()

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ static bool ProcessBlockFound(CBlock* pblock, const CChainParams& chainparams)`
`411`	`411`	`}`
`412`	`412`
`413`	`413`	`// Inform about the new block`
`414`		`- GetMainSignals().BlockFound(*pblock);`
	`414`	`+ GetMainSignals().BlockFound(pblock->GetHash());`
`415`	`415`
`416`	`416`	`// Process this block the same as if we had received it from another node`
`417`	`417`	`CValidationState state;`
Original file line number	Diff line number	Diff line change
`@@ -683,10 +683,10 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface`
`683`	`683`	`}`
`684`	`684`
`685`	`685`	`void GetScriptForMining(boost::shared_ptr<CReserveScript> &script);`
`686`		`- void UpdateRequestCount(const CBlock& block)`
	`686`	`+ void ResetRequestCount(const uint256 &hash)`
`687`	`687`	`{`
`688`	`688`	`LOCK(cs_wallet);`
`689`		`- mapRequestCount[block.GetHash()] = 0;`
	`689`	`+ mapRequestCount[hash] = 0;`
`690`	`690`	`};`
`691`	`691`
`692`	`692`	`unsigned int GetKeyPoolSize()`