Remove obsolete reference to CValidationState from UpdateCoins.

21E14 · 21E14 · commit c8b92486c4ec · 2016-04-30T15:14:22.000-04:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -1744,7 +1744,7 @@ void static InvalidBlockFound(CBlockIndex *pindex, const CValidationState &state
     }
 }
 
-void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCache &inputs, CTxUndo &txundo, int nHeight)
+void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, CTxUndo &txundo, int nHeight)
 {
     // mark inputs spent
     if (!tx.IsCoinBase()) {
@@ -1770,10 +1770,10 @@ void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCach
     inputs.ModifyNewCoins(tx.GetHash(), tx.IsCoinBase())->FromTx(tx, nHeight);
 }
 
-void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCache &inputs, int nHeight)
+void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight)
 {
     CTxUndo txundo;
-    UpdateCoins(tx, state, inputs, txundo, nHeight);
+    UpdateCoins(tx, inputs, txundo, nHeight);
 }
 
 bool CScriptCheck::operator()() {
@@ -2385,7 +2385,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
         if (i > 0) {
             blockundo.vtxundo.push_back(CTxUndo());
         }
-        UpdateCoins(tx, state, view, i == 0 ? undoDummy : blockundo.vtxundo.back(), pindex->nHeight);
+        UpdateCoins(tx, view, i == 0 ? undoDummy : blockundo.vtxundo.back(), pindex->nHeight);
 
         vPos.push_back(std::make_pair(tx.GetHash(), pos));
         pos.nTxOffset += ::GetSerializeSize(tx, SER_DISK, CLIENT_VERSION);
diff --git a/src/main.h b/src/main.h
@@ -359,7 +359,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi
                  unsigned int flags, bool cacheStore, std::vector<CScriptCheck> *pvChecks = NULL);
 
 /** Apply the effects of this transaction on the UTXO set represented by view */
-void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCache &inputs, int nHeight);
+void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight);
 
 /** Context-independent validity checks */
 bool CheckTransaction(const CTransaction& tx, CValidationState& state);
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
@@ -297,8 +297,7 @@ BOOST_AUTO_TEST_CASE(updatecoins_simulation_test)
             CCoins &coins = result[tx.GetHash()];
             coins.FromTx(tx, height);
 
-            CValidationState dummy;
-            UpdateCoins(tx, dummy, *(stack.back()), height);
+            UpdateCoins(tx, *(stack.back()), height);
         }
 
         // Once every 1000 iterations and at the end, verify the full cache.
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -720,7 +720,7 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
         else {
             CValidationState state;
             assert(CheckInputs(tx, state, mempoolDuplicate, false, 0, false, NULL));
-            UpdateCoins(tx, state, mempoolDuplicate, 1000000);
+            UpdateCoins(tx, mempoolDuplicate, 1000000);
         }
     }
     unsigned int stepsSinceLastRemove = 0;
@@ -734,7 +734,7 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
             assert(stepsSinceLastRemove < waitingOnDependants.size());
         } else {
             assert(CheckInputs(entry->GetTx(), state, mempoolDuplicate, false, 0, false, NULL));
-            UpdateCoins(entry->GetTx(), state, mempoolDuplicate, 1000000);
+            UpdateCoins(entry->GetTx(), mempoolDuplicate, 1000000);
             stepsSinceLastRemove = 0;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1744,7 +1744,7 @@ void static InvalidBlockFound(CBlockIndex *pindex, const CValidationState &state`
`1744`	`1744`	`}`
`1745`	`1745`	`}`
`1746`	`1746`
`1747`		`-void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCache &inputs, CTxUndo &txundo, int nHeight)`
	`1747`	`+void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, CTxUndo &txundo, int nHeight)`
`1748`	`1748`	`{`
`1749`	`1749`	`// mark inputs spent`
`1750`	`1750`	`if (!tx.IsCoinBase()) {`
`@@ -1770,10 +1770,10 @@ void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCach`
`1770`	`1770`	`inputs.ModifyNewCoins(tx.GetHash(), tx.IsCoinBase())->FromTx(tx, nHeight);`
`1771`	`1771`	`}`
`1772`	`1772`
`1773`		`-void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCache &inputs, int nHeight)`
	`1773`	`+void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight)`
`1774`	`1774`	`{`
`1775`	`1775`	`CTxUndo txundo;`
`1776`		`- UpdateCoins(tx, state, inputs, txundo, nHeight);`
	`1776`	`+ UpdateCoins(tx, inputs, txundo, nHeight);`
`1777`	`1777`	`}`
`1778`	`1778`
`1779`	`1779`	`bool CScriptCheck::operator()() {`
`@@ -2385,7 +2385,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin`
`2385`	`2385`	`if (i > 0) {`
`2386`	`2386`	`blockundo.vtxundo.push_back(CTxUndo());`
`2387`	`2387`	`}`
`2388`		`- UpdateCoins(tx, state, view, i == 0 ? undoDummy : blockundo.vtxundo.back(), pindex->nHeight);`
	`2388`	`+ UpdateCoins(tx, view, i == 0 ? undoDummy : blockundo.vtxundo.back(), pindex->nHeight);`
`2389`	`2389`
`2390`	`2390`	`vPos.push_back(std::make_pair(tx.GetHash(), pos));`
`2391`	`2391`	`pos.nTxOffset += ::GetSerializeSize(tx, SER_DISK, CLIENT_VERSION);`
Original file line number	Diff line number	Diff line change
`@@ -297,8 +297,7 @@ BOOST_AUTO_TEST_CASE(updatecoins_simulation_test)`
`297`	`297`	`CCoins &coins = result[tx.GetHash()];`
`298`	`298`	`coins.FromTx(tx, height);`
`299`	`299`
`300`		`- CValidationState dummy;`
`301`		`- UpdateCoins(tx, dummy, *(stack.back()), height);`
	`300`	`+ UpdateCoins(tx, *(stack.back()), height);`
`302`	`301`	`}`
`303`	`302`
`304`	`303`	`// Once every 1000 iterations and at the end, verify the full cache.`
Original file line number	Diff line number	Diff line change
`@@ -720,7 +720,7 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const`
`720`	`720`	`else {`
`721`	`721`	`CValidationState state;`
`722`	`722`	`assert(CheckInputs(tx, state, mempoolDuplicate, false, 0, false, NULL));`
`723`		`- UpdateCoins(tx, state, mempoolDuplicate, 1000000);`
	`723`	`+ UpdateCoins(tx, mempoolDuplicate, 1000000);`
`724`	`724`	`}`
`725`	`725`	`}`
`726`	`726`	`unsigned int stepsSinceLastRemove = 0;`
`@@ -734,7 +734,7 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const`
`734`	`734`	`assert(stepsSinceLastRemove < waitingOnDependants.size());`
`735`	`735`	`} else {`
`736`	`736`	`assert(CheckInputs(entry->GetTx(), state, mempoolDuplicate, false, 0, false, NULL));`
`737`		`- UpdateCoins(entry->GetTx(), state, mempoolDuplicate, 1000000);`
	`737`	`+ UpdateCoins(entry->GetTx(), mempoolDuplicate, 1000000);`
`738`	`738`	`stepsSinceLastRemove = 0;`
`739`	`739`	`}`
`740`	`740`	`}`