diff --git a/src/test/app/EscrowSmart_test.cpp b/src/test/app/EscrowSmart_test.cpp index 497b4847f8..4c01f5566e 100644 --- a/src/test/app/EscrowSmart_test.cpp +++ b/src/test/app/EscrowSmart_test.cpp @@ -390,7 +390,7 @@ struct EscrowSmart_test : public beast::unit_test::suite // Tests whether the ledger index is >= 5 // getLedgerSqn() >= 5} auto const& wasmHex = ledgerSqnWasmHex; - std::uint32_t const allowance = 65; + std::uint32_t const allowance = 178; auto escrowCreate = escrow::create(alice, carol, XRP(1000)); auto [createFee, finishFee] = [&]() { Env env(*this, features); @@ -683,7 +683,7 @@ struct EscrowSmart_test : public beast::unit_test::suite { env.require(balance(alice, XRP(4000) - txnFees)); - auto const allowance = 1014; + auto const allowance = 1420; XRPAmount const finishFee = env.current()->fees().base + (allowance * env.current()->fees().gasPrice) / MICRO_DROPS_PER_DROP + @@ -727,7 +727,7 @@ struct EscrowSmart_test : public beast::unit_test::suite // Tests whether the ledger index is >= 5 // getLedgerSqn() >= 5} auto const& wasmHex = ledgerSqnWasmHex; - uint64_t const allowance = 65; + uint64_t const allowance = 178; auto escrowCreate = escrow::create(alice, carol, XRP(1000)); auto createFee = [&]() { Env env(*this, features); @@ -873,7 +873,7 @@ struct EscrowSmart_test : public beast::unit_test::suite auto const txMeta = env.meta(); if (BEAST_EXPECT(txMeta && txMeta->isFieldPresent(sfGasUsed))) BEAST_EXPECTS( - txMeta->getFieldU32(sfGasUsed) == 38'054, + txMeta->getFieldU32(sfGasUsed) == 62'715, std::to_string(txMeta->getFieldU32(sfGasUsed))); if (BEAST_EXPECT(txMeta->isFieldPresent(sfWasmReturnCode))) BEAST_EXPECT(txMeta->getFieldI32(sfWasmReturnCode) == 1); @@ -958,7 +958,7 @@ struct EscrowSmart_test : public beast::unit_test::suite env.close(); env.close(); - auto const allowance = 138'485; + auto const allowance = 182'903; auto const finishFee = env.current()->fees().base + (allowance * env.current()->fees().gasPrice) / MICRO_DROPS_PER_DROP + diff --git a/src/test/app/Wasm_test.cpp b/src/test/app/Wasm_test.cpp index d07adf4f0e..9028cb544e 100644 --- a/src/test/app/Wasm_test.cpp +++ b/src/test/app/Wasm_test.cpp @@ -78,7 +78,7 @@ struct Wasm_test : public beast::unit_test::suite if (BEAST_EXPECT(re.has_value())) { BEAST_EXPECTS(re->result == 6'912, std::to_string(re->result)); - BEAST_EXPECTS(re->cost == 3, std::to_string(re->cost)); + BEAST_EXPECTS(re->cost == 59, std::to_string(re->cost)); } } @@ -166,7 +166,7 @@ struct Wasm_test : public beast::unit_test::suite if (BEAST_EXPECT(re.has_value())) { BEAST_EXPECTS(re->result == 0, std::to_string(re->result)); - BEAST_EXPECTS(re->cost == 38, std::to_string(re->cost)); + BEAST_EXPECTS(re->cost == 151, std::to_string(re->cost)); } env.close(); @@ -179,7 +179,7 @@ struct Wasm_test : public beast::unit_test::suite if (BEAST_EXPECT(re.has_value())) { BEAST_EXPECTS(re->result == 5, std::to_string(re->result)); - BEAST_EXPECTS(re->cost == 76, std::to_string(re->cost)); + BEAST_EXPECTS(re->cost == 190, std::to_string(re->cost)); } } @@ -197,7 +197,7 @@ struct Wasm_test : public beast::unit_test::suite if (BEAST_EXPECT(re.has_value())) { BEAST_EXPECTS(re->result == 55, std::to_string(re->result)); - BEAST_EXPECTS(re->cost == 696, std::to_string(re->cost)); + BEAST_EXPECTS(re->cost == 1137, std::to_string(re->cost)); } } @@ -216,7 +216,7 @@ struct Wasm_test : public beast::unit_test::suite if (BEAST_EXPECT(re.has_value())) { BEAST_EXPECTS(re->result == 34'432, std::to_string(re->result)); - BEAST_EXPECTS(re->cost == 145'573, std::to_string(re->cost)); + BEAST_EXPECTS(re->cost == 151'155, std::to_string(re->cost)); } } @@ -241,7 +241,7 @@ struct Wasm_test : public beast::unit_test::suite if (BEAST_EXPECT(re.has_value())) { BEAST_EXPECTS(re->result == 700, std::to_string(re->result)); - BEAST_EXPECTS(re->cost == 2'701'528, std::to_string(re->cost)); + BEAST_EXPECTS(re->cost == 2'886'069, std::to_string(re->cost)); } } @@ -277,7 +277,7 @@ struct Wasm_test : public beast::unit_test::suite if (BEAST_EXPECT(re.has_value())) { BEAST_EXPECTS(re->result == 1, std::to_string(re->result)); - BEAST_EXPECTS(re->cost == 842, std::to_string(re->cost)); + BEAST_EXPECTS(re->cost == 25'503, std::to_string(re->cost)); } env.close(); @@ -311,7 +311,7 @@ struct Wasm_test : public beast::unit_test::suite if (BEAST_EXPECT(re.has_value())) { BEAST_EXPECTS(re->result == 1, std::to_string(re->result)); - BEAST_EXPECTS(re->cost == 39'602, std::to_string(re->cost)); + BEAST_EXPECTS(re->cost == 64'263, std::to_string(re->cost)); } env.close(); @@ -360,7 +360,7 @@ struct Wasm_test : public beast::unit_test::suite if (BEAST_EXPECT(re.has_value())) { BEAST_EXPECTS(re->result == 1, std::to_string(re->result)); - BEAST_EXPECTS(re->cost == 39'602, std::to_string(re->cost)); + BEAST_EXPECTS(re->cost == 64'263, std::to_string(re->cost)); } } @@ -371,7 +371,7 @@ struct Wasm_test : public beast::unit_test::suite if (BEAST_EXPECT(re.has_value())) { BEAST_EXPECTS(re->result == 1, std::to_string(re->result)); - BEAST_EXPECTS(re->cost == 39'602, std::to_string(re->cost)); + BEAST_EXPECTS(re->cost == 64'263, std::to_string(re->cost)); } } @@ -393,7 +393,7 @@ struct Wasm_test : public beast::unit_test::suite if (BEAST_EXPECT(re.has_value())) { BEAST_EXPECTS(re->result == -201, std::to_string(re->result)); - BEAST_EXPECTS(re->cost == 5'012, std::to_string(re->cost)); + BEAST_EXPECTS(re->cost == 28'148, std::to_string(re->cost)); } } @@ -415,7 +415,7 @@ struct Wasm_test : public beast::unit_test::suite if (BEAST_EXPECT(re.has_value())) { BEAST_EXPECTS(re->result == -201, std::to_string(re->result)); - BEAST_EXPECTS(re->cost == 5'012, std::to_string(re->cost)); + BEAST_EXPECTS(re->cost == 28'148, std::to_string(re->cost)); } } @@ -539,11 +539,11 @@ struct Wasm_test : public beast::unit_test::suite std::vector const wasm(wasmStr.begin(), wasmStr.end()); TestHostFunctions hf(env, 0); - auto re = runEscrowWasm(wasm, hf, funcName, {}, 100'000); + auto re = runEscrowWasm(wasm, hf, funcName, {}, 200'000); if (BEAST_EXPECT(re.has_value())) { BEAST_EXPECTS(re->result == 1, std::to_string(re->result)); - BEAST_EXPECTS(re->cost == 97'356, std::to_string(re->cost)); + BEAST_EXPECTS(re->cost == 110'699, std::to_string(re->cost)); } env.close(); } @@ -558,7 +558,7 @@ struct Wasm_test : public beast::unit_test::suite if (BEAST_EXPECT(re.has_value())) { BEAST_EXPECTS(re->result == 1, std::to_string(re->result)); - BEAST_EXPECTS(re->cost == 2'054, std::to_string(re->cost)); + BEAST_EXPECTS(re->cost == 4'259, std::to_string(re->cost)); } env.close(); } @@ -672,7 +672,7 @@ struct Wasm_test : public beast::unit_test::suite Bytes const wasm(wasmStr.begin(), wasmStr.end()); TestHostFunctions hfs(env, 0); - auto const allowance = 291'334; + auto const allowance = 326'151; auto re = runEscrowWasm(wasm, hfs, ESCROW_FUNCTION_NAME, {}, allowance); if (BEAST_EXPECT(re.has_value()))