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

Tidy up transactors:

Browse Source 
* Rename some members
* Don't use SLE cached from the base view
This commit is contained in:
Vinnie Falco
2015-06-30 14:44:33 -07:00
parent 483f768370
commit 575f124fb8
12 changed files with 136 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/ripple/app/tx/impl/SetAccount.cpp
View File

@@ -103,7 +103,10 @@ SetAccount::doApply ()
{
std::uint32_t const uTxFlags = mTxn.getFlags ();
std::uint32_t const uFlagsIn = mTxnAccount->getFieldU32 (sfFlags);
auto const sle = view().peek(
keylet::account(account_));
std::uint32_t const uFlagsIn = sle->getFieldU32 (sfFlags);
std::uint32_t uFlagsOut = uFlagsIn;
std::uint32_t const uSetFlag = mTxn.getFieldU32 (sfSetFlag);
@@ -123,7 +126,7 @@ SetAccount::doApply ()
if (bSetRequireAuth && !(uFlagsIn & lsfRequireAuth))
{
if (! dirIsEmpty (view(),
keylet::ownerDir(mTxnAccountID)))
keylet::ownerDir(account_)))
{
j_.trace << "Retry: Owner directory not empty.";
return (view().flags() & tapRETRY) ? terOWNERS : tecOWNERS;
@@ -180,7 +183,7 @@ SetAccount::doApply ()
return tecNEED_MASTER_KEY;
}
if (!mTxnAccount->isFieldPresent (sfRegularKey))
if (!sle->isFieldPresent (sfRegularKey))
return tecNO_REGULAR_KEY;
j_.trace << "Set lsfDisableMaster.";
@@ -240,16 +243,16 @@ SetAccount::doApply ()
//
// Track transaction IDs signed by this account in its root
//
if ((uSetFlag == asfAccountTxnID) && !mTxnAccount->isFieldPresent (sfAccountTxnID))
if ((uSetFlag == asfAccountTxnID) && !sle->isFieldPresent (sfAccountTxnID))
{
j_.trace << "Set AccountTxnID";
mTxnAccount->makeFieldPresent (sfAccountTxnID);
sle->makeFieldPresent (sfAccountTxnID);
}
if ((uClearFlag == asfAccountTxnID) && mTxnAccount->isFieldPresent (sfAccountTxnID))
if ((uClearFlag == asfAccountTxnID) && sle->isFieldPresent (sfAccountTxnID))
{
j_.trace << "Clear AccountTxnID";
mTxnAccount->makeFieldAbsent (sfAccountTxnID);
sle->makeFieldAbsent (sfAccountTxnID);
}
//
@@ -262,12 +265,12 @@ SetAccount::doApply ()
if (!uHash)
{
j_.trace << "unset email hash";
mTxnAccount->makeFieldAbsent (sfEmailHash);
sle->makeFieldAbsent (sfEmailHash);
}
else
{
j_.trace << "set email hash";
mTxnAccount->setFieldH128 (sfEmailHash, uHash);
sle->setFieldH128 (sfEmailHash, uHash);
}
}
@@ -281,12 +284,12 @@ SetAccount::doApply ()
if (!uHash)
{
j_.trace << "unset wallet locator";
mTxnAccount->makeFieldAbsent (sfWalletLocator);
sle->makeFieldAbsent (sfWalletLocator);
}
else
{
j_.trace << "set wallet locator";
mTxnAccount->setFieldH256 (sfWalletLocator, uHash);
sle->setFieldH256 (sfWalletLocator, uHash);
}
}
@@ -306,12 +309,12 @@ SetAccount::doApply ()
if (messageKey.empty ())
{
j_.debug << "set message key";
mTxnAccount->makeFieldAbsent (sfMessageKey);
sle->makeFieldAbsent (sfMessageKey);
}
else
{
j_.debug << "set message key";
mTxnAccount->setFieldVL (sfMessageKey, messageKey);
sle->setFieldVL (sfMessageKey, messageKey);
}
}
@@ -331,12 +334,12 @@ SetAccount::doApply ()
if (domain.empty ())
{
j_.trace << "unset domain";
mTxnAccount->makeFieldAbsent (sfDomain);
sle->makeFieldAbsent (sfDomain);
}
else
{
j_.trace << "set domain";
mTxnAccount->setFieldVL (sfDomain, domain);
sle->setFieldVL (sfDomain, domain);
}
}
@@ -350,17 +353,17 @@ SetAccount::doApply ()
if (uRate == 0 || uRate == QUALITY_ONE)
{
j_.trace << "unset transfer rate";
mTxnAccount->makeFieldAbsent (sfTransferRate);
sle->makeFieldAbsent (sfTransferRate);
}
else if (uRate > QUALITY_ONE)
{
j_.trace << "set transfer rate";
mTxnAccount->setFieldU32 (sfTransferRate, uRate);
sle->setFieldU32 (sfTransferRate, uRate);
}
}
if (uFlagsIn != uFlagsOut)
mTxnAccount->setFieldU32 (sfFlags, uFlagsOut);
sle->setFieldU32 (sfFlags, uFlagsOut);
return tesSUCCESS;
}