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

Remove jss::account_index and jss::peer_index.

Browse Source
This commit is contained in:
Tom Ritchford
2015-06-26 18:11:32 -04:00
committed by Vinnie Falco
parent 1e7588d0ab
commit ea67a2d051
12 changed files with 33 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/ripple/rpc/impl/AccountFromString.cpp
View File

@@ -23,37 +23,30 @@
namespace ripple {
namespace RPC {
Json::Value accountFromString (
AccountID& result,
bool& bIndex,
std::string const& strIdent,
int const iIndex,
bool const bStrict)
boost::optional <AccountID> accountFromStringStrict (std::string const& account)
{
// VFALCO Use AnyPublicKey
// Try public key
boost::optional <AccountID> result;
RippleAddress naAccount;
if (naAccount.setAccountPublic(strIdent))
{
result = calcAccountID(naAccount);
bIndex = false;
return Json::objectValue;
}
if (naAccount.setAccountPublic (account))
result = calcAccountID (naAccount);
else
result = parseBase58<AccountID> (account);
return result;
}
// Try AccountID
auto accountID =
parseBase58<AccountID>(strIdent);
if (accountID)
Json::Value accountFromString (
AccountID& result, std::string const& strIdent, bool bStrict)
{
if (auto accountID = accountFromStringStrict (strIdent))
{
result = *accountID;
bIndex = false;
return Json::objectValue;
}
if (bStrict)
{
accountID = deprecatedParseBitcoinAccountID(strIdent);
return rpcError (accountID ? rpcACT_BITCOIN : rpcACT_MALFORMED);
auto id = deprecatedParseBitcoinAccountID (strIdent);
return rpcError (id ? rpcACT_BITCOIN : rpcACT_MALFORMED);
}
RippleAddress naSeed;
@@ -70,10 +63,9 @@ Json::Value accountFromString (
// Generator maps don't exist. Assume it is a master
// generator.
bIndex = !iIndex;
naAccount.setAccountPublic (naGenerator, iIndex);
result = calcAccountID(naAccount);
RippleAddress naAccount;
naAccount.setAccountPublic (naGenerator, 0);
result = calcAccountID (naAccount);
return Json::objectValue;
}