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

Remove obsolete RPC commands.

Browse Source
This commit is contained in:
Arthur Britto
2012-05-16 00:12:33 -07:00
parent 3341fae2bc
commit c7fd5fb79c
3 changed files with 1 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
src/RPCServer.cpp
View File

@@ -172,53 +172,6 @@ NewcoinAddress RPCServer::parseFamily(const std::string& fParam)
return family;
}
#if 0
Json::Value RPCServer::doCreateFamily(Json::Value& params)
{
// createfamily FXXXX
// createfamily fXXXX
// createfamily "<pass phrase>"
// createfamily
std::string query;
NewcoinAddress family;
NewcoinAddress seed;
if (!extractString(query, params, 0))
{
// No parameters, generate a family from a random seed.
family=theApp->getWallet().addRandomFamily(seed);
}
else if (seed.setFamilySeed(query))
{
// Had a family seed.
family=theApp->getWallet().addFamily(seed, false);
}
else if (family.setFamilyGenerator(query))
{
// Had a public generator
family=theApp->getWallet().addFamily(family);
}
else
{
// Must be a pass phrase.
family=theApp->getWallet().addFamily(query, false);
}
if (!family.isValid())
return JSONRPCError(500, "Invalid family specifier");
Json::Value ret(theApp->getWallet().getFamilyJson(family));
if (ret.isNull()) return JSONRPCError(500, "Invalid family");
if (seed.isValid())
{
ret["FamilySeed"]=seed.humanFamilySeed();
}
return ret;
}
#endif
// account_info <account>|<nickname>|<account_public_key>
// account_info <seed>|<pass_phrase>|<key> [<index>]
Json::Value RPCServer::doAccountInfo(Json::Value &params)
@@ -294,23 +247,6 @@ Json::Value RPCServer::doAccountInfo(Json::Value &params)
}
#if 0
Json::Value RPCServer::doNewAccount(Json::Value &params)
{ // newaccount <family> [<name>]
std::string fParam;
if (!extractString(fParam, params, 0))
return JSONRPCError(500, "Family required");
NewcoinAddress family = parseFamily(fParam);
if (!family.isValid()) return JSONRPCError(500, "Family not found.");
LocalAccount::pointer account(theApp->getWallet().getNewLocalAccount(family));
if (!account)
return JSONRPCError(500, "Family not found");
return account->getJson();
}
#endif
Json::Value RPCServer::doLock(Json::Value &params)
{ // lock <family>
// lock
@@ -359,57 +295,7 @@ Json::Value RPCServer::doUnlock(Json::Value &params)
return ret;
}
Json::Value RPCServer::doFamilyInfo(Json::Value &params)
{
// familyinfo <family>
// familyinfo <family> <number>
// familyinfo
int paramCount=getParamCount(params);
if (paramCount==0)
{
std::vector<NewcoinAddress> familyIDs;
theApp->getWallet().getFamilies(familyIDs);
Json::Value ret(Json::arrayValue);
BOOST_FOREACH(const NewcoinAddress& fid, familyIDs)
{
Json::Value obj(theApp->getWallet().getFamilyJson(fid));
if (!obj.isNull()) ret.append(obj);
}
return ret;
}
if (paramCount>2) return JSONRPCError(500, "Invalid parameters");
std::string fParam;
extractString(fParam, params, 0);
NewcoinAddress family=parseFamily(fParam);
if (!family.isValid()) return JSONRPCError(500, "No such family");
Json::Value obj(theApp->getWallet().getFamilyJson(family));
if (obj.isNull())
return JSONRPCError(500, "Family not found");
if (paramCount==2)
{
std::string keyNum;
extractString(keyNum, params, 1);
int kn=boost::lexical_cast<int>(keyNum);
NewcoinAddress k=theApp->getWallet().peekKey(family, kn);
if (k.isValid())
{
Json::Value key(Json::objectValue);
key["Number"]=kn;
key["Address"]=k.humanAccountID();
obj["Account"]=key;
}
}
return obj;
}
#endif
Json::Value RPCServer::doConnect(Json::Value& params)
{
@@ -918,9 +804,6 @@ Json::Value RPCServer::doCommand(const std::string& command, Json::Value& params
// Obsolete or need rewrite:
//
// if (command=="createfamily") return doCreateFamily(params);
if (command=="familyinfo") return doFamilyInfo(params);
// if (command=="newaccount") return doNewAccount(params);
if (command=="lock") return doLock(params);
if (command=="unlock") return doUnlock(params);
if (command=="sendto") return doSendTo(params);

3
src/RPCServer.h
View File

@@ -33,10 +33,7 @@ class RPCServer : public boost::enable_shared_from_this<RPCServer>
NewcoinAddress parseFamily(const std::string& family);
Json::Value doCreateFamily(Json::Value& params);
Json::Value doFamilyInfo(Json::Value& params);
Json::Value doAccountInfo(Json::Value& params);
Json::Value doNewAccount(Json::Value& params);
Json::Value doLock(Json::Value& params);
Json::Value doUnlock(Json::Value& params);
Json::Value doSendTo(Json::Value& params);

3
src/main.cpp
View File

@@ -40,9 +40,7 @@ void printHelp(const po::options_description& desc)
cout << " account_info <account>|<nickname>" << endl;
cout << " account_info <seed>|<pass_phrase>|<key> [<index>]" << endl;
cout << " connect <ip> [<port>]" << endl;
cout << " familyinfo" << endl;
cout << " ledger" << endl;
cout << " lock <family>" << endl;
cout << " peers" << endl;
cout << " sendto <destination> <amount> [<tag>]" << endl;
cout << " stop" << endl;
@@ -51,7 +49,6 @@ void printHelp(const po::options_description& desc)
cout << " unl_delete <public_key>" << endl;
cout << " unl_list" << endl;
cout << " unl_reset" << endl;
cout << " unlock <passphrase>" << endl;
cout << " validation_create [<seed>|<pass_phrase>|<key>]" << endl;
cout << " wallet_claim <master_seed> <regular_seed> [<source_tag>] [<account_annotation>]" << endl;
cout << " wallet_propose" << endl;