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

fix: Address review comments

Browse Source
This commit is contained in:
TimothyBanks
2026-09-09 11:45:50 -04:00
parent c9b365315f
commit 2d7e92ffc5
2 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/tests/libxrpl/tx/wasm/transactor/BytecodeSize.cpp
View File

@@ -3,7 +3,6 @@
#include <xrpl/protocol/Fees.h>
#include <xrpl/protocol/STAmount.h>
#include <xrpl/protocol/TER.h>
#include <xrpl/protocol/XRPAmount.h>
#include <xrpl/protocol_autogen/transactions/EscrowCreate.h>
#include <xrpl/tx/wasm/WasmCommon.h>
#include <xrpl/tx/wasm/WasmVM.h>
@@ -12,22 +11,14 @@
#include <helpers/Account.h>
#include <helpers/TestServiceRegistry.h>
#include <helpers/TxTest.h>
#include <tx/wasm/fixtures/EscrowWasm.h>
#include <tx/wasm/fixtures/ModuleBuilder.h>
#include <cstdint>
#include <optional>
namespace xrpl::test {
namespace {
// `EscrowCreate::calculateBaseFee`: ten base fees plus five drops a byte.
XRPAmount
createFee(TxTest const& env, Bytes const& bytecode)
{
return (env.getOpenLedger().fees().base * 10) +
XRPAmount{static_cast<std::int64_t>(bytecode.size()) * 5};
}
TER
createEscrowWith(TxTest& env, Account const& account, Bytes const& bytecode)
{
@@ -35,7 +26,7 @@ createEscrowWith(TxTest& env, Account const& account, Bytes const& bytecode)
builder.setBytecode(makeSlice(bytecode));
builder.setCancelAfter(closeTimeOffset(env, 100));
return env.submit(builder, account, createFee(env, bytecode)).ter;
return env.submit(builder, account, escrowCreateFee(env, bytecode)).ter;
}
// Rich enough for the owner reserve a 200 KB contract demands: 401 increments, 802 XRP.

15
src/tests/libxrpl/tx/wasm/transactor/DataOnReject.cpp
View File

@@ -1,23 +1,21 @@
#include <xrpl/basics/Slice.h>
#include <xrpl/basics/strHex.h>
#include <xrpl/protocol/Fees.h>
#include <xrpl/protocol/Indexes.h>
#include <xrpl/protocol/SField.h>
#include <xrpl/protocol/STAmount.h>
#include <xrpl/protocol/SeqProxy.h>
#include <xrpl/protocol/TER.h>
#include <xrpl/protocol/TxMeta.h>
#include <xrpl/protocol/XRPAmount.h>
#include <xrpl/protocol_autogen/transactions/EscrowCreate.h>
#include <xrpl/protocol_autogen/transactions/EscrowFinish.h>
#include <gtest/gtest.h>
#include <helpers/Account.h>
#include <helpers/TxTest.h>
#include <tx/wasm/fixtures/EscrowWasm.h>
#include <tx/wasm/fixtures/WasmRun.h>
#include <cstdint>
#include <optional>
#include <string>
#include <string_view>
@@ -60,9 +58,7 @@ struct DataOnReject : testing::Test
builder.setBytecode(makeSlice(wasm));
builder.setCancelAfter(closeTimeOffset(env, 1'000));
auto const fee = (env.getOpenLedger().fees().base * 10) +
XRPAmount{static_cast<std::int64_t>(wasm.size()) * 5};
ASSERT_EQ(env.submit(builder, alice, fee).ter, tesSUCCESS);
ASSERT_EQ(env.submit(builder, alice, escrowCreateFee(env, wasm)).ter, tesSUCCESS);
env.close();
}
@@ -72,12 +68,7 @@ struct DataOnReject : testing::Test
auto builder = transactions::EscrowFinishBuilder{alice, alice, escrowSeq};
builder.setGas(kAllowance);
auto const& fees = env.getOpenLedger().fees();
auto const gasFee = XRPAmount{
static_cast<std::int64_t>(
(std::uint64_t{kAllowance} * fees.gasPrice) / microDropsPerDrop) +
1};
return env.submitAndClose(builder, alice, fees.base + gasFee);
return env.submitAndClose(builder, alice, escrowFinishFee(env, kAllowance));
}
};