Address PR comments

Signed-off-by: JCW <a1q123456@users.noreply.github.com>
This commit is contained in:
JCW
2026-03-24 17:02:50 +00:00
parent af15f7672e
commit 56c774add8
3 changed files with 15 additions and 17 deletions

View File

@@ -49,11 +49,11 @@ protected:
bobSeq,
batchFee,
tfAllOrNothing,
aliceSeq,
{loanSet,
del(alice, loanKeylet.key),
manage(alice, loanKeylet.key, tfLoanImpair),
pay(alice, loanKeylet.key, XRP(500))},
aliceSeq),
pay(alice, loanKeylet.key, XRP(500))}),
batch::sig(alice));
env(batchTxn, ter(temINVALID_INNER_BATCH));
};
@@ -100,8 +100,8 @@ protected:
brokerSeq,
batchFee,
tfAllOrNothing,
{txns.vaultCreateTx, txns.vaultDepositTx, txns.brokerSetTx, *txns.coverDepositTx},
brokerSeq + 1));
brokerSeq + 1,
{txns.vaultCreateTx, txns.vaultDepositTx, txns.brokerSetTx, *txns.coverDepositTx}));
env(batchTxn);
env.close();
@@ -163,7 +163,7 @@ protected:
// Create the batch transaction with both LoanSet and LoanDelete
auto const batchTxn = env.jt(
batch::make(
broker, brokerSeq, batchFee, tfAllOrNothing, {loanSetTx, loanDelTx}, brokerSeq + 1),
broker, brokerSeq, batchFee, tfAllOrNothing, brokerSeq + 1, {loanSetTx, loanDelTx}),
batch::sig(borrower));
env(batchTxn);
@@ -229,7 +229,7 @@ protected:
// Create the batch transaction with LoanSet and impair
auto const batchTxn = env.jt(
batch::make(
broker, brokerSeq, batchFee, tfAllOrNothing, {loanSetTx, impairTx}, brokerSeq + 1),
broker, brokerSeq, batchFee, tfAllOrNothing, brokerSeq + 1, {loanSetTx, impairTx}),
batch::sig(borrower));
auto currentTime = env.now().time_since_epoch().count();
@@ -374,8 +374,8 @@ protected:
brokerSeq,
batchFee,
tfAllOrNothing,
{defaultTx, withdrawTx, paymentTx},
brokerSeq + 1));
brokerSeq + 1,
{defaultTx, withdrawTx, paymentTx}));
env(batchTxn);
env.close();
@@ -511,8 +511,8 @@ protected:
borrowerSeq,
batchFee,
tfAllOrNothing,
{loanSetTx, buyTx, sellTx, payTx},
borrowerSeq + 1),
borrowerSeq + 1,
{loanSetTx, buyTx, sellTx, payTx}),
batch::sig(broker));
env(batchTxn);
@@ -668,8 +668,8 @@ protected:
borrowerSeq,
batchFee,
tfAllOrNothing,
{loanSetTx, buyTx, sellTx, payTx},
borrowerSeq + 1),
borrowerSeq + 1,
{loanSetTx, buyTx, sellTx, payTx}),
batch::sig(broker));
env(batchTxn);

View File

@@ -87,9 +87,8 @@ make(
uint32_t seq,
STAmount const& fee,
std::uint32_t flags,
std::vector<Json::Value> const& txns,
std::uint32_t innerStartSeq,
std::optional<std::uint32_t> const& ticket = std::nullopt);
std::vector<Json::Value> const& txns);
/** Set a batch signature on a JTx. */
class sig

View File

@@ -53,14 +53,13 @@ make(
uint32_t seq,
STAmount const& fee,
std::uint32_t flags,
std::vector<Json::Value> const& txns,
std::uint32_t innerStartSeq,
std::optional<std::uint32_t> const& ticket)
std::vector<Json::Value> const& txns)
{
auto jv = outer(account, seq, fee, flags);
for (std::size_t i = 0; i < txns.size(); ++i)
{
inner in(txns[i], innerStartSeq + static_cast<std::uint32_t>(i), ticket);
inner in(txns[i], innerStartSeq + static_cast<std::uint32_t>(i));
auto const index = jv[jss::RawTransactions].size();
Json::Value& batchTransaction = jv[jss::RawTransactions][index];
batchTransaction = Json::Value{};