From 92be1c70f564db3f8b3f4e353b32b9350b5fccce Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Sun, 24 Feb 2013 13:47:21 -0800 Subject: [PATCH] Hopefully prevent a jump forward at the end of the consensus process. If not, at least figure out exactly where in the consensus state machine that's happening. --- src/cpp/ripple/LedgerConsensus.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpp/ripple/LedgerConsensus.cpp b/src/cpp/ripple/LedgerConsensus.cpp index 8cba7d23e..66203e3b4 100644 --- a/src/cpp/ripple/LedgerConsensus.cpp +++ b/src/cpp/ripple/LedgerConsensus.cpp @@ -373,7 +373,7 @@ void LedgerConsensus::checkLCL() uint256 netLgr = mPrevLedgerHash; int netLgrCount = 0; - uint256 favoredLedger = (mState == lcsPRE_CLOSE) ? uint256() : mPrevLedgerHash; // Don't get stuck one ledger back + uint256 favoredLedger = mPrevLedgerHash; // Don't get stuck one ledger back or jump one forward boost::unordered_map vals = theApp->getValidations().getCurrentValidations(favoredLedger); @@ -397,7 +397,7 @@ void LedgerConsensus::checkLCL() default: status = "unknown"; } - cLog(lsWARNING) << "View of consensus changed during consensus (" << netLgrCount << ") status=" + cLog(lsWARNING) << "View of consensus changed during " << status << " (" << netLgrCount << ") status=" << status << ", " << (mHaveCorrectLCL ? "CorrectLCL" : "IncorrectLCL"); cLog(lsWARNING) << mPrevLedgerHash << " to " << netLgr;