refactor: Remove unused bool parameter in RPCNotifyBlockChange()

hebasto · hebasto · commit 2bec309ad6d0 · 2020-05-19T02:39:45.000+03:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -351,13 +351,13 @@ static void registerSignalHandler(int signal, void(*handler)(int))
 static boost::signals2::connection rpc_notify_block_change_connection;
 static void OnRPCStarted()
 {
-    rpc_notify_block_change_connection = uiInterface.NotifyBlockTip_connect(&RPCNotifyBlockChange);
+    rpc_notify_block_change_connection = uiInterface.NotifyBlockTip_connect(std::bind(RPCNotifyBlockChange, std::placeholders::_2));
 }
 
 static void OnRPCStopped()
 {
     rpc_notify_block_change_connection.disconnect();
-    RPCNotifyBlockChange(false, nullptr);
+    RPCNotifyBlockChange(nullptr);
     g_best_block_cv.notify_all();
     LogPrint(BCLog::RPC, "RPC stopped.\n");
 }
@@ -1702,7 +1702,7 @@ bool AppInitMain(NodeContext& node)
                         }
 
                         const CBlockIndex* tip = chainstate->m_chain.Tip();
-                        RPCNotifyBlockChange(true, tip);
+                        RPCNotifyBlockChange(tip);
                         if (tip && tip->nTime > GetAdjustedTime() + 2 * 60 * 60) {
                             strLoadError = _("The block database contains a block which appears to be from the future. "
                                     "This may be due to your computer's date and time being set incorrectly. "
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -205,7 +205,7 @@ static UniValue getbestblockhash(const JSONRPCRequest& request)
     return ::ChainActive().Tip()->GetBlockHash().GetHex();
 }
 
-void RPCNotifyBlockChange(bool ibd, const CBlockIndex * pindex)
+void RPCNotifyBlockChange(const CBlockIndex* pindex)
 {
     if(pindex) {
         std::lock_guard<std::mutex> lock(cs_blockchange);
diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h
@@ -30,7 +30,7 @@ static constexpr int NUM_GETBLOCKSTATS_PERCENTILES = 5;
 double GetDifficulty(const CBlockIndex* blockindex);
 
 /** Callback for when block tip changed. */
-void RPCNotifyBlockChange(bool ibd, const CBlockIndex *);
+void RPCNotifyBlockChange(const CBlockIndex*);
 
 /** Block description to JSON */
 UniValue blockToJSON(const CBlock& block, const CBlockIndex* tip, const CBlockIndex* blockindex, bool txDetails = false) LOCKS_EXCLUDED(cs_main);

Original file line number	Diff line number	Diff line change
`@@ -351,13 +351,13 @@ static void registerSignalHandler(int signal, void(*handler)(int))`
`351`	`351`	`static boost::signals2::connection rpc_notify_block_change_connection;`
`352`	`352`	`static void OnRPCStarted()`
`353`	`353`	`{`
`354`		`- rpc_notify_block_change_connection = uiInterface.NotifyBlockTip_connect(&RPCNotifyBlockChange);`
	`354`	`+ rpc_notify_block_change_connection = uiInterface.NotifyBlockTip_connect(std::bind(RPCNotifyBlockChange, std::placeholders::_2));`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`static void OnRPCStopped()`
`358`	`358`	`{`
`359`	`359`	`rpc_notify_block_change_connection.disconnect();`
`360`		`- RPCNotifyBlockChange(false, nullptr);`
	`360`	`+ RPCNotifyBlockChange(nullptr);`
`361`	`361`	`g_best_block_cv.notify_all();`
`362`	`362`	`LogPrint(BCLog::RPC, "RPC stopped.\n");`
`363`	`363`	`}`
`@@ -1702,7 +1702,7 @@ bool AppInitMain(NodeContext& node)`
`1702`	`1702`	`}`
`1703`	`1703`
`1704`	`1704`	`const CBlockIndex* tip = chainstate->m_chain.Tip();`
`1705`		`- RPCNotifyBlockChange(true, tip);`
	`1705`	`+ RPCNotifyBlockChange(tip);`
`1706`	`1706`	`if (tip && tip->nTime > GetAdjustedTime() + 2 * 60 * 60) {`
`1707`	`1707`	`strLoadError = _("The block database contains a block which appears to be from the future. "`
`1708`	`1708`	`"This may be due to your computer's date and time being set incorrectly. "`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ static UniValue getbestblockhash(const JSONRPCRequest& request)`
`205`	`205`	`return ::ChainActive().Tip()->GetBlockHash().GetHex();`
`206`	`206`	`}`
`207`	`207`
`208`		`-void RPCNotifyBlockChange(bool ibd, const CBlockIndex * pindex)`
	`208`	`+void RPCNotifyBlockChange(const CBlockIndex* pindex)`
`209`	`209`	`{`
`210`	`210`	`if(pindex) {`
`211`	`211`	`std::lock_guard<std::mutex> lock(cs_blockchange);`