Review feedback

This commit is contained in:
Bronek Kozicki
2025-05-06 19:06:45 +01:00
parent e6b9108d26
commit aead1bfb3d
8 changed files with 10 additions and 16 deletions

View File

@@ -729,8 +729,6 @@ JSS(write_load); // out: GetCounts
#undef JSS #undef JSS
// clang-format on
} // namespace jss } // namespace jss
} // namespace ripple } // namespace ripple

View File

@@ -216,7 +216,7 @@ SetTrust::preclaim(PreclaimContext const& ctx)
// SetTrust if the asset is AMM LP token and AMM is not in empty state. // SetTrust if the asset is AMM LP token and AMM is not in empty state.
if (sleDst->isFieldPresent(sfAMMID)) if (sleDst->isFieldPresent(sfAMMID))
{ {
if (ctx.view.read(keylet::line(id, uDstAccountID, currency))) if (ctx.view.exists(keylet::line(id, uDstAccountID, currency)))
{ {
// pass // pass
} }
@@ -236,7 +236,7 @@ SetTrust::preclaim(PreclaimContext const& ctx)
} }
else if (sleDst->isFieldPresent(sfVaultID)) else if (sleDst->isFieldPresent(sfVaultID))
{ {
if (ctx.view.read(keylet::line(id, uDstAccountID, currency))) if (ctx.view.exists(keylet::line(id, uDstAccountID, currency)))
{ {
// pass // pass
} }

View File

@@ -108,7 +108,7 @@ VaultCreate::preclaim(PreclaimContext const& ctx)
auto issuance = ctx.view.read(keylet::mptIssuance(mptID)); auto issuance = ctx.view.read(keylet::mptIssuance(mptID));
if (!issuance) if (!issuance)
return tecOBJECT_NOT_FOUND; return tecOBJECT_NOT_FOUND;
if ((issuance->getFlags() & lsfMPTCanTransfer) == 0) if (!issuance->isFlag(lsfMPTCanTransfer))
return tecNO_AUTH; return tecNO_AUTH;
} }
else if (vaultAsset.holds<Issue>()) else if (vaultAsset.holds<Issue>())

View File

@@ -100,10 +100,6 @@ VaultDelete::doApply()
auto const mpt = view().peek(keylet::mptIssuance(vault->at(sfShareMPTID))); auto const mpt = view().peek(keylet::mptIssuance(vault->at(sfShareMPTID)));
if (!mpt) if (!mpt)
return tefINTERNAL; // LCOV_EXCL_LINE return tefINTERNAL; // LCOV_EXCL_LINE
if (pseudoID != mpt->getAccountID(sfIssuer))
return tefINTERNAL; // LCOV_EXCL_LINE
if (mpt->at(sfOutstandingAmount) != 0)
return tefINTERNAL; // LCOV_EXCL_LINE
if (!view().dirRemove( if (!view().dirRemove(
keylet::ownerDir(pseudoID), (*mpt)[sfOwnerNode], mpt->key(), false)) keylet::ownerDir(pseudoID), (*mpt)[sfOwnerNode], mpt->key(), false))
@@ -121,9 +117,6 @@ VaultDelete::doApply()
// Remove the vault from its owner's directory. // Remove the vault from its owner's directory.
auto const ownerID = vault->at(sfOwner); auto const ownerID = vault->at(sfOwner);
if (ownerID != account_)
return tefINTERNAL; // LCOV_EXCL_LINE
if (!view().dirRemove( if (!view().dirRemove(
keylet::ownerDir(ownerID), keylet::ownerDir(ownerID),
vault->at(sfOwnerNode), vault->at(sfOwnerNode),

View File

@@ -74,6 +74,8 @@ VaultDeposit::preclaim(PreclaimContext const& ctx)
auto issuance = ctx.view.read(keylet::mptIssuance(mptID)); auto issuance = ctx.view.read(keylet::mptIssuance(mptID));
if (!issuance) if (!issuance)
return tecOBJECT_NOT_FOUND; return tecOBJECT_NOT_FOUND;
if (!issuance->isFlag(lsfMPTCanTransfer))
return tecNO_AUTH;
} }
else if (vaultAsset.holds<Issue>()) else if (vaultAsset.holds<Issue>())
{ {

View File

@@ -147,13 +147,12 @@ VaultSet::doApply()
// sfDomainID flag must be set in the MPTokenIssuance object and can // sfDomainID flag must be set in the MPTokenIssuance object and can
// be freely updated. // be freely updated.
sleIssuance->setFieldH256(sfDomainID, *domainId); sleIssuance->setFieldH256(sfDomainID, *domainId);
view().update(sleIssuance);
} }
else if (sleIssuance->isFieldPresent(sfDomainID)) else if (sleIssuance->isFieldPresent(sfDomainID))
{ {
sleIssuance->makeFieldAbsent(sfDomainID); sleIssuance->makeFieldAbsent(sfDomainID);
view().update(sleIssuance);
} }
view().update(sleIssuance);
} }
view().update(vault); view().update(vault);

View File

@@ -76,6 +76,8 @@ VaultWithdraw::preclaim(PreclaimContext const& ctx)
auto issuance = ctx.view.read(keylet::mptIssuance(mptID)); auto issuance = ctx.view.read(keylet::mptIssuance(mptID));
if (!issuance) if (!issuance)
return tecOBJECT_NOT_FOUND; return tecOBJECT_NOT_FOUND;
if (!issuance->isFlag(lsfMPTCanTransfer))
return tecNO_AUTH;
} }
else if (vaultAsset.holds<Issue>()) else if (vaultAsset.holds<Issue>())
{ {

View File

@@ -1141,7 +1141,7 @@ addEmptyHolding(
auto const& issuerId = issue.getIssuer(); auto const& issuerId = issue.getIssuer();
auto const& currency = issue.currency; auto const& currency = issue.currency;
if (isGlobalFrozen(view, issuerId)) if (isGlobalFrozen(view, issuerId))
return tecINTERNAL; // LCOV_EXCL_LINE return tecFROZEN; // LCOV_EXCL_LINE
auto const& srcId = issuerId; auto const& srcId = issuerId;
auto const& dstId = accountID; auto const& dstId = accountID;
@@ -1185,7 +1185,7 @@ addEmptyHolding(
auto const& mptID = mptIssue.getMptID(); auto const& mptID = mptIssue.getMptID();
auto const mpt = view.peek(keylet::mptIssuance(mptID)); auto const mpt = view.peek(keylet::mptIssuance(mptID));
if (!mpt) if (!mpt)
return tecOBJECT_NOT_FOUND; return tefINTERNAL; // LCOV_EXCL_LINE
if (mpt->isFlag(lsfMPTLocked)) if (mpt->isFlag(lsfMPTLocked))
return tecLOCKED; return tecLOCKED;
if (view.peek(keylet::mptoken(mptID, accountID))) if (view.peek(keylet::mptoken(mptID, accountID)))