diff options
| author | jtimon <jtimon@monetize.io> | 2014-07-18 16:51:33 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-12 20:03:03 +0200 |
| commit | ce3649fb61b2b421aa4e36ab107e5f2f9838378b (patch) | |
| tree | 7b1a263ed4dde0c317b010e08df14e361796e68d /src | |
| parent | 358562b65189dce982ad30a1c158606a540e9bcb (diff) | |
| download | bitcoin-ce3649fb61b2b421aa4e36ab107e5f2f9838378b.tar.xz | |
Remove CScriptCheck::nHashType (was always 0)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 6 | ||||
| -rw-r--r-- | src/main.h | 8 | ||||
| -rw-r--r-- | src/test/script_P2SH_tests.cpp | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/main.cpp b/src/main.cpp index 2163b90bfe..2fde266f11 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1367,7 +1367,7 @@ void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCach bool CScriptCheck::operator()() const { const CScript &scriptSig = ptxTo->vin[nIn].scriptSig; - if (!VerifyScript(scriptSig, scriptPubKey, *ptxTo, nIn, nFlags, nHashType)) + if (!VerifyScript(scriptSig, scriptPubKey, *ptxTo, nIn, nFlags, 0)) return error("CScriptCheck() : %s VerifySignature failed", ptxTo->GetHash().ToString()); return true; } @@ -1440,7 +1440,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi assert(coins); // Verify signature - CScriptCheck check(*coins, tx, i, flags, 0); + CScriptCheck check(*coins, tx, i, flags); if (pvChecks) { pvChecks->push_back(CScriptCheck()); check.swap(pvChecks->back()); @@ -1453,7 +1453,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi // avoid splitting the network between upgraded and // non-upgraded nodes. CScriptCheck check(*coins, tx, i, - flags & ~STANDARD_NOT_MANDATORY_VERIFY_FLAGS, 0); + flags & ~STANDARD_NOT_MANDATORY_VERIFY_FLAGS); if (check()) return state.Invalid(false, REJECT_NONSTANDARD, "non-mandatory-script-verify-flag"); } diff --git a/src/main.h b/src/main.h index f7682c213c..2ec1691471 100644 --- a/src/main.h +++ b/src/main.h @@ -340,13 +340,12 @@ private: const CTransaction *ptxTo; unsigned int nIn; unsigned int nFlags; - int nHashType; public: - CScriptCheck(): ptxTo(0), nIn(0), nFlags(0), nHashType(0) {} - CScriptCheck(const CCoins& txFromIn, const CTransaction& txToIn, unsigned int nInIn, unsigned int nFlagsIn, int nHashTypeIn) : + CScriptCheck(): ptxTo(0), nIn(0), nFlags(0) {} + CScriptCheck(const CCoins& txFromIn, const CTransaction& txToIn, unsigned int nInIn, unsigned int nFlagsIn) : scriptPubKey(txFromIn.vout[txToIn.vin[nInIn].prevout.n].scriptPubKey), - ptxTo(&txToIn), nIn(nInIn), nFlags(nFlagsIn), nHashType(nHashTypeIn) { } + ptxTo(&txToIn), nIn(nInIn), nFlags(nFlagsIn) { } bool operator()() const; @@ -355,7 +354,6 @@ public: std::swap(ptxTo, check.ptxTo); std::swap(nIn, check.nIn); std::swap(nFlags, check.nFlags); - std::swap(nHashType, check.nHashType); } }; diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp index ef63d9d349..add1987664 100644 --- 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 = CScriptCheck(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)(); if (i == j) BOOST_CHECK_MESSAGE(sigOK, strprintf("VerifySignature %d %d", i, j)); else |