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

Get RPC account_lines mostly working.

Browse Source
This commit is contained in:
Arthur Britto
2012-05-30 15:52:29 -07:00
parent ece130d375
commit b497c96d33
2 changed files with 11 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/LedgerNode.cpp
View File

@@ -46,19 +46,16 @@ LedgerStateParms Ledger::writeBack(LedgerStateParms parms, SerializedLedgerEntry
SerializedLedgerEntry::pointer Ledger::getASNode(LedgerStateParms& parms, const uint256& nodeID,
LedgerEntryType let )
{
std::cerr << "getASNode>" << nodeID.ToString() << std::endl;
SHAMapItem::pointer account = mAccountStateMap->peekItem(nodeID);
std::cerr << "getASNode: d: " << nodeID.ToString() << std::endl;
if (!account)
{
if ( (parms & lepCREATE) == 0 )
{
parms = lepMISSING;
std::cerr << "getASNode: missing: " << nodeID.ToString() << std::endl;
return SerializedLedgerEntry::pointer();
}
std::cerr << "getASNode: c: " << nodeID.ToString() << std::endl;
parms = parms | lepCREATED | lepOKAY;
SerializedLedgerEntry::pointer sle=boost::make_shared<SerializedLedgerEntry>(let);
sle->setIndex(nodeID);
@@ -66,21 +63,16 @@ std::cerr << "getASNode: c: " << nodeID.ToString() << std::endl;
return sle;
}
std::cerr << "getASNode: a: " << nodeID.ToString() << std::endl;
std::cerr << "getASNode: e: " << strHex(account->peekSerializer().getData()) << std::endl;
SerializedLedgerEntry::pointer sle =
boost::make_shared<SerializedLedgerEntry>(account->peekSerializer(), nodeID);
std::cerr << "getASNode: b: " << nodeID.ToString() << std::endl;
if(sle->getType() != let)
{ // maybe it's a currency or something
std::cerr << "getASNode: wrong type: " << nodeID.ToString() << std::endl;
parms = parms | lepWRONGTYPE;
return SerializedLedgerEntry::pointer();
}
parms = parms | lepOKAY;
std::cerr << "getASNode<" << nodeID.ToString() << std::endl;
return sle;
@@ -90,17 +82,7 @@ SerializedLedgerEntry::pointer Ledger::getAccountRoot(LedgerStateParms& parms, c
{
uint256 nodeID=getAccountRootIndex(accountID);
ScopedLock l(mAccountStateMap->Lock());
try
{
return getASNode(parms, nodeID, ltACCOUNT_ROOT);
}
catch (...)
{
parms = lepERROR;
return SerializedLedgerEntry::pointer();
}
return getASNode(parms, nodeID, ltACCOUNT_ROOT);
}
SerializedLedgerEntry::pointer Ledger::getAccountRoot(LedgerStateParms& parms, const NewcoinAddress& naAccountID)
@@ -117,15 +99,7 @@ SerializedLedgerEntry::pointer Ledger::getNickname(LedgerStateParms& parms, cons
{
ScopedLock l(mAccountStateMap->Lock());
try
{
return getASNode(parms, nickHash, ltNICKNAME);
}
catch (...)
{
parms = lepERROR;
return SerializedLedgerEntry::pointer();
}
return getASNode(parms, nickHash, ltNICKNAME);
}
//
@@ -157,15 +131,7 @@ SerializedLedgerEntry::pointer Ledger::getRippleState(LedgerStateParms& parms, c
{
ScopedLock l(mAccountStateMap->Lock());
try
{
return getASNode(parms, uNode, ltRIPPLE_STATE);
}
catch (...)
{
parms = lepERROR;
return SerializedLedgerEntry::pointer();
}
return getASNode(parms, uNode, ltRIPPLE_STATE);
}
//
@@ -200,32 +166,14 @@ SerializedLedgerEntry::pointer Ledger::getDirRoot(LedgerStateParms& parms, const
{
ScopedLock l(mAccountStateMap->Lock());
try
{
return getASNode(parms, uRootIndex, ltDIR_ROOT);
}
catch (...)
{
parms = lepERROR;
return SerializedLedgerEntry::pointer();
}
return getASNode(parms, uRootIndex, ltDIR_ROOT);
}
SerializedLedgerEntry::pointer Ledger::getDirNode(LedgerStateParms& parms, const uint256& uNodeIndex)
{
ScopedLock l(mAccountStateMap->Lock());
std::cerr << "getDirNode: " << uNodeIndex.ToString() << std::endl;
try
{
return getASNode(parms, uNodeIndex, ltDIR_NODE);
}
catch (...)
{
std::cerr << "getDirNode: ERROR: " << uNodeIndex.ToString() << std::endl;
parms = lepERROR;
return SerializedLedgerEntry::pointer();
}
return getASNode(parms, uNodeIndex, ltDIR_NODE);
}
// vim:ts=4

14
src/RPCServer.cpp
View File

@@ -382,19 +382,16 @@ Json::Value RPCServer::doAccountLines(Json::Value &params)
AccountState::pointer as = mNetOps->getAccountState(uLedger, naAccount);
if (as)
{
Json::Value jsonLines = Json::Value(Json::objectValue);
ret["account"] = naAccount.humanAccountID();
// We access a committed ledger and need not worry about changes.
uint256 uDirLineNodeFirst;
uint256 uDirLineNodeLast;
if (!mNetOps->getDirLineInfo(uLedger, naAccount, uDirLineNodeFirst, uDirLineNodeLast))
if (mNetOps->getDirLineInfo(uLedger, naAccount, uDirLineNodeFirst, uDirLineNodeLast))
{
ret["lines"] = Json::Value(Json::objectValue);
}
else
{
Json::Value jsonLines = Json::Value(Json::objectValue);
for (; uDirLineNodeFirst <= uDirLineNodeLast; uDirLineNodeFirst++)
{
@@ -423,13 +420,12 @@ Json::Value RPCServer::doAccountLines(Json::Value &params)
jPeer["limit"] = saLimit.getJson(0);
jPeer["limit_peer"] = saLimitPeer.getJson(0);
ret[naAccountPeer.humanAccountID()] = jPeer;
jsonLines[naAccountPeer.humanAccountID()] = jPeer;
}
}
ret["lines"] = jsonLines;
}
ret["lines"] = jsonLines;
}
else
{