Browse Source

remove magic number: change threshold for nLockTime to constant

pull/1/head
Wladimir J. van der Laan 11 years ago
parent
commit
2eace48d9a
  1. 4
      src/main.h
  2. 2
      src/qt/transactionrecord.cpp

4
src/main.h

@ -37,6 +37,8 @@ static const int64 MIN_RELAY_TX_FEE = 10000; @@ -37,6 +37,8 @@ static const int64 MIN_RELAY_TX_FEE = 10000;
static const int64 MAX_MONEY = 21000000 * COIN;
inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
static const int COINBASE_MATURITY = 100;
// Threshold for nLockTime: below this value it is interpreted as block number, otherwise as UNIX timestamp.
static const int LOCKTIME_THRESHOLD = 500000000; // Tue Nov 5 00:53:20 1985 UTC
#ifdef USE_UPNP
static const int fHaveUPnP = true;
#else
@ -441,7 +443,7 @@ public: @@ -441,7 +443,7 @@ public:
nBlockHeight = nBestHeight;
if (nBlockTime == 0)
nBlockTime = GetAdjustedTime();
if ((int64)nLockTime < (nLockTime < 500000000 ? (int64)nBlockHeight : nBlockTime))
if ((int64)nLockTime < (nLockTime < LOCKTIME_THRESHOLD ? (int64)nBlockHeight : nBlockTime))
return true;
BOOST_FOREACH(const CTxIn& txin, vin)
if (!txin.IsFinal())

2
src/qt/transactionrecord.cpp

@ -195,7 +195,7 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx) @@ -195,7 +195,7 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx)
if (!wtx.IsFinal())
{
if (wtx.nLockTime < 500000000)
if (wtx.nLockTime < LOCKTIME_THRESHOLD)
{
status.status = TransactionStatus::OpenUntilBlock;
status.open_for = nBestHeight - wtx.nLockTime;

Loading…
Cancel
Save