diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-02 04:44:01 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-02 04:44:47 +0100 |
| commit | 8fe30fb4d130532d4a0e4c9d143f03e1b85a749e (patch) | |
| tree | 5442cc39c9cc9e9c88c0b441db4f5b47a950a1c3 /src/consensus | |
| parent | a6d0d623fc955bba93d8f09e3fd2454284b61472 (diff) | |
| parent | 40cd32e835092c3158175511da5193193ec54939 (diff) | |
| download | bitcoin-8fe30fb4d130532d4a0e4c9d143f03e1b85a749e.tar.xz | |
Merge pull request #6928
40cd32e Revert "Add rules--presently disabled--for using GetMedianTimePast as endpoint for lock-time calculations" (Gregory Maxwell)
8537ecd Revert "Enable policy enforcing GetMedianTimePast as the end point of lock-time constraints" (Gregory Maxwell)
Diffstat (limited to 'src/consensus')
| -rw-r--r-- | src/consensus/consensus.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h index 6d6ce7e099..f937844e9f 100644 --- a/src/consensus/consensus.h +++ b/src/consensus/consensus.h @@ -13,10 +13,4 @@ static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; /** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */ static const int COINBASE_MATURITY = 100; -/** Flags for LockTime() */ -enum { - /* Use GetMedianTimePast() instead of nTime for end point timestamp. */ - LOCKTIME_MEDIAN_TIME_PAST = (1 << 1), -}; - #endif // BITCOIN_CONSENSUS_CONSENSUS_H |