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

Avoid conversions whenever possible during RippleState lookups

Browse Source
This commit is contained in:
Nik Bougalis
2014-09-10 21:09:14 -07:00
committed by Vinnie Falco
parent 81a426608a
commit 3345d03433
3 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ripple/module/app/ledger/Ledger.cpp
View File

@@ -1775,18 +1775,16 @@ uint256 Ledger::getOwnerDirIndex (Account const& account)
}
uint256 Ledger::getRippleStateIndex (
RippleAddress const& naA, RippleAddress const& naB,
Currency const& currency)
Account const& a, Account const& b, Currency const& currency)
{
auto uAID = naA.getAccountID ();
auto uBID = naB.getAccountID ();
bool bAltB = uAID < uBID;
Serializer s (62);
bool const bAltB = a < b;
s.add16 (spaceRipple); // 2
s.add160 (bAltB ? uAID : uBID); // 20
s.add160 (bAltB ? uBID : uAID); // 20
s.add160 (currency); // 20
s.add160 (bAltB ? a : b); // 20
s.add160 (bAltB ? b : a); // 20
s.add160 (currency); // 20
return s.getSHA512Half ();
}
@@ -1797,8 +1795,8 @@ uint256 Ledger::getTicketIndex (
Serializer s (26);
s.add16 (spaceTicket); // 2
s.add160 (account); // 20
s.add32 (uSequence); // 4
s.add160 (account); // 20
s.add32 (uSequence); // 4
return s.getSHA512Half ();
}

19
src/ripple/module/app/ledger/Ledger.h
View File

@@ -432,30 +432,19 @@ public:
// don't access global variables. e.g.
// "calculateKeyFromRippleStateAndAddress"
static uint256 getRippleStateIndex (
RippleAddress const&, RippleAddress const&, Currency const&);
Account const& a, Account const& b, Currency const& currency);
static uint256 getRippleStateIndex (
Account const& a, Account const& b, Currency const& uCurrency)
Account const& a, Issue const& issue)
{
return getRippleStateIndex (
RippleAddress::createAccountID (a),
RippleAddress::createAccountID (b), uCurrency);
return getRippleStateIndex (a, issue.account, issue.currency);
}
SLE::pointer getRippleState (uint256 const& uNode);
SLE::pointer getRippleState (
RippleAddress const& a, RippleAddress const& b,
Currency const& currency)
{
return getRippleState (getRippleStateIndex (a, b, currency));
}
SLE::pointer getRippleState (
Account const& a, Account const& b, Currency const& currency)
{
return getRippleState (getRippleStateIndex (
RippleAddress::createAccountID (a),
RippleAddress::createAccountID (b), currency));
return getRippleState (getRippleStateIndex (a, b, currency));
}
std::uint32_t getReferenceFeeUnits ()

3
src/ripple/module/rpc/handlers/LedgerEntry.cpp
View File

@@ -195,7 +195,8 @@ Json::Value doLedgerEntry (RPC::Context& context)
}
else
{
uNodeIndex = Ledger::getRippleStateIndex (naA, naB, uCurrency);
uNodeIndex = Ledger::getRippleStateIndex (
naA.getAccountID (), naB.getAccountID (), uCurrency);
}
}
else