ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-25 13:35:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change RPCs to use account instead of ident.

Browse Source
This commit is contained in:
Arthur Britto
2013-03-07 03:39:17 -08:00
parent ef10a41f63
commit 9121cfd567
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cpp/ripple/RPCHandler.cpp
View File

@@ -559,7 +559,7 @@ Json::Value RPCHandler::accountFromString(Ledger::ref lrLedger, RippleAddress& n
} }
// { // {
// ident : <indent>, // account: <indent>,
// account_index : <index> // optional // account_index : <index> // optional
// strict: <bool> // true, only allow public keys and addresses. false, default. // strict: <bool> // true, only allow public keys and addresses. false, default.
// ledger_hash : <ledger> // ledger_hash : <ledger>
@@ -573,10 +573,10 @@ Json::Value RPCHandler::doAccountInfo(Json::Value jvRequest)
if (!lpLedger) if (!lpLedger)
return jvResult; return jvResult;
if (!jvRequest.isMember("ident")) if (!jvRequest.isMember("account") && !jvRequest.isMember("ident"))
return rpcError(rpcINVALID_PARAMS); return rpcError(rpcINVALID_PARAMS);
std::string strIdent = jvRequest["ident"].asString(); std::string strIdent = jvRequest.isMember("account") ? jvRequest["account"].asString() : jvRequest["ident"].asString();
bool bIndex; bool bIndex;
int iIndex = jvRequest.isMember("account_index") ? jvRequest["account_index"].asUInt() : 0; int iIndex = jvRequest.isMember("account_index") ? jvRequest["account_index"].asUInt() : 0;
bool bStrict = jvRequest.isMember("strict") && jvRequest["strict"].asBool(); bool bStrict = jvRequest.isMember("strict") && jvRequest["strict"].asBool();
@@ -742,10 +742,10 @@ Json::Value RPCHandler::doNicknameInfo(Json::Value params)
// XXX This would be better if it took the ledger. // XXX This would be better if it took the ledger.
Json::Value RPCHandler::doOwnerInfo(Json::Value jvRequest) Json::Value RPCHandler::doOwnerInfo(Json::Value jvRequest)
{ {
if (!jvRequest.isMember("ident")) if (!jvRequest.isMember("account") && !jvRequest.isMember("ident"))
return rpcError(rpcINVALID_PARAMS); return rpcError(rpcINVALID_PARAMS);
std::string strIdent = jvRequest["ident"].asString(); std::string strIdent = jvRequest.isMember("account") ? jvRequest["account"].asString() : jvRequest["ident"].asString();
bool bIndex; bool bIndex;
int iIndex = jvRequest.isMember("account_index") ? jvRequest["account_index"].asUInt() : 0; int iIndex = jvRequest.isMember("account_index") ? jvRequest["account_index"].asUInt() : 0;
RippleAddress raAccount; RippleAddress raAccount;

3
src/js/remote.js
View File

@@ -890,7 +890,8 @@ Remote.prototype.request_tx = function (hash) {
Remote.prototype.request_account_info = function (accountID) { Remote.prototype.request_account_info = function (accountID) {
var request = new Request(this, 'account_info'); var request = new Request(this, 'account_info');
request.message.ident = UInt160.json_rewrite(accountID); request.message.ident = UInt160.json_rewrite(accountID); // DEPRECATED
request.message.account = UInt160.json_rewrite(accountID);
return request; return request;
}; };