From 1d70f4bde8f6adc4df65397f486186a694a74c60 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Sat, 1 Dec 2012 22:51:10 +0100 Subject: Remove CheckSig_mode and move logic out of CheckInputs() --- src/main.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/main.h') diff --git a/src/main.h b/src/main.h index 83454e331b..abd3eaf7d7 100644 --- a/src/main.h +++ b/src/main.h @@ -430,13 +430,6 @@ enum GetMinFee_mode GMF_SEND, }; -enum CheckSig_mode -{ - CS_NEVER, // never validate scripts - CS_AFTER_CHECKPOINT, // validate scripts after the last checkpoint - CS_ALWAYS // always validate scripts -}; - /** The basic transaction that is broadcasted on the network and contained in * blocks. A transaction can contain multiple inputs and outputs. */ @@ -641,7 +634,7 @@ public: // Check whether all inputs of this transaction are valid (no double spends, scripts & sigs, amounts) // This does not modify the UTXO set - bool CheckInputs(CCoinsViewCache &view, enum CheckSig_mode csmode, unsigned int flags = SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC) const; + bool CheckInputs(CCoinsViewCache &view, bool fScriptChecks = true, unsigned int flags = SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC) const; // Apply the effects of this transaction on the UTXO set represented by view bool UpdateCoins(CCoinsViewCache &view, CTxUndo &txundo, int nHeight, const uint256 &txhash) const; -- cgit v1.2.3