mirror of
https://github.com/XRPLF/rippled.git
synced 2026-07-24 15:40:26 +00:00
Merge branch 'develop' into gregtatcam/mpt/audit-attackathon-fixes-1
This commit is contained in:
@@ -12,11 +12,13 @@
|
||||
#include <test/jtx/offer.h>
|
||||
#include <test/jtx/owners.h>
|
||||
#include <test/jtx/paths.h>
|
||||
#include <test/jtx/pay.h>
|
||||
#include <test/jtx/require.h>
|
||||
#include <test/jtx/sendmax.h>
|
||||
#include <test/jtx/tags.h>
|
||||
#include <test/jtx/ter.h>
|
||||
#include <test/jtx/ticket.h>
|
||||
#include <test/jtx/trust.h>
|
||||
#include <test/jtx/txflags.h>
|
||||
|
||||
#include <xrpl/beast/unit_test/suite.h>
|
||||
@@ -1828,7 +1830,6 @@ public:
|
||||
using namespace jtx;
|
||||
|
||||
Env env{*this, features};
|
||||
env.enableFeature(fixUniversalNumber);
|
||||
|
||||
auto const gw = Account{"gateway"};
|
||||
auto const alice = Account{"alice"};
|
||||
@@ -3433,7 +3434,7 @@ public:
|
||||
auto const gw = Account("gateway");
|
||||
|
||||
auto const fee = env.current()->fees().base;
|
||||
env.fund(reserve(env, 2) + drops(9999640) + (fee), ann);
|
||||
env.fund(reserve(env, 2) + drops(9999640) + fee, ann);
|
||||
env.fund(reserve(env, 2) + (fee * 4), gw);
|
||||
env.close();
|
||||
|
||||
@@ -3469,7 +3470,7 @@ public:
|
||||
auto const bob = Account("bob");
|
||||
|
||||
auto const fee = env.current()->fees().base;
|
||||
env.fund(reserve(env, 2) + drops(400'000'000'000) + (fee), alice, bob);
|
||||
env.fund(reserve(env, 2) + drops(400'000'000'000) + fee, alice, bob);
|
||||
env.fund(reserve(env, 2) + (fee * 4), gw);
|
||||
env.close();
|
||||
|
||||
@@ -3730,10 +3731,9 @@ public:
|
||||
auto actorOffers = offersOnAccount(env, actor.acct);
|
||||
auto const offerCount = std::distance(
|
||||
actorOffers.begin(),
|
||||
std::remove_if(
|
||||
actorOffers.begin(), actorOffers.end(), [](SLE::const_pointer& offer) {
|
||||
return (*offer)[sfTakerGets].signum() == 0;
|
||||
}));
|
||||
std::ranges::remove_if(actorOffers, [](SLE::const_pointer& offer) {
|
||||
return (*offer)[sfTakerGets].signum() == 0;
|
||||
}).begin());
|
||||
BEAST_EXPECT(offerCount == actor.offers);
|
||||
|
||||
env.require(Balance(actor.acct, actor.xrp));
|
||||
@@ -3900,10 +3900,9 @@ public:
|
||||
auto actorOffers = offersOnAccount(env, actor.acct);
|
||||
auto const offerCount = std::distance(
|
||||
actorOffers.begin(),
|
||||
std::remove_if(
|
||||
actorOffers.begin(), actorOffers.end(), [](SLE::const_pointer& offer) {
|
||||
return (*offer)[sfTakerGets].signum() == 0;
|
||||
}));
|
||||
std::ranges::remove_if(actorOffers, [](SLE::const_pointer& offer) {
|
||||
return (*offer)[sfTakerGets].signum() == 0;
|
||||
}).begin());
|
||||
BEAST_EXPECT(offerCount == actor.offers);
|
||||
|
||||
env.require(Balance(actor.acct, actor.xrp));
|
||||
|
||||
Reference in New Issue
Block a user