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

fix: failing unit-tests

Browse Source
This commit is contained in:
Vito
2026-06-22 16:26:07 +02:00
parent e0872d9094
commit 0e3cd2e4f7
2 changed files with 58 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/test/app/AMMMPT_test.cpp
View File

@@ -62,6 +62,21 @@ namespace xrpl::test {
struct AMMMPT_test : public jtx::AMMTest
{
private:
// All 2^N permutations of testableAmendments() with each subset of the
// given features excluded.
static std::vector<FeatureBitset>
amendmentCombinations(std::initializer_list<uint256> features)
{
std::vector<FeatureBitset> result{jtx::testableAmendments()};
for (auto const& f : features)
{
auto const n = result.size();
for (std::size_t i = 0; i < n; ++i)
result.push_back(result[i] - f);
}
return result;
}
void
testInstanceCreate()
{
@@ -726,13 +741,14 @@ private:
ammAlice.deposit(carol_, 1'000, std::nullopt, std::nullopt, Ter(tecLOCKED));
if (!features[featureAMMClawback])
// Post-fixCleanup3_3_0 a locked holder cannot deposit the other
// (non-locked) token either, matching featureAMMClawback.
if (!features[featureAMMClawback] && !features[fixCleanup3_3_0])
{
ammAlice.deposit(carol_, USD(100), std::nullopt, std::nullopt, std::nullopt);
}
else
{
// Carol can not deposit non-frozen token either
ammAlice.deposit(
carol_, USD(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecLOCKED));
}
@@ -753,8 +769,15 @@ private:
gw_, STAmount{Issue{gw_["USD"].currency, ammAlice.ammAccount()}, 0}, tfSetFreeze));
env.close();
// Can deposit non-frozen token
ammAlice.deposit(carol_, btc(100), std::nullopt, std::nullopt, std::nullopt);
// Post-fixCleanup3_3_0 the deposit checks both pool assets, so the
// non-frozen token cannot be deposited while the AMM's USD is frozen.
ammAlice.deposit(
carol_,
btc(100),
std::nullopt,
std::nullopt,
std::nullopt,
features[fixCleanup3_3_0] ? Ter(tecFROZEN) : Ter(tesSUCCESS));
// Cannot deposit frozen token
ammAlice.deposit(carol_, 1'000'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
@@ -773,8 +796,15 @@ private:
// Individually lock AMM
btc.set({.holder = ammAlice.ammAccount(), .flags = tfMPTLock});
// Can deposit non-frozen token
ammAlice.deposit(carol_, USD(100), std::nullopt, std::nullopt, std::nullopt);
// Post-fixCleanup3_3_0 the non-locked token cannot be deposited
// while the AMM's BTC is locked.
ammAlice.deposit(
carol_,
USD(100),
std::nullopt,
std::nullopt,
std::nullopt,
features[fixCleanup3_3_0] ? Ter(tecLOCKED) : Ter(tesSUCCESS));
// Can not deposit locked token
ammAlice.deposit(carol_, 1'000, std::nullopt, std::nullopt, Ter(tecLOCKED));
@@ -788,7 +818,9 @@ private:
ammAlice.deposit(carol_, btc(100), std::nullopt, std::nullopt, std::nullopt);
}
// Individually lock MPT (AMM) account with MPT/MPT AMM
// Individually lock MPT (AMM) account with MPT/MPT AMM.
// This block always runs with all amendments (incl. fixCleanup3_3_0),
// so the deposit checks both pool assets unconditionally.
{
Env env{*this};
env.fund(XRP(10'000), gw_, alice_, carol_);
@@ -826,8 +858,10 @@ private:
// Individually lock MPT BTC (AMM) account
btc.set({.holder = ammAlice.ammAccount(), .flags = tfMPTLock});
// Can deposit non-locked token USD
ammAlice.deposit(carol_, usd(100), std::nullopt, std::nullopt, std::nullopt);
// Post-fixCleanup3_3_0 the non-locked token USD cannot be deposited
// while the AMM's BTC is locked.
ammAlice.deposit(
carol_, usd(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecLOCKED));
// Can not deposit locked token BTC
ammAlice.deposit(carol_, 1'000, std::nullopt, std::nullopt, Ter(tecLOCKED));
@@ -843,8 +877,10 @@ private:
// Individually Lock MPT USD (AMM) account
usd.set({.holder = ammAlice.ammAccount(), .flags = tfMPTLock});
// Can deposit non-locked token BTC
ammAlice.deposit(carol_, btc(100), std::nullopt, std::nullopt, std::nullopt);
// Post-fixCleanup3_3_0 the non-locked token BTC cannot be deposited
// while the AMM's USD is locked.
ammAlice.deposit(
carol_, btc(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecLOCKED));
// Can not deposit locked token USD
ammAlice.deposit(carol_, 1'000, std::nullopt, std::nullopt, Ter(tecLOCKED));
@@ -876,7 +912,9 @@ private:
AMM amm(env, alice, XRP(10'000), btc(10'000));
env.close();
if (!features[featureAMMClawback])
// Post-fixCleanup3_3_0 the deposit requires authorization for both
// pool assets, so the unauthorized MPT blocks the XRP deposit too.
if (!features[featureAMMClawback] && !features[fixCleanup3_3_0])
{
amm.deposit(carol, XRP(10), std::nullopt, std::nullopt, std::nullopt);
}
@@ -7081,8 +7119,8 @@ private:
FeatureBitset const all{jtx::testableAmendments()};
testInstanceCreate();
testInvalidInstance();
testInvalidDeposit(all);
testInvalidDeposit(all - featureAMMClawback);
for (auto const& f : amendmentCombinations({fixCleanup3_3_0, featureAMMClawback}))
testInvalidDeposit(f);
testDeposit();
testInvalidWithdraw();
testWithdraw();

12
src/test/app/MPToken_test.cpp
View File

@@ -7567,15 +7567,15 @@ class MPToken_test : public beast::unit_test::Suite
// MPTLock is set
usd.set({.flags = tfMPTLock});
// carol and issuer can't withdraw
auto const fix330 = env.current()->rules().enabled(fixCleanup3_3_0);
// carol can't withdraw the locked token; post-fixCleanup3_3_0 the
// issuer can still redeem its own locked token.
for (auto const& account : {carol, gw})
{
auto const lockErr = (fix330 && account == gw) ? Ter(tesSUCCESS) : Ter(tecLOCKED);
amm.withdraw(
{.account = account,
.asset1Out = usd(1),
.asset2Out = eur(1),
.err = Ter(tecLOCKED)});
amm.withdraw({.account = account, .tokens = 1'000, .err = Ter(tecLOCKED)});
{.account = account, .asset1Out = usd(1), .asset2Out = eur(1), .err = lockErr});
amm.withdraw({.account = account, .tokens = 1'000, .err = lockErr});
// can single withdraw another asset
amm.withdraw(
{.account = account, .asset1Out = eur(1), .assets = std::make_pair(eur, usd)});