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

Small cleanups. Use the right type of SyncFilter.

Browse Source
This commit is contained in:
JoelKatz
2013-06-24 04:28:18 -07:00
parent 4cf60ee679
commit b7436c5f25
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/cpp/ripple/ripple_InboundLedger.cpp
View File

@@ -462,7 +462,7 @@ void InboundLedger::trigger (Peer::ref peer)
std::vector<uint256> nodeHashes; std::vector<uint256> nodeHashes;
nodeIDs.reserve (256); nodeIDs.reserve (256);
nodeHashes.reserve (256); nodeHashes.reserve (256);
TransactionStateSF filter (mSeq); AccountStateSF filter (mSeq);
mLedger->peekAccountStateMap ()->getMissingNodes (nodeIDs, nodeHashes, 256, &filter); mLedger->peekAccountStateMap ()->getMissingNodes (nodeIDs, nodeHashes, 256, &filter);
if (nodeIDs.empty ()) if (nodeIDs.empty ())
@@ -620,7 +620,9 @@ void InboundLedger::filterNodes (std::vector<SHAMapNode>& nodeIDs, std::vector<u
} }
BOOST_FOREACH (const SHAMapNode & n, nodeIDs) BOOST_FOREACH (const SHAMapNode & n, nodeIDs)
recentNodes.insert (n); {
recentNodes.insert (n);
}
} }
bool InboundLedger::takeBase (const std::string& data) // data must not have hash prefix bool InboundLedger::takeBase (const std::string& data) // data must not have hash prefix
@@ -816,7 +818,9 @@ std::vector<InboundLedger::neededHash_t> InboundLedger::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 (protocol::TMGetObjectByHash::otSTATE_NODE, h)); {
ret.push_back (std::make_pair (protocol::TMGetObjectByHash::otSTATE_NODE, h));
}
} }
if (!mHaveTransactions) if (!mHaveTransactions)
@@ -824,7 +828,9 @@ std::vector<InboundLedger::neededHash_t> InboundLedger::getNeededHashes ()
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 (protocol::TMGetObjectByHash::otTRANSACTION_NODE, h)); {
ret.push_back (std::make_pair (protocol::TMGetObjectByHash::otTRANSACTION_NODE, h));
}
} }
return ret; return ret;
@@ -855,7 +861,9 @@ Json::Value InboundLedger::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;
} }
@@ -864,7 +872,9 @@ Json::Value InboundLedger::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;
} }