ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-22 20:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic cleanup.

Browse Source
This commit is contained in:
JoelKatz
2013-06-24 00:54:07 -07:00
parent 5f81c7c10f
commit fe557e69c9
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cpp/ripple/ripple_LedgerAcquire.cpp
View File

@@ -482,7 +482,9 @@ void LedgerAcquire::trigger (Peer::ref peer)
{ {
tmGL.set_itype (ripple::liAS_NODE); tmGL.set_itype (ripple::liAS_NODE);
BOOST_FOREACH (SHAMapNode & it, nodeIDs) BOOST_FOREACH (SHAMapNode & it, nodeIDs)
{
* (tmGL.add_nodeids ()) = it.getRawString (); * (tmGL.add_nodeids ()) = it.getRawString ();
}
WriteLog (lsTRACE, LedgerAcquire) << "Sending AS node " << nodeIDs.size () WriteLog (lsTRACE, LedgerAcquire) << "Sending AS node " << nodeIDs.size ()
<< " request to " << (peer ? "selected peer" : "all peers"); << " request to " << (peer ? "selected peer" : "all peers");
CondLog (nodeIDs.size () == 1, lsTRACE, LedgerAcquire) << "AS node: " << nodeIDs[0]; CondLog (nodeIDs.size () == 1, lsTRACE, LedgerAcquire) << "AS node: " << nodeIDs[0];
@@ -613,9 +615,11 @@ void LedgerAcquire::filterNodes (std::vector<SHAMapNode>& nodeIDs, std::vector<u
nodeHashes.resize (max); nodeHashes.resize (max);
} }
BOOST_FOREACH (const SHAMapNode & n, nodeIDs) BOOST_FOREACH (SHAMapNode const& n, nodeIDs)
{
recentNodes.insert (n); recentNodes.insert (n);
} }
}
bool LedgerAcquire::takeBase (const std::string& data) // data must not have hash prefix bool LedgerAcquire::takeBase (const std::string& data) // data must not have hash prefix
{ {
@@ -810,16 +814,20 @@ std::vector<LedgerAcquire::neededHash_t> LedgerAcquire::getNeededHashes ()
AccountStateSF filter (mLedger->getLedgerSeq ()); AccountStateSF filter (mLedger->getLedgerSeq ());
std::vector<uint256> v = mLedger->getNeededAccountStateHashes (4, &filter); std::vector<uint256> v = mLedger->getNeededAccountStateHashes (4, &filter);
BOOST_FOREACH (uint256 const & h, v) BOOST_FOREACH (uint256 const & h, v)
{
ret.push_back (std::make_pair (ripple::TMGetObjectByHash::otSTATE_NODE, h)); ret.push_back (std::make_pair (ripple::TMGetObjectByHash::otSTATE_NODE, h));
} }
}
if (!mHaveTransactions) if (!mHaveTransactions)
{ {
TransactionStateSF filter (mLedger->getLedgerSeq ()); TransactionStateSF filter (mLedger->getLedgerSeq ());
std::vector<uint256> v = mLedger->getNeededAccountStateHashes (4, &filter); std::vector<uint256> v = mLedger->getNeededAccountStateHashes (4, &filter);
BOOST_FOREACH (uint256 const & h, v) BOOST_FOREACH (uint256 const & h, v)
{
ret.push_back (std::make_pair (ripple::TMGetObjectByHash::otTRANSACTION_NODE, h)); ret.push_back (std::make_pair (ripple::TMGetObjectByHash::otTRANSACTION_NODE, h));
} }
}
return ret; return ret;
} }
@@ -849,7 +857,9 @@ Json::Value LedgerAcquire::getJson (int)
Json::Value hv (Json::arrayValue); Json::Value hv (Json::arrayValue);
std::vector<uint256> v = mLedger->peekAccountStateMap ()->getNeededHashes (16, NULL); std::vector<uint256> v = mLedger->peekAccountStateMap ()->getNeededHashes (16, NULL);
BOOST_FOREACH (uint256 const & h, v) BOOST_FOREACH (uint256 const & h, v)
{
hv.append (h.GetHex ()); hv.append (h.GetHex ());
}
ret["needed_state_hashes"] = hv; ret["needed_state_hashes"] = hv;
} }
@@ -858,7 +868,9 @@ Json::Value LedgerAcquire::getJson (int)
Json::Value hv (Json::arrayValue); Json::Value hv (Json::arrayValue);
std::vector<uint256> v = mLedger->peekTransactionMap ()->getNeededHashes (16, NULL); std::vector<uint256> v = mLedger->peekTransactionMap ()->getNeededHashes (16, NULL);
BOOST_FOREACH (uint256 const & h, v) BOOST_FOREACH (uint256 const & h, v)
{
hv.append (h.GetHex ()); hv.append (h.GetHex ());
}
ret["needed_transaction_hashes"] = hv; ret["needed_transaction_hashes"] = hv;
} }