diff --git a/src/tests/libxrpl/helpers/IOU.h b/src/tests/libxrpl/helpers/IOU.h index 45663eaa60..33010b4467 100644 --- a/src/tests/libxrpl/helpers/IOU.h +++ b/src/tests/libxrpl/helpers/IOU.h @@ -40,6 +40,7 @@ public: IOU(std::string_view currencyCode, Account const& issuer) : currency_(to_currency(std::string(currencyCode))), issuer_(issuer.id()) { + XRPL_ASSERT(!isXRP(currency_), "IOU: currency code must not resolve to XRP"); } /** diff --git a/src/tests/libxrpl/helpers/TxTest.cpp b/src/tests/libxrpl/helpers/TxTest.cpp index ad193f7310..ef82b7e753 100644 --- a/src/tests/libxrpl/helpers/TxTest.cpp +++ b/src/tests/libxrpl/helpers/TxTest.cpp @@ -100,17 +100,24 @@ TxTest::submit(std::shared_ptr stx) void TxTest::createAccount(Account const& account, XRPAmount xrp, uint32_t accountFlags) { - ASSERT_EQ( - submit(transactions::PaymentBuilder{Account::master, account, xrp}, Account::master).ter, - tesSUCCESS); + auto const paymentTer = + submit(transactions::PaymentBuilder{Account::master, account, xrp}, Account::master).ter; + + if (paymentTer != tesSUCCESS) + { + throw std::runtime_error("TxTest::createAccount: failed to create account"); + } close(); if (accountFlags != 0) { - ASSERT_EQ( - submit(transactions::AccountSetBuilder{account}.setSetFlag(accountFlags), account).ter, - tesSUCCESS); + auto const accountSetTer = + submit(transactions::AccountSetBuilder{account}.setSetFlag(accountFlags), account).ter; + if (accountSetTer != tesSUCCESS) + { + throw std::runtime_error("TxTest::createAccount: failed to set account flags"); + } close(); } } @@ -174,7 +181,10 @@ TxTest::close() for (auto const& [key, tx] : txSet) { auto result = apply(registry_, accum, *tx, tapNONE, registry_.journal("apply")); - ASSERT_TRUE(result.applied) << "TxTest::close: failed to apply transaction"; + if (!result.applied) + { + throw std::runtime_error("TxTest::close: failed to apply transaction"); + } } accum.apply(*newLedger); } diff --git a/src/tests/libxrpl/helpers/TxTest.h b/src/tests/libxrpl/helpers/TxTest.h index 178d092b4f..e0f7cd68a4 100644 --- a/src/tests/libxrpl/helpers/TxTest.h +++ b/src/tests/libxrpl/helpers/TxTest.h @@ -113,7 +113,7 @@ asfToLsf(std::uint32_t asf) case asfAllowTrustLineLocking: return lsfAllowTrustLineLocking; default: - return 0; + throw std::runtime_error("Unknown asf flag"); } }