aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Schnelli <dev@jonasschnelli.ch>2016-06-04 16:01:24 +0200
committerJonas Schnelli <dev@jonasschnelli.ch>2016-06-04 16:01:35 +0200
commitd46b8b50fc3e725df75378db2d81aa48f9a1bd74 (patch)
treea87e2c12b6d5fa56b63556c74fccef9425bc190a
parent8c1e49ba13a88917e133c28d35b665967d4c90b0 (diff)
parente39dc698adf46dc3306526971ca6f0f6401f30ca (diff)
downloadbitcoin-d46b8b50fc3e725df75378db2d81aa48f9a1bd74.tar.xz
Merge #8143: comment nit: miners don't vote
e39dc69 comment nit: miners don't vote (instagibbs)
-rw-r--r--src/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index c98f42d7c9..527d4f570e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1886,8 +1886,8 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi
// such nodes as they are not following the protocol. That
// said during an upgrade careful thought should be taken
// as to the correct behavior - we may want to continue
- // peering with non-upgraded nodes even after a soft-fork
- // super-majority vote has passed.
+ // peering with non-upgraded nodes even after soft-fork
+ // super-majority signaling has occurred.
return state.DoS(100,false, REJECT_INVALID, strprintf("mandatory-script-verify-flag-failed (%s)", ScriptErrorString(check.GetScriptError())));
}
}