Merge branch 'ripple/se/fees' into ripple/smart-escrow

This commit is contained in:
Mayukha Vadari
2026-01-06 17:22:42 -05:00
committed by GitHub
1297 changed files with 6764 additions and 6788 deletions

View File

@@ -21,7 +21,7 @@
#include <utility>
#include <vector>
namespace ripple {
namespace xrpl {
namespace test {
/**
@@ -3646,7 +3646,7 @@ private:
auto const pk = carol.pk();
auto const settleDelay = 100s;
NetClock::time_point const cancelAfter =
env.current()->info().parentCloseTime + 200s;
env.current()->header().parentCloseTime + 200s;
env(paychan::create(
carol,
ammAlice.ammAccount(),
@@ -7481,7 +7481,7 @@ private:
for (int i = 0; i < 256; ++i)
{
AccountID const accountId =
ripple::pseudoAccountAddress(*env.current(), keylet.key);
xrpl::pseudoAccountAddress(*env.current(), keylet.key);
env(pay(env.master.id(), accountId, XRP(1000)),
seq(autofill),
@@ -7952,7 +7952,7 @@ private:
}
};
BEAST_DEFINE_TESTSUITE_PRIO(AMM, app, ripple, 1);
BEAST_DEFINE_TESTSUITE_PRIO(AMM, app, xrpl, 1);
} // namespace test
} // namespace ripple
} // namespace xrpl