ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify new account_tx API.

Browse Source
This commit is contained in:
Stefan Thomas
2013-09-05 20:57:39 -07:00
committed by Vinnie Falco
parent 89748aad37
commit de210fef95
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/ripple_app/rpc/RPCHandler.cpp
View File

@@ -2106,8 +2106,7 @@ Json::Value RPCHandler::doAccountTxOld (Json::Value params, LoadType* loadType,
// binary: boolean, // optional, defaults to false
// forward: boolean, // optional, defaults to false
// limit: integer, // optional
// fwd_marker: opaque, // optional, resume forward
// rev_marker: opaque // optional, resume reverse
// marker: opaque // optional, resume previous query
// }
Json::Value RPCHandler::doAccountTx (Json::Value params, LoadType* loadType, Application::ScopedLockType& masterLockHolder)
{
@@ -2160,17 +2159,9 @@ Json::Value RPCHandler::doAccountTx (Json::Value params, LoadType* loadType, App
Json::Value resumeToken;
if (params.isMember("fwd_marker"))
if (params.isMember("marker"))
{
if ((!bForward) || params.isMember("rev_marker"))
return rpcError (rpcINVALID_PARAMS);
resumeToken = params["fwd_marker"];
}
if (params.isMember("rev_marker"))
{
if (bForward || params.isMember("fwd_marker"))
return rpcError (rpcINVALID_PARAMS);
resumeToken = params["rev_marker"];
resumeToken = params["marker"];
}
#ifndef BEAST_DEBUG
@@ -2232,7 +2223,7 @@ Json::Value RPCHandler::doAccountTx (Json::Value params, LoadType* loadType, App
if (params.isMember ("limit"))
ret["limit"] = limit;
if (!resumeToken.isNull())
ret[bForward ? "fwd_token" : "rev_token"] = resumeToken;
ret["marker"] = resumeToken;
return ret;
#ifndef BEAST_DEBUG