diff --git a/src/ripple/app/ledger/Ledger.cpp b/src/ripple/app/ledger/Ledger.cpp index 7abc584d0..8584a22d8 100644 --- a/src/ripple/app/ledger/Ledger.cpp +++ b/src/ripple/app/ledger/Ledger.cpp @@ -342,13 +342,12 @@ void Ledger::setAccepted ( { // Used when we witnessed the consensus. Rounds the close time, updates the // hash, and sets the ledger accepted and immutable. - assert (closed() && !info_.accepted); + assert (closed()); info_.closeTime = correctCloseTime ? roundCloseTime (closeTime, closeResolution) : closeTime; info_.closeTimeResolution = closeResolution; info_.closeFlags = correctCloseTime ? 0 : sLCF_NoConsensusTime; - info_.accepted = true; setImmutable (); } @@ -361,7 +360,6 @@ void Ledger::setAccepted () info_.closeTime = roundCloseTime( info_.closeTime, info_.closeTimeResolution); - info_.accepted = true; setImmutable (); } diff --git a/src/ripple/app/ledger/impl/LedgerMaster.cpp b/src/ripple/app/ledger/impl/LedgerMaster.cpp index d0790eda1..ecf643800 100644 --- a/src/ripple/app/ledger/impl/LedgerMaster.cpp +++ b/src/ripple/app/ledger/impl/LedgerMaster.cpp @@ -297,8 +297,8 @@ public: void pushLedger (Ledger::pointer newLCL, Ledger::pointer newOL) { - assert (! newLCL->info().open && newLCL->info().accepted); - assert (newOL->info().open && !newOL->info().accepted); + assert (! newLCL->info().open); + assert (newOL->info().open); { ScopedLockType ml (m_mutex); diff --git a/src/ripple/json/impl/json_reader.cpp b/src/ripple/json/impl/json_reader.cpp index d7cd75995..3e2777e16 100644 --- a/src/ripple/json/impl/json_reader.cpp +++ b/src/ripple/json/impl/json_reader.cpp @@ -552,12 +552,6 @@ Reader::readArray ( Token& tokenStart ) 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 Reader::decodeNumber ( Token& token ) { diff --git a/src/ripple/ledger/ReadView.h b/src/ripple/ledger/ReadView.h index 3930b2d2f..c2eb8d724 100644 --- a/src/ripple/ledger/ReadView.h +++ b/src/ripple/ledger/ReadView.h @@ -85,7 +85,6 @@ struct LedgerInfo // Once validated is true, it will never be set false at a later time. mutable bool validated = false; - bool accepted = false; // flags indicating how this ledger close took place int closeFlags = 0;