ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-05 08:48:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace dirAdd() calls with dirAppend() or dirInsert():

Browse Source
This commit is contained in:
Scott Schurr
2021-04-20 13:35:43 -07:00
committed by manojsdoshi
parent dcba79be48
commit 7822a28c87
9 changed files with 51 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/ripple/app/tx/impl/CreateCheck.cpp
View File

@@ -183,10 +183,11 @@ CreateCheck::doApply()
return tecINSUFFICIENT_RESERVE;
}
// Note that we we use the value from the sequence or ticket as the
// Note that we use the value from the sequence or ticket as the
// Check sequence. For more explanation see comments in SeqProxy.h.
std::uint32_t const seq = ctx_.tx.getSeqProxy().value();
auto sleCheck = std::make_shared<SLE>(keylet::check(account_, seq));
Keylet const checkKeylet = keylet::check(account_, seq);
auto sleCheck = std::make_shared<SLE>(checkKeylet);
sleCheck->setAccountID(sfAccount, account_);
AccountID const dstAccountId = ctx_.tx[sfDestination];
@@ -209,16 +210,13 @@ CreateCheck::doApply()
// destination's owner directory.
if (dstAccountId != account_)
{
auto const page = dirAdd(
view(),
auto const page = view().dirInsert(
keylet::ownerDir(dstAccountId),
sleCheck->key(),
false,
describeOwnerDir(dstAccountId),
viewJ);
checkKeylet,
describeOwnerDir(dstAccountId));
JLOG(j_.trace()) << "Adding Check to destination directory "
<< to_string(sleCheck->key()) << ": "
<< to_string(checkKeylet.key) << ": "
<< (page ? "success" : "failure");
if (!page)
@@ -228,16 +226,13 @@ CreateCheck::doApply()
}
{
auto const page = dirAdd(
view(),
auto const page = view().dirInsert(
keylet::ownerDir(account_),
sleCheck->key(),
false,
describeOwnerDir(account_),
viewJ);
checkKeylet,
describeOwnerDir(account_));
JLOG(j_.trace()) << "Adding Check to owner directory "
<< to_string(sleCheck->key()) << ": "
<< to_string(checkKeylet.key) << ": "
<< (page ? "success" : "failure");
if (!page)

16
src/ripple/app/tx/impl/CreateTicket.cpp
View File

@@ -117,23 +117,19 @@ CreateTicket::doApply()
for (std::uint32_t i = 0; i < ticketCount; ++i)
{
std::uint32_t const curTicketSeq = firstTicketSeq + i;
SLE::pointer sleTicket = std::make_shared<SLE>(
ltTICKET, getTicketIndex(account_, curTicketSeq));
Keylet const ticketKeylet = keylet::ticket(account_, curTicketSeq);
SLE::pointer sleTicket = std::make_shared<SLE>(ticketKeylet);
sleTicket->setAccountID(sfAccount, account_);
sleTicket->setFieldU32(sfTicketSequence, curTicketSeq);
view().insert(sleTicket);
auto const page = dirAdd(
view(),
auto const page = view().dirInsert(
keylet::ownerDir(account_),
sleTicket->key(),
false,
describeOwnerDir(account_),
viewJ);
ticketKeylet,
describeOwnerDir(account_));
JLOG(j_.trace()) << "Creating ticket " << to_string(sleTicket->key())
JLOG(j_.trace()) << "Creating ticket " << to_string(ticketKeylet.key)
<< ": " << (page ? "success" : "failure");
if (!page)

8
src/ripple/app/tx/impl/DepositPreauth.cpp
View File

@@ -127,8 +127,8 @@ DepositPreauth::doApply()
// Preclaim already verified that the Preauth entry does not yet exist.
// Create and populate the Preauth entry.
AccountID const auth{ctx_.tx[sfAuthorize]};
auto slePreauth =
std::make_shared<SLE>(keylet::depositPreauth(account_, auth));
Keylet const preauthKeylet = keylet::depositPreauth(account_, auth);
auto slePreauth = std::make_shared<SLE>(preauthKeylet);
slePreauth->setAccountID(sfAccount, account_);
slePreauth->setAccountID(sfAuthorize, auth);
@@ -137,11 +137,11 @@ DepositPreauth::doApply()
auto viewJ = ctx_.app.journal("View");
auto const page = view().dirInsert(
keylet::ownerDir(account_),
slePreauth->key(),
preauthKeylet,
describeOwnerDir(account_));
JLOG(j_.trace()) << "Adding DepositPreauth to owner directory "
<< to_string(slePreauth->key()) << ": "
<< to_string(preauthKeylet.key) << ": "
<< (page ? "success" : "failure");
if (!page)

23
src/ripple/app/tx/impl/Escrow.cpp
View File

@@ -231,8 +231,9 @@ EscrowCreate::doApply()
// Create escrow in ledger. Note that we we use the value from the
// sequence or ticket. For more explanation see comments in SeqProxy.h.
auto const slep = std::make_shared<SLE>(
keylet::escrow(account, ctx_.tx.getSeqProxy().value()));
Keylet const escrowKeylet =
keylet::escrow(account, ctx_.tx.getSeqProxy().value());
auto const slep = std::make_shared<SLE>(escrowKeylet);
(*slep)[sfAmount] = ctx_.tx[sfAmount];
(*slep)[sfAccount] = account;
(*slep)[~sfCondition] = ctx_.tx[~sfCondition];
@@ -246,13 +247,8 @@ EscrowCreate::doApply()
// Add escrow to sender's owner directory
{
auto page = dirAdd(
ctx_.view(),
keylet::ownerDir(account),
slep->key(),
false,
describeOwnerDir(account),
ctx_.app.journal("View"));
auto page = ctx_.view().dirInsert(
keylet::ownerDir(account), escrowKeylet, describeOwnerDir(account));
if (!page)
return tecDIR_FULL;
(*slep)[sfOwnerNode] = *page;
@@ -261,13 +257,8 @@ EscrowCreate::doApply()
// If it's not a self-send, add escrow to recipient's owner directory.
if (auto const dest = ctx_.tx[sfDestination]; dest != ctx_.tx[sfAccount])
{
auto page = dirAdd(
ctx_.view(),
keylet::ownerDir(dest),
slep->key(),
false,
describeOwnerDir(dest),
ctx_.app.journal("View"));
auto page = ctx_.view().dirInsert(
keylet::ownerDir(dest), escrowKeylet, describeOwnerDir(dest));
if (!page)
return tecDIR_FULL;
(*slep)[sfDestinationNode] = *page;

24
src/ripple/app/tx/impl/PayChan.cpp
View File

@@ -246,8 +246,10 @@ PayChanCreate::doApply()
//
// Note that we we use the value from the sequence or ticket as the
// payChan sequence. For more explanation see comments in SeqProxy.h.
auto const slep = std::make_shared<SLE>(
keylet::payChan(account, dst, ctx_.tx.getSeqProxy().value()));
Keylet const payChanKeylet =
keylet::payChan(account, dst, ctx_.tx.getSeqProxy().value());
auto const slep = std::make_shared<SLE>(payChanKeylet);
// Funds held in this channel
(*slep)[sfAmount] = ctx_.tx[sfAmount];
// Amount channel has already paid
@@ -264,13 +266,10 @@ PayChanCreate::doApply()
// Add PayChan to owner directory
{
auto const page = dirAdd(
ctx_.view(),
auto const page = ctx_.view().dirInsert(
keylet::ownerDir(account),
slep->key(),
false,
describeOwnerDir(account),
ctx_.app.journal("View"));
payChanKeylet,
describeOwnerDir(account));
if (!page)
return tecDIR_FULL;
(*slep)[sfOwnerNode] = *page;
@@ -279,13 +278,8 @@ PayChanCreate::doApply()
// Add PayChan to the recipient's owner directory
if (ctx_.view().rules().enabled(fixPayChanRecipientOwnerDir))
{
auto const page = dirAdd(
ctx_.view(),
keylet::ownerDir(dst),
slep->key(),
false,
describeOwnerDir(dst),
ctx_.app.journal("View"));
auto const page = ctx_.view().dirInsert(
keylet::ownerDir(dst), payChanKeylet, describeOwnerDir(dst));
if (!page)
return tecDIR_FULL;
(*slep)[sfDestinationNode] = *page;

9
src/ripple/app/tx/impl/SetSignerList.cpp
View File

@@ -342,13 +342,8 @@ SetSignerList::replaceSignerList()
auto viewJ = ctx_.app.journal("View");
// Add the signer list to the account's directory.
auto const page = dirAdd(
ctx_.view(),
ownerDirKeylet,
signerListKeylet.key,
false,
describeOwnerDir(account_),
viewJ);
auto const page = ctx_.view().dirInsert(
ownerDirKeylet, signerListKeylet, describeOwnerDir(account_));
JLOG(j_.trace()) << "Create signer list for account " << toBase58(account_)
<< ": " << (page ? "success" : "failure");

19
src/ripple/ledger/ApplyView.h
View File

@@ -273,22 +273,19 @@ public:
allowable pages.
*/
/** @{ */
std::optional<std::uint64_t>
dirAppend(
Keylet const& directory,
uint256 const& key,
std::function<void(std::shared_ptr<SLE> const&)> const& describe)
{
return dirAdd(true, directory, key, describe);
}
std::optional<std::uint64_t>
dirAppend(
Keylet const& directory,
Keylet const& key,
std::function<void(std::shared_ptr<SLE> const&)> const& describe)
{
return dirAppend(directory, key.key, describe);
if (key.type != ltOFFER)
{
assert(!"Only Offers are appended to book directories. "
"Call dirInsert() instead.");
return std::nullopt;
}
return dirAdd(true, directory, key.key, describe);
}
/** @} */
@@ -325,7 +322,7 @@ public:
Keylet const& key,
std::function<void(std::shared_ptr<SLE> const&)> const& describe)
{
return dirInsert(directory, key.key, describe);
return dirAdd(false, directory, key.key, describe);
}
/** @} */

10
src/ripple/ledger/View.h
View File

@@ -249,16 +249,6 @@ dirNext(
[[nodiscard]] std::function<void(SLE::ref)>
describeOwnerDir(AccountID const& account);
// deprecated
std::optional<std::uint64_t>
dirAdd(
ApplyView& view,
Keylet const& uRootIndex,
uint256 const& uLedgerIndex,
bool strictOrder,
std::function<void(SLE::ref)> fDescriber,
beast::Journal j);
// VFALCO NOTE Both STAmount parameters should just
// be "Amount", a unit-less number.
//

29
src/ripple/ledger/impl/View.cpp
View File

@@ -721,21 +721,6 @@ describeOwnerDir(AccountID const& account)
};
}
std::optional<std::uint64_t>
dirAdd(
ApplyView& view,
Keylet const& dir,
uint256 const& uLedgerIndex,
bool strictOrder,
std::function<void(SLE::ref)> fDescriber,
beast::Journal j)
{
if (strictOrder)
return view.dirAppend(dir, uLedgerIndex, fDescriber);
return view.dirInsert(dir, uLedgerIndex, fDescriber);
}
TER
trustCreate(
ApplyView& view,
@@ -765,24 +750,18 @@ trustCreate(
auto const sleRippleState = std::make_shared<SLE>(ltRIPPLE_STATE, uIndex);
view.insert(sleRippleState);
auto lowNode = dirAdd(
view,
auto lowNode = view.dirInsert(
keylet::ownerDir(uLowAccountID),
sleRippleState->key(),
false,
describeOwnerDir(uLowAccountID),
j);
describeOwnerDir(uLowAccountID));
if (!lowNode)
return tecDIR_FULL;
auto highNode = dirAdd(
view,
auto highNode = view.dirInsert(
keylet::ownerDir(uHighAccountID),
sleRippleState->key(),
false,
describeOwnerDir(uHighAccountID),
j);
describeOwnerDir(uHighAccountID));
if (!highNode)
return tecDIR_FULL;