ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

TMGetObjectByHash needs to know the object type.

Browse Source
This commit is contained in:
JoelKatz
2013-01-04 20:42:31 -08:00
parent 58587d9406
commit f666003977
4 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/cpp/ripple/LedgerAcquire.cpp
View File

@@ -226,8 +226,22 @@ void LedgerAcquire::trigger(Peer::ref peer)
ripple::TMGetLedger tmGL;
tmGL.set_ledgerhash(mHash.begin(), mHash.size());
if (getTimeouts() != 0)
{
tmGL.set_querytype(ripple::qtINDIRECT);
#if 0
if (!isProgress())
{
std::vector< std::pair<ripple::TMGetObjectByHash::ObjectType, uint256> > need = getNeededHashes();
if (!need.empty())
{
ripple::TMGetObjectByHash tmBH;
tmBH.
}
}
#endif
}
if (!mHaveBase)
{
tmGL.set_itype(ripple::liBASE);
@@ -531,18 +545,26 @@ LedgerAcquire::pointer LedgerAcquireMaster::find(const uint256& hash)
return LedgerAcquire::pointer();
}
std::vector<uint256> LedgerAcquire::getNeededHashes()
std::vector< std::pair<ripple::TMGetObjectByHash::ObjectType, uint256> > LedgerAcquire::getNeededHashes()
{
std::vector<uint256> ret;
std::vector< std::pair<ripple::TMGetObjectByHash::ObjectType, uint256> > ret;
if (!mHaveBase)
{
ret.push_back(mHash);
ret.push_back(std::make_pair(ripple::TMGetObjectByHash::otLEDGER, mHash));
return ret;
}
if (!mHaveState)
mLedger->peekAccountStateMap()->getNeededHashes(ret, 16);
{
std::vector<uint256> v = mLedger->peekAccountStateMap()->getNeededHashes(16);
BOOST_FOREACH(const uint256& h, v)
ret.push_back(std::make_pair(ripple::TMGetObjectByHash::otSTATE_NODE, h));
}
if (!mHaveTransactions)
mLedger->peekTransactionMap()->getNeededHashes(ret, 16);
{
std::vector<uint256> v = mLedger->peekTransactionMap()->getNeededHashes(16);
BOOST_FOREACH(const uint256& h, v)
ret.push_back(std::make_pair(ripple::TMGetObjectByHash::otTRANSACTION_NODE, h));
}
return ret;
}