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

Finish moving Json code.

Browse Source
This commit is contained in:
JoelKatz
2012-01-07 15:53:31 -08:00
parent 7935889f00
commit c65b9ecf83
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
RPCServer.cpp
View File

@@ -204,14 +204,8 @@ Json::Value RPCServer::doAccountInfo(Json::Value &params)
LocalAccount::pointer account=theApp->getWallet().parseAccount(acct); LocalAccount::pointer account=theApp->getWallet().parseAccount(acct);
if(!account) if(!account)
return JSONRPCError(500, "Account not found"); return JSONRPCError(500, "Account not found");
Json::Value ret(Json::objectValue); return account->getJson();
ret["Family"]=account->getFamilyName();
ret["ShortName"]=account->getShortName();
ret["FullName"]=account->getFullName();
ret["AccountID"]=NewcoinAddress(account->getAddress()).GetString();
ret["Issued"]=Json::Value(account->isIssued());
return ret;
} }
Json::Value RPCServer::doNewAccount(Json::Value &params) Json::Value RPCServer::doNewAccount(Json::Value &params)
@@ -226,14 +220,7 @@ Json::Value RPCServer::doNewAccount(Json::Value &params)
LocalAccount::pointer account(theApp->getWallet().getNewLocalAccount(family)); LocalAccount::pointer account(theApp->getWallet().getNewLocalAccount(family));
if(!account) if(!account)
return JSONRPCError(500, "Family not found"); return JSONRPCError(500, "Family not found");
return account->getJson();
Json::Value ret(Json::objectValue);
ret["Family"]=account->getFamilyName();
ret["ShortName"]=account->getShortName();
ret["FullName"]=account->getFullName();
ret["AccountID"]=NewcoinAddress(account->getAddress()).GetString();
ret["Issued"]=Json::Value(account->isIssued());
return ret;
} }
Json::Value RPCServer::doLock(Json::Value &params) Json::Value RPCServer::doLock(Json::Value &params)

12
Wallet.cpp
View File

@@ -366,6 +366,18 @@ std::string LocalAccount::getFamilyName() const
return mFamily->getShortName(); return mFamily->getShortName();
} }
Json::Value LocalAccount::getJson() const
{
Json::Value ret(Json::objectValue);
ret["Family"]=getFamilyName();
ret["AccountID"]=NewcoinAddress(getAddress()).GetString();
ret["ShortName"]=getShortName();
ret["FullName"]=getFullName();
ret["Issued"]=Json::Value(isIssued());
ret["IsLocked"]=mFamily->isLocked();
return ret;
}
bool LocalAccount::isIssued() const bool LocalAccount::isIssued() const
{ {
return mSeq < mFamily->getSeq(); return mSeq < mFamily->getSeq();

2
Wallet.h
View File

@@ -138,7 +138,7 @@ public:
CKey::pointer getPublicKey(); CKey::pointer getPublicKey();
CKey::pointer getPrivateKey(); CKey::pointer getPrivateKey();
Json::Value getJson(); Json::Value getJson() const;
}; };
class Wallet class Wallet