Remove deprecated 'accepted' parameter.

This commit is contained in:
Tom Ritchford
2015-07-16 13:57:10 -04:00
committed by Vinnie Falco
parent 663742e0d1
commit bb251063fc
4 changed files with 3 additions and 12 deletions

View File

@@ -342,13 +342,12 @@ void Ledger::setAccepted (
{ {
// Used when we witnessed the consensus. Rounds the close time, updates the // Used when we witnessed the consensus. Rounds the close time, updates the
// hash, and sets the ledger accepted and immutable. // hash, and sets the ledger accepted and immutable.
assert (closed() && !info_.accepted); assert (closed());
info_.closeTime = correctCloseTime info_.closeTime = correctCloseTime
? roundCloseTime (closeTime, closeResolution) ? roundCloseTime (closeTime, closeResolution)
: closeTime; : closeTime;
info_.closeTimeResolution = closeResolution; info_.closeTimeResolution = closeResolution;
info_.closeFlags = correctCloseTime ? 0 : sLCF_NoConsensusTime; info_.closeFlags = correctCloseTime ? 0 : sLCF_NoConsensusTime;
info_.accepted = true;
setImmutable (); setImmutable ();
} }
@@ -361,7 +360,6 @@ void Ledger::setAccepted ()
info_.closeTime = roundCloseTime( info_.closeTime = roundCloseTime(
info_.closeTime, info_.closeTimeResolution); info_.closeTime, info_.closeTimeResolution);
info_.accepted = true;
setImmutable (); setImmutable ();
} }

View File

@@ -297,8 +297,8 @@ public:
void pushLedger (Ledger::pointer newLCL, Ledger::pointer newOL) void pushLedger (Ledger::pointer newLCL, Ledger::pointer newOL)
{ {
assert (! newLCL->info().open && newLCL->info().accepted); assert (! newLCL->info().open);
assert (newOL->info().open && !newOL->info().accepted); assert (newOL->info().open);
{ {
ScopedLockType ml (m_mutex); ScopedLockType ml (m_mutex);

View File

@@ -552,12 +552,6 @@ Reader::readArray ( Token& tokenStart )
return true; return true;
} }
static inline bool
in ( Reader::Char c, Reader::Char c1, Reader::Char c2, Reader::Char c3, Reader::Char c4 )
{
return c == c1 || c == c2 || c == c3 || c == c4;
}
bool bool
Reader::decodeNumber ( Token& token ) Reader::decodeNumber ( Token& token )
{ {

View File

@@ -85,7 +85,6 @@ struct LedgerInfo
// Once validated is true, it will never be set false at a later time. // Once validated is true, it will never be set false at a later time.
mutable mutable
bool validated = false; bool validated = false;
bool accepted = false;
// flags indicating how this ledger close took place // flags indicating how this ledger close took place
int closeFlags = 0; int closeFlags = 0;