From ee89904a00afe3d084984e04f9ac67578c441255 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Fri, 4 Jan 2013 20:26:26 -0800 Subject: [PATCH] Cleanup trigger. --- src/cpp/ripple/LedgerAcquire.cpp | 8 ++++---- src/cpp/ripple/LedgerAcquire.h | 4 ++-- src/cpp/ripple/LedgerConsensus.cpp | 6 +++--- src/cpp/ripple/LedgerConsensus.h | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/cpp/ripple/LedgerAcquire.cpp b/src/cpp/ripple/LedgerAcquire.cpp index 6312d61c4c..6bd537ab94 100644 --- a/src/cpp/ripple/LedgerAcquire.cpp +++ b/src/cpp/ripple/LedgerAcquire.cpp @@ -135,7 +135,7 @@ void LedgerAcquire::onTimer(bool progress) if (!getPeerCount()) addPeers(); else - trigger(Peer::pointer(), true); + trigger(Peer::pointer()); } } @@ -202,7 +202,7 @@ void LedgerAcquire::addOnComplete(boost::function mLock.unlock(); } -void LedgerAcquire::trigger(Peer::ref peer, bool timer) +void LedgerAcquire::trigger(Peer::ref peer) { if (mAborted || mComplete || mFailed) { @@ -599,7 +599,7 @@ SMAddNode LedgerAcquireMaster::gotLedgerData(ripple::TMLedgerData& packet, Peer: { cLog(lsWARNING) << "Included TXbase invalid"; } - ledger->trigger(peer, false); + ledger->trigger(peer); return san; } @@ -631,7 +631,7 @@ SMAddNode LedgerAcquireMaster::gotLedgerData(ripple::TMLedgerData& packet, Peer: else ledger->takeAsNode(nodeIDs, nodeData, ret); if (!ret.isInvalid()) - ledger->trigger(peer, false); + ledger->trigger(peer); return ret; } diff --git a/src/cpp/ripple/LedgerAcquire.h b/src/cpp/ripple/LedgerAcquire.h index a4b54a3ae4..7799766076 100644 --- a/src/cpp/ripple/LedgerAcquire.h +++ b/src/cpp/ripple/LedgerAcquire.h @@ -80,7 +80,7 @@ protected: void done(); void onTimer(bool progress); - void newPeer(Peer::ref peer) { trigger(peer, false); } + void newPeer(Peer::ref peer) { trigger(peer); } boost::weak_ptr pmDowncast(); @@ -105,7 +105,7 @@ public: bool takeAsNode(const std::list& IDs, const std::list >& data, SMAddNode&); bool takeAsRootNode(const std::vector& data, SMAddNode&); - void trigger(Peer::ref, bool timer); + void trigger(Peer::ref); bool tryLocal(); void addPeers(); diff --git a/src/cpp/ripple/LedgerConsensus.cpp b/src/cpp/ripple/LedgerConsensus.cpp index 09de201312..f0579b3b60 100644 --- a/src/cpp/ripple/LedgerConsensus.cpp +++ b/src/cpp/ripple/LedgerConsensus.cpp @@ -69,7 +69,7 @@ void TransactionAcquire::onTimer(bool progress) } } else if (!progress) - trigger(Peer::pointer(), true); + trigger(Peer::pointer()); } boost::weak_ptr TransactionAcquire::pmDowncast() @@ -77,7 +77,7 @@ boost::weak_ptr TransactionAcquire::pmDowncast() return boost::shared_polymorphic_downcast(shared_from_this()); } -void TransactionAcquire::trigger(Peer::ref peer, bool timer) +void TransactionAcquire::trigger(Peer::ref peer) { if (mComplete || mFailed) { @@ -166,7 +166,7 @@ SMAddNode TransactionAcquire::takeNodes(const std::list& nodeIDs, ++nodeIDit; ++nodeDatait; } - trigger(peer, false); + trigger(peer); progress(); return SMAddNode::useful(); } diff --git a/src/cpp/ripple/LedgerConsensus.h b/src/cpp/ripple/LedgerConsensus.h index 240cc3229d..7890d2094b 100644 --- a/src/cpp/ripple/LedgerConsensus.h +++ b/src/cpp/ripple/LedgerConsensus.h @@ -32,10 +32,10 @@ protected: bool mHaveRoot; void onTimer(bool progress); - void newPeer(Peer::ref peer) { trigger(peer, false); } + void newPeer(Peer::ref peer) { trigger(peer); } void done(); - void trigger(Peer::ref, bool timer); + void trigger(Peer::ref); boost::weak_ptr pmDowncast(); public: