aboutsummaryrefslogtreecommitdiff
path: root/src/main.h
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2012-12-01 22:51:10 +0100
committerPieter Wuille <pieter.wuille@gmail.com>2013-01-08 01:49:15 +0100
commit1d70f4bde8f6adc4df65397f486186a694a74c60 (patch)
tree36a477faabb003e95a7bb3bb1583316664afc628 /src/main.h
parent2800ce7367760a9bb8fd5209feddf71e574a592d (diff)
downloadbitcoin-1d70f4bde8f6adc4df65397f486186a694a74c60.tar.xz
Remove CheckSig_mode and move logic out of CheckInputs()
Diffstat (limited to 'src/main.h')
-rw-r--r--src/main.h9
1 files changed, 1 insertions, 8 deletions
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;