ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-06-07 18:56:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into dangell7/batch-v1

Browse Source
This commit is contained in:
Denis Angell
2026-04-07 14:47:47 +02:00
parent 871d60f910
commit bd91668883
799 changed files with 10002 additions and 8516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/jtx/impl/AMM.cpp
View File

@@ -2,12 +2,12 @@
#include <test/jtx/Env.h>
#include <xrpl/basics/safe_cast.h>
#include <xrpl/ledger/helpers/AMMHelpers.h>
#include <xrpl/ledger/helpers/AMMUtils.h>
#include <xrpl/protocol/AMMCore.h>
#include <xrpl/protocol/AmountConversions.h>
#include <xrpl/protocol/ApiVersion.h>
#include <xrpl/protocol/jss.h>
#include <xrpl/tx/transactors/dex/AMMHelpers.h>
#include <xrpl/tx/transactors/dex/AMMUtils.h>
namespace xrpl {
namespace test {
@@ -443,7 +443,7 @@ AMM::deposit(
// If including asset1In and asset2In or tokens as
// deposit min amounts then must set the flags
// explicitly instead of relying on this logic.
if (!(jvFlags & tfDepositSubTx))
if ((jvFlags & tfDepositSubTx) == 0u)
{
if (tokens && !asset1In)
{
@@ -573,7 +573,7 @@ AMM::withdraw(
std::uint32_t jvFlags = 0;
if (flags)
jvFlags = *flags;
if (!(jvFlags & tfWithdrawSubTx))
if ((jvFlags & tfWithdrawSubTx) == 0u)
{
if (tokens && !asset1Out)
{
@@ -677,13 +677,13 @@ AMM::bid(BidArg const& arg)
};
if (arg.bidMin)
{
STAmount saTokens = getBid(*arg.bidMin);
STAmount const saTokens = getBid(*arg.bidMin);
saTokens.setJson(jv[jss::BidMin]);
bidMin_ = saTokens.iou();
}
if (arg.bidMax)
{
STAmount saTokens = getBid(*arg.bidMax);
STAmount const saTokens = getBid(*arg.bidMax);
saTokens.setJson(jv[jss::BidMax]);
bidMax_ = saTokens.iou();
}
@@ -775,7 +775,7 @@ AMM::expectAuctionSlot(auto&& cb) const
// to avoid the failure.
auto const slotFee = auctionSlot[~sfDiscountedFee].value_or(0);
auto const slotInterval = ammAuctionTimeSlot(
env_.app().timeKeeper().now().time_since_epoch().count(), auctionSlot);
env_.app().getTimeKeeper().now().time_since_epoch().count(), auctionSlot);
auto const slotPrice = auctionSlot[sfPrice].iou();
auto const authAccounts = auctionSlot.getFieldArray(sfAuthAccounts);
return cb(slotFee, slotInterval, slotPrice, authAccounts);