Remove unused function main:VerifySignature

jtimon · sipa · commit 358562b65189 · 2014-09-12T20:03:03.000+02:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -1372,11 +1372,6 @@ bool CScriptCheck::operator()() const {
     return true;
 }
 
-bool VerifySignature(const CCoins& txFrom, const CTransaction& txTo, unsigned int nIn, unsigned int flags, int nHashType)
-{
-    return CScriptCheck(txFrom, txTo, nIn, flags, nHashType)();
-}
-
 bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsViewCache &inputs, bool fScriptChecks, unsigned int flags, std::vector<CScriptCheck> *pvChecks)
 {
     if (!tx.IsCoinBase())
diff --git a/src/main.h b/src/main.h
@@ -174,8 +174,6 @@ int64_t GetBlockValue(int nHeight, int64_t nFees);
 
 /** Create a new block index entry for a given block hash */
 CBlockIndex * InsertBlockIndex(uint256 hash);
-/** Verify a signature */
-bool VerifySignature(const CCoins& txFrom, const CTransaction& txTo, unsigned int nIn, unsigned int flags, int nHashType);
 /** Abort with a message */
 bool AbortNode(const std::string &msg);
 /** Get statistics from node state */
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
@@ -113,7 +113,7 @@ BOOST_AUTO_TEST_CASE(sign)
         {
             CScript sigSave = txTo[i].vin[0].scriptSig;
             txTo[i].vin[0].scriptSig = txTo[j].vin[0].scriptSig;
-            bool sigOK = VerifySignature(CCoins(txFrom, 0), txTo[i], 0, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC, 0);
+            bool sigOK = CScriptCheck(CCoins(txFrom, 0), txTo[i], 0, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC, 0)();
             if (i == j)
                 BOOST_CHECK_MESSAGE(sigOK, strprintf("VerifySignature %d %d", i, j));
             else

Original file line number	Diff line number	Diff line change
`@@ -1372,11 +1372,6 @@ bool CScriptCheck::operator()() const {`
`1372`	`1372`	`return true;`
`1373`	`1373`	`}`
`1374`	`1374`
`1375`		`-bool VerifySignature(const CCoins& txFrom, const CTransaction& txTo, unsigned int nIn, unsigned int flags, int nHashType)`
`1376`		`-{`
`1377`		`- return CScriptCheck(txFrom, txTo, nIn, flags, nHashType)();`
`1378`		`-}`
`1379`		`-`
`1380`	`1375`	`bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsViewCache &inputs, bool fScriptChecks, unsigned int flags, std::vector<CScriptCheck> *pvChecks)`
`1381`	`1376`	`{`
`1382`	`1377`	`if (!tx.IsCoinBase())`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ BOOST_AUTO_TEST_CASE(sign)`
`113`	`113`	`{`
`114`	`114`	`CScript sigSave = txTo[i].vin[0].scriptSig;`
`115`	`115`	`txTo[i].vin[0].scriptSig = txTo[j].vin[0].scriptSig;`
`116`		`- bool sigOK = VerifySignature(CCoins(txFrom, 0), txTo[i], 0, SCRIPT_VERIFY_P2SH \| SCRIPT_VERIFY_STRICTENC, 0);`
	`116`	`+ bool sigOK = CScriptCheck(CCoins(txFrom, 0), txTo[i], 0, SCRIPT_VERIFY_P2SH \| SCRIPT_VERIFY_STRICTENC, 0)();`
`117`	`117`	`if (i == j)`
`118`	`118`	`BOOST_CHECK_MESSAGE(sigOK, strprintf("VerifySignature %d %d", i, j));`
`119`	`119`	`else`