mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-27 06:25:51 +00:00
Adjust ledger switch time and disambiguate logging:
- The new activation date for 1e9624270d
is now October 27, 2015 at 11:00 PDT
This commit is contained in:
@@ -479,9 +479,15 @@ void LedgerConsensusImp::mapCompleteInternal (
|
|||||||
else
|
else
|
||||||
assert (false); // We don't have our own position?!
|
assert (false); // We don't have our own position?!
|
||||||
}
|
}
|
||||||
else
|
else if (!mOurPosition)
|
||||||
|
JLOG (j_.debug)
|
||||||
|
<< "Not creating disputes: no position yet.";
|
||||||
|
else if (mOurPosition->isBowOut ())
|
||||||
JLOG (j_.warning)
|
JLOG (j_.warning)
|
||||||
<< "Not ready to create disputes";
|
<< "Not creating disputes: not participating.";
|
||||||
|
else
|
||||||
|
JLOG (j_.debug)
|
||||||
|
<< "Not creating disputes: identical position.";
|
||||||
|
|
||||||
mAcquired[hash] = map;
|
mAcquired[hash] = map;
|
||||||
|
|
||||||
@@ -993,8 +999,8 @@ void LedgerConsensusImp::accept (std::shared_ptr<SHAMap> set)
|
|||||||
// If we don't have a close time, then we just agree to disagree
|
// If we don't have a close time, then we just agree to disagree
|
||||||
bool const closeTimeCorrect = (closeTime != 0);
|
bool const closeTimeCorrect = (closeTime != 0);
|
||||||
|
|
||||||
// Switch to new semantics on Sep 30, 2015 at 11:00:00am PDT
|
// Switch to new semantics on Oct 27, 2015 at 11:00:00am PDT
|
||||||
if (mPreviousLedger->info().closeTime > 497296800)
|
if (mPreviousLedger->info().closeTime > 499284000)
|
||||||
{
|
{
|
||||||
// Ledger close times should increase strictly monotonically
|
// Ledger close times should increase strictly monotonically
|
||||||
if (closeTime <= mPreviousLedger->info().closeTime)
|
if (closeTime <= mPreviousLedger->info().closeTime)
|
||||||
|
|||||||
Reference in New Issue
Block a user