ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-04-29 15:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename sfAsset... fields to sfAssets...

Browse Source
This commit is contained in:
Bronek Kozicki
2025-03-26 19:19:30 +00:00
parent b6d7ef6c02
commit 0636d4695d
11 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/test/app/Vault_test.cpp
View File

@@ -71,7 +71,7 @@ class Vault_test : public beast::unit_test::suite
{
testcase(prefix + " fail to set negative maximum");
auto tx = vault.set({.owner = owner, .id = keylet.key});
tx[sfAssetMaximum] = negativeAmount(asset).number();
tx[sfAssetsMaximum] = negativeAmount(asset).number();
env(tx, ter{temMALFORMED});
}
@@ -138,7 +138,7 @@ class Vault_test : public beast::unit_test::suite
{
testcase(prefix + " fail to update because wrong owner");
auto tx = vault.set({.owner = issuer, .id = keylet.key});
tx[sfAssetMaximum] = asset(50).number();
tx[sfAssetsMaximum] = asset(50).number();
env(tx, ter(tecNO_PERMISSION));
}
@@ -153,21 +153,21 @@ class Vault_test : public beast::unit_test::suite
testcase(
prefix + " fail to set maximum lower than current amount");
auto tx = vault.set({.owner = owner, .id = keylet.key});
tx[sfAssetMaximum] = asset(50).number();
tx[sfAssetsMaximum] = asset(50).number();
env(tx, ter(tecLIMIT_EXCEEDED));
}
{
testcase(prefix + " fail to set zero vault");
auto tx = vault.set({.owner = owner, .id = beast::zero});
tx[sfAssetMaximum] = asset(150).number();
tx[sfAssetsMaximum] = asset(150).number();
env(tx, ter(temMALFORMED));
}
{
testcase(prefix + " set maximum higher than current amount");
auto tx = vault.set({.owner = owner, .id = keylet.key});
tx[sfAssetMaximum] = asset(150).number();
tx[sfAssetsMaximum] = asset(150).number();
env(tx);
}
@@ -197,7 +197,7 @@ class Vault_test : public beast::unit_test::suite
{
testcase(prefix + " reset maximum to zero i.e. not enforced");
auto tx = vault.set({.owner = owner, .id = keylet.key});
tx[sfAssetMaximum] = asset(0).number();
tx[sfAssetsMaximum] = asset(0).number();
env(tx);
}
@@ -428,7 +428,7 @@ class Vault_test : public beast::unit_test::suite
Vault& vault) {
testcase("nothing to set");
auto tx = vault.set({.owner = owner, .id = keylet::skip().key});
tx[sfAssetMaximum] = asset(0).number();
tx[sfAssetsMaximum] = asset(0).number();
env(tx, ter(tecNO_ENTRY));
});
@@ -714,7 +714,7 @@ class Vault_test : public beast::unit_test::suite
BEAST_EXPECT(
jvVault[jss::result][jss::node][jss::ShareTotal] == "100");
BEAST_EXPECT(
jvVault[jss::result][jss::node][sfAssetTotal.fieldName] ==
jvVault[jss::result][jss::node][sfAssetsTotal.fieldName] ==
"100");
// Vault pseudo-account
@@ -756,7 +756,7 @@ class Vault_test : public beast::unit_test::suite
BEAST_EXPECT(
jvVault[jss::result][jss::node][jss::ShareTotal] == "50");
BEAST_EXPECT(
jvVault[jss::result][jss::node][sfAssetTotal.fieldName] ==
jvVault[jss::result][jss::node][sfAssetsTotal.fieldName] ==
"50");
}

6
src/xrpld/app/tx/detail/VaultClawback.cpp
View File

@@ -156,7 +156,7 @@ VaultClawback::doApply()
}
// Clamp to maximum.
Number maxAssets = *vault->at(sfAssetAvailable);
Number maxAssets = *vault->at(sfAssetsAvailable);
if (assets > maxAssets)
{
assets = maxAssets;
@@ -166,8 +166,8 @@ VaultClawback::doApply()
if (shares == beast::zero)
return tecINSUFFICIENT_FUNDS;
vault->at(sfAssetTotal) -= assets;
vault->at(sfAssetAvailable) -= assets;
vault->at(sfAssetsTotal) -= assets;
vault->at(sfAssetsAvailable) -= assets;
view().update(vault);
auto const& vaultAccount = vault->at(sfAccount);

10
src/xrpld/app/tx/detail/VaultCreate.cpp
View File

@@ -68,7 +68,7 @@ VaultCreate::preflight(PreflightContext const& ctx)
return temMALFORMED; // DomainID only allowed on private vaults
}
if (auto const assetMax = ctx.tx[~sfAssetMaximum])
if (auto const assetMax = ctx.tx[~sfAssetsMaximum])
{
if (*assetMax < beast::zero)
return temMALFORMED;
@@ -187,12 +187,12 @@ VaultCreate::doApply()
vault->at(sfOwner) = ownerId;
vault->at(sfAccount) = pseudoId;
vault->at(sfAsset) = tx[sfAsset];
vault->at(sfAssetTotal) = Number(0);
vault->at(sfAssetAvailable) = Number(0);
vault->at(sfAssetsTotal) = Number(0);
vault->at(sfAssetsAvailable) = Number(0);
vault->at(sfLossUnrealized) = Number(0);
// Leave default values for AssetTotal and AssetAvailable, both zero.
if (auto value = tx[~sfAssetMaximum])
vault->at(sfAssetMaximum) = *value;
if (auto value = tx[~sfAssetsMaximum])
vault->at(sfAssetsMaximum) = *value;
vault->at(sfMPTokenIssuanceID) = share;
if (auto value = tx[~sfData])
vault->at(sfData) = *value;

4
src/xrpld/app/tx/detail/VaultDelete.cpp
View File

@@ -56,10 +56,10 @@ VaultDelete::preclaim(PreclaimContext const& ctx)
if (vault->at(sfOwner) != ctx.tx[sfAccount])
return tecNO_PERMISSION;
if (vault->at(sfAssetAvailable) != 0)
if (vault->at(sfAssetsAvailable) != 0)
return tecHAS_OBLIGATIONS;
if (vault->at(sfAssetTotal) != 0)
if (vault->at(sfAssetsTotal) != 0)
return tecHAS_OBLIGATIONS;
return tesSUCCESS;

8
src/xrpld/app/tx/detail/VaultDeposit.cpp
View File

@@ -166,13 +166,13 @@ VaultDeposit::doApply()
shares.asset() != assets.asset(),
"ripple::VaultDeposit::doApply : assets are not shares");
vault->at(sfAssetTotal) += assets;
vault->at(sfAssetAvailable) += assets;
vault->at(sfAssetsTotal) += assets;
vault->at(sfAssetsAvailable) += assets;
view().update(vault);
// A deposit must not push the vault over its limit.
auto const maximum = *vault->at(sfAssetMaximum);
if (maximum != 0 && *vault->at(sfAssetTotal) > maximum)
auto const maximum = *vault->at(sfAssetsMaximum);
if (maximum != 0 && *vault->at(sfAssetsTotal) > maximum)
return tecLIMIT_EXCEEDED;
// Transfer assets from depositor to vault.

12
src/xrpld/app/tx/detail/VaultSet.cpp
View File

@@ -61,14 +61,14 @@ VaultSet::preflight(PreflightContext const& ctx)
return temMALFORMED;
}
if (auto const assetMax = ctx.tx[~sfAssetMaximum])
if (auto const assetMax = ctx.tx[~sfAssetsMaximum])
{
if (*assetMax < beast::zero)
return temMALFORMED;
}
if (!ctx.tx.isFieldPresent(sfDomainID) &&
!ctx.tx.isFieldPresent(sfAssetMaximum) &&
!ctx.tx.isFieldPresent(sfAssetsMaximum) &&
!ctx.tx.isFieldPresent(sfData))
return temMALFORMED;
@@ -132,12 +132,12 @@ VaultSet::doApply()
// Update mutable flags and fields if given.
if (tx.isFieldPresent(sfData))
vault->at(sfData) = tx[sfData];
if (tx.isFieldPresent(sfAssetMaximum))
if (tx.isFieldPresent(sfAssetsMaximum))
{
if (tx[sfAssetMaximum] != 0 &&
tx[sfAssetMaximum] < *vault->at(sfAssetTotal))
if (tx[sfAssetsMaximum] != 0 &&
tx[sfAssetsMaximum] < *vault->at(sfAssetsTotal))
return tecLIMIT_EXCEEDED;
vault->at(sfAssetMaximum) = tx[sfAssetMaximum];
vault->at(sfAssetsMaximum) = tx[sfAssetsMaximum];
}
if (tx.isFieldPresent(sfDomainID))
{

6
src/xrpld/app/tx/detail/VaultWithdraw.cpp
View File

@@ -160,11 +160,11 @@ VaultWithdraw::doApply()
// The vault must have enough assets on hand. The vault may hold assets that
// it has already pledged. That is why we look at AssetAvailable instead of
// the pseudo-account balance.
if (*vault->at(sfAssetAvailable) < assets)
if (*vault->at(sfAssetsAvailable) < assets)
return tecINSUFFICIENT_FUNDS;
vault->at(sfAssetTotal) -= assets;
vault->at(sfAssetAvailable) -= assets;
vault->at(sfAssetsTotal) -= assets;
vault->at(sfAssetsAvailable) -= assets;
view().update(vault);
auto const& vaultAccount = vault->at(sfAccount);

6
src/xrpld/ledger/detail/View.cpp
View File

@@ -2524,7 +2524,7 @@ assetsToSharesDeposit(
XRPL_ASSERT(
assets.asset() == vault->at(sfAsset),
"ripple::assetsToSharesDeposit : assets and vault match");
Number assetTotal = vault->at(sfAssetTotal);
Number assetTotal = vault->at(sfAssetsTotal);
STAmount shares{
vault->at(sfMPTokenIssuanceID), static_cast<Number>(assets)};
if (assetTotal == 0)
@@ -2543,7 +2543,7 @@ assetsToSharesWithdraw(
XRPL_ASSERT(
assets.asset() == vault->at(sfAsset),
"ripple::assetsToSharesWithdraw : assets and vault match");
Number assetTotal = vault->at(sfAssetTotal);
Number assetTotal = vault->at(sfAssetsTotal);
assetTotal -= vault->at(sfLossUnrealized);
STAmount shares{vault->at(sfMPTokenIssuanceID)};
if (assetTotal == 0)
@@ -2562,7 +2562,7 @@ sharesToAssetsWithdraw(
XRPL_ASSERT(
shares.asset() == vault->at(sfMPTokenIssuanceID),
"ripple::sharesToAssetsWithdraw : shares and vault match");
Number assetTotal = vault->at(sfAssetTotal);
Number assetTotal = vault->at(sfAssetsTotal);
assetTotal -= vault->at(sfLossUnrealized);
STAmount assets{vault->at(sfAsset)};
if (assetTotal == 0)