diff --git a/src/tests/libxrpl/tx/wasm/transactor/BytecodeSize.cpp b/src/tests/libxrpl/tx/wasm/transactor/BytecodeSize.cpp index 9eb7b6a9bf..89d52eab3d 100644 --- a/src/tests/libxrpl/tx/wasm/transactor/BytecodeSize.cpp +++ b/src/tests/libxrpl/tx/wasm/transactor/BytecodeSize.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include @@ -12,22 +11,14 @@ #include #include #include +#include #include -#include #include 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(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. diff --git a/src/tests/libxrpl/tx/wasm/transactor/DataOnReject.cpp b/src/tests/libxrpl/tx/wasm/transactor/DataOnReject.cpp index 733dd47cd9..fc6a18d8ae 100644 --- a/src/tests/libxrpl/tx/wasm/transactor/DataOnReject.cpp +++ b/src/tests/libxrpl/tx/wasm/transactor/DataOnReject.cpp @@ -1,23 +1,21 @@ #include #include -#include #include #include #include #include #include #include -#include #include #include #include #include #include +#include #include #include -#include #include #include @@ -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(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::uint64_t{kAllowance} * fees.gasPrice) / microDropsPerDrop) + - 1}; - return env.submitAndClose(builder, alice, fees.base + gasFee); + return env.submitAndClose(builder, alice, escrowFinishFee(env, kAllowance)); } };