diff --git a/src/ripple/app/ledger/InboundLedger.h b/src/ripple/app/ledger/InboundLedger.h index 5cf35a758bd..0c6471a9916 100644 --- a/src/ripple/app/ledger/InboundLedger.h +++ b/src/ripple/app/ledger/InboundLedger.h @@ -197,8 +197,7 @@ class InboundLedger final : public TimeoutCounter, std::unique_ptr mPeerSet; }; -inline -std::string +inline std::string to_string(InboundLedger::Reason reason) { using enum InboundLedger::Reason; diff --git a/src/ripple/app/ledger/impl/InboundLedgers.cpp b/src/ripple/app/ledger/impl/InboundLedgers.cpp index d2500962d63..a4d08f6ff9b 100644 --- a/src/ripple/app/ledger/impl/InboundLedgers.cpp +++ b/src/ripple/app/ledger/impl/InboundLedgers.cpp @@ -115,16 +115,13 @@ class InboundLedgersImp : public InboundLedgers (seq > validSeq) && (seq < validSeq + lagLeeway); bool const shouldAcquire = !(isFull && !fallingBehind && nearFuture); ss << " Evaluating whether to acquire ledger " << hash - << ". full: " << (isFull ? "true" : "false") - << ". falling behind: " - << (fallingBehind ? "true" : "false") - << ". ledger sequence " << seq - << ". Valid sequence: " << validSeq - << ". Lag leeway: " << lagLeeway - << ". request for near future ledger: " - << (nearFuture ? "true" : "false") - << ". Acquiring ledger? " - << (shouldAcquire ? "true" : "false"); + << ". full: " << (isFull ? "true" : "false") + << ". falling behind: " << (fallingBehind ? "true" : "false") + << ". ledger sequence " << seq << ". Valid sequence: " << validSeq + << ". Lag leeway: " << lagLeeway + << ". request for near future ledger: " + << (nearFuture ? "true" : "false") << ". Acquiring ledger? " + << (shouldAcquire ? "true" : "false"); if (!shouldAcquire) { JLOG(j_.debug()) << "Abort (rule): " << ss.str(); diff --git a/src/ripple/consensus/ConsensusProposal.h b/src/ripple/consensus/ConsensusProposal.h index a56d69c1a4a..00f978ff898 100644 --- a/src/ripple/consensus/ConsensusProposal.h +++ b/src/ripple/consensus/ConsensusProposal.h @@ -25,8 +25,8 @@ #include #include #include -#include #include +#include namespace ripple { /** Represents a proposed position taken during a round of consensus. @@ -200,12 +200,10 @@ class ConsensusProposal { std::stringstream ss; ss << "proposal: previous_ledger: " << previousLedger_ - << " proposal_seq: " << proposeSeq_ - << " position: " << position_ - << " close_time: " << to_string(closeTime_) - << " now: " << to_string(time_) - << " is_bow_out:" << isBowOut() - << " node_id: " << nodeID_; + << " proposal_seq: " << proposeSeq_ << " position: " << position_ + << " close_time: " << to_string(closeTime_) + << " now: " << to_string(time_) << " is_bow_out:" << isBowOut() + << " node_id: " << nodeID_; return ss.str(); } diff --git a/src/ripple/protocol/STValidation.h b/src/ripple/protocol/STValidation.h index 27d37ac598f..58f69970192 100644 --- a/src/ripple/protocol/STValidation.h +++ b/src/ripple/protocol/STValidation.h @@ -147,17 +147,15 @@ class STValidation final : public STObject, public CountedObject { std::stringstream ss; ss << "validation: " - << " ledger_hash: " << getLedgerHash() - << " consensus_hash: " << getConsensusHash() - << " sign_time: " << to_string(getSignTime()) - << " seen_time: " << to_string(getSeenTime()) - << " signer_public_key: " << getSignerPublic() - << " node_id: " << getNodeID() - << " is_valid: " << isValid() - << " is_full: " << isFull() - << " is_trusted: " << isTrusted() - << " signing_hash: " << getSigningHash() - << " base58: " << toBase58(TokenType::NodePublic, getSignerPublic()); + << " ledger_hash: " << getLedgerHash() + << " consensus_hash: " << getConsensusHash() + << " sign_time: " << to_string(getSignTime()) + << " seen_time: " << to_string(getSeenTime()) + << " signer_public_key: " << getSignerPublic() + << " node_id: " << getNodeID() << " is_valid: " << isValid() + << " is_full: " << isFull() << " is_trusted: " << isTrusted() + << " signing_hash: " << getSigningHash() + << " base58: " << toBase58(TokenType::NodePublic, getSignerPublic()); return ss.str(); }