aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Morcos <morcos@chaincode.com>2016-02-11 15:34:04 -0500
committerAlex Morcos <morcos@chaincode.com>2016-02-11 15:34:04 -0500
commitb043c4b746c8199ce948aa5e8b186e0d1a61ad68 (patch)
tree4fdcc4c38f5bafb50f9ad9921aac0edc0e2ed8a3
parenta51c79be6b8ef060697287dce3195876069899bd (diff)
fix sdaftuar's nits again
it boggles the mind why these nits can't be delivered on a more timely basis
-rw-r--r--src/main.cpp10
-rw-r--r--src/main.h2
-rw-r--r--src/policy/policy.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/main.cpp b/src/main.cpp
index d9bf3bd757..7d75e2ea65 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -799,10 +799,10 @@ bool CheckSequenceLocks(const CTransaction &tx, int flags)
index.pprev = tip;
// CheckSequenceLocks() uses chainActive.Height()+1 to evaluate
// height based locks because when SequenceLocks() is called within
- // CBlock::AcceptBlock(), the height of the block *being*
- // evaluated is what is used. Thus if we want to know if a
- // transaction can be part of the *next* block, we need to call
- // SequenceLocks() with one more than chainActive.Height().
+ // ConnectBlock(), the height of the block *being*
+ // evaluated is what is used.
+ // Thus if we want to know if a transaction can be part of the
+ // *next* block, we need to use one more than chainActive.Height()
index.nHeight = tip->nHeight + 1;
// pcoinsTip contains the UTXO set for chainActive.Tip()
@@ -2240,7 +2240,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
}
if (!SequenceLocks(tx, nLockTimeFlags, &prevheights, *pindex)) {
- return state.DoS(100, error("ConnectBlock(): contains a non-BIP68-final transaction", __func__),
+ return state.DoS(100, error("%s: contains a non-BIP68-final transaction", __func__),
REJECT_INVALID, "bad-txns-nonfinal");
}
diff --git a/src/main.h b/src/main.h
index 66b766316e..a576078f06 100644
--- a/src/main.h
+++ b/src/main.h
@@ -350,7 +350,7 @@ bool SequenceLocks(const CTransaction &tx, int flags, std::vector<int>* prevHeig
/**
* Check if transaction will be BIP 68 final in the next block to be created.
*
- * Calls SequenceLocks() with data from the tip of the current active chain.
+ * Simulates calling SequenceLocks() with data from the tip of the current active chain.
*
* See consensus/consensus.h for flag definitions.
*/
diff --git a/src/policy/policy.h b/src/policy/policy.h
index 5034b23863..f25dbf22d5 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -45,7 +45,7 @@ static const unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VERIFY
/** For convenience, standard but not mandatory verify flags. */
static const unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS = STANDARD_SCRIPT_VERIFY_FLAGS & ~MANDATORY_SCRIPT_VERIFY_FLAGS;
-/** Used as the flags parameter to LockTime() in non-consensus code. */
+/** Used as the flags parameter to sequence and nLocktime checks in non-consensus code. */
static const unsigned int STANDARD_LOCKTIME_VERIFY_FLAGS = LOCKTIME_VERIFY_SEQUENCE |
LOCKTIME_MEDIAN_TIME_PAST;