Remove SyncWithWallets wrapper function

TheBlueMatt · TheBlueMatt · commit 7565e03b962c · 2016-10-04T13:53:04.000-04:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -1542,7 +1542,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
         }
     }
 
-    SyncWithWallets(tx, NULL);
+    GetMainSignals().SyncTransaction(tx, NULL, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
 
     return true;
 }
@@ -2775,7 +2775,7 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara
     // Let wallets know transactions went from 1-confirmed to
     // 0-confirmed or conflicted:
     BOOST_FOREACH(const CTransaction &tx, block.vtx) {
-        SyncWithWallets(tx, pindexDelete->pprev);
+        GetMainSignals().SyncTransaction(tx, pindexDelete->pprev, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
     }
     return true;
 }
@@ -3059,11 +3059,11 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
         // while _not_ holding the cs_main lock
         BOOST_FOREACH(const CTransaction &tx, txConflicted)
         {
-            SyncWithWallets(tx, pindexNewTip);
+            GetMainSignals().SyncTransaction(tx, pindexNewTip, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
         }
         // ... and about transactions that got confirmed:
         for(unsigned int i = 0; i < txChanged.size(); i++)
-            SyncWithWallets(std::get<0>(txChanged[i]), std::get<1>(txChanged[i]), std::get<2>(txChanged[i]));
+            GetMainSignals().SyncTransaction(std::get<0>(txChanged[i]), std::get<1>(txChanged[i]), std::get<2>(txChanged[i]));
 
         // Notify external listeners about the new tip.
         GetMainSignals().UpdatedBlockTip(pindexNewTip, pindexFork, fInitialDownload);
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
@@ -47,7 +47,3 @@ void UnregisterAllValidationInterfaces() {
     g_signals.SyncTransaction.disconnect_all_slots();
     g_signals.UpdatedBlockTip.disconnect_all_slots();
 }
-
-void SyncWithWallets(const CTransaction &tx, const CBlockIndex *pindex, int posInBlock) {
-    g_signals.SyncTransaction(tx, pindex, posInBlock);
-}
diff --git a/src/validationinterface.h b/src/validationinterface.h
@@ -28,8 +28,6 @@ void RegisterValidationInterface(CValidationInterface* pwalletIn);
 void UnregisterValidationInterface(CValidationInterface* pwalletIn);
 /** Unregister all wallets from core */
 void UnregisterAllValidationInterfaces();
-/** Push an updated transaction to all registered wallets */
-void SyncWithWallets(const CTransaction& tx, const CBlockIndex *pindex, int posInBlock = -1);
 
 class CValidationInterface {
 protected:
@@ -50,6 +48,8 @@ class CValidationInterface {
 struct CMainSignals {
     /** Notifies listeners of updated block chain tip */
     boost::signals2::signal<void (const CBlockIndex *, const CBlockIndex *, bool fInitialDownload)> UpdatedBlockTip;
+    /** A posInBlock value for SyncTransaction which indicates the transaction was conflicted, disconnected, or not in a block */
+    static const int SYNC_TRANSACTION_NOT_IN_BLOCK = -1;
     /** Notifies listeners of updated transaction data (transaction, and optionally the block it is found in. */
     boost::signals2::signal<void (const CTransaction &, const CBlockIndex *pindex, int posInBlock)> SyncTransaction;
     /** Notifies listeners of an updated transaction without new data (for now: a coinbase potentially becoming visible). */

Original file line number	Diff line number	Diff line change
`@@ -1542,7 +1542,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C`
`1542`	`1542`	`}`
`1543`	`1543`	`}`
`1544`	`1544`
`1545`		`- SyncWithWallets(tx, NULL);`
	`1545`	`+ GetMainSignals().SyncTransaction(tx, NULL, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);`
`1546`	`1546`
`1547`	`1547`	`return true;`
`1548`	`1548`	`}`
`@@ -2775,7 +2775,7 @@ bool static DisconnectTip(CValidationState& state, const CChainParams& chainpara`
`2775`	`2775`	`// Let wallets know transactions went from 1-confirmed to`
`2776`	`2776`	`// 0-confirmed or conflicted:`
`2777`	`2777`	`BOOST_FOREACH(const CTransaction &tx, block.vtx) {`
`2778`		`- SyncWithWallets(tx, pindexDelete->pprev);`
	`2778`	`+ GetMainSignals().SyncTransaction(tx, pindexDelete->pprev, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);`
`2779`	`2779`	`}`
`2780`	`2780`	`return true;`
`2781`	`2781`	`}`
`@@ -3059,11 +3059,11 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,`
`3059`	`3059`	`// while _not_ holding the cs_main lock`
`3060`	`3060`	`BOOST_FOREACH(const CTransaction &tx, txConflicted)`
`3061`	`3061`	`{`
`3062`		`- SyncWithWallets(tx, pindexNewTip);`
	`3062`	`+ GetMainSignals().SyncTransaction(tx, pindexNewTip, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);`
`3063`	`3063`	`}`
`3064`	`3064`	`// ... and about transactions that got confirmed:`
`3065`	`3065`	`for(unsigned int i = 0; i < txChanged.size(); i++)`
`3066`		`- SyncWithWallets(std::get<0>(txChanged[i]), std::get<1>(txChanged[i]), std::get<2>(txChanged[i]));`
	`3066`	`+ GetMainSignals().SyncTransaction(std::get<0>(txChanged[i]), std::get<1>(txChanged[i]), std::get<2>(txChanged[i]));`
`3067`	`3067`
`3068`	`3068`	`// Notify external listeners about the new tip.`
`3069`	`3069`	`GetMainSignals().UpdatedBlockTip(pindexNewTip, pindexFork, fInitialDownload);`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,3 @@ void UnregisterAllValidationInterfaces() {`
`47`	`47`	`g_signals.SyncTransaction.disconnect_all_slots();`
`48`	`48`	`g_signals.UpdatedBlockTip.disconnect_all_slots();`
`49`	`49`	`}`
`50`		`-`
`51`		`-void SyncWithWallets(const CTransaction &tx, const CBlockIndex *pindex, int posInBlock) {`
`52`		`- g_signals.SyncTransaction(tx, pindex, posInBlock);`
`53`		`-}`