From 9f650f4258ddc27435a183e312f709cca423c1ab Mon Sep 17 00:00:00 2001 From: Richard Holland Date: Mon, 4 Dec 2023 11:34:45 +0000 Subject: [PATCH] . --- src/test/consensus/UNLReport_test.cpp | 32 +++++---------------------- src/test/jtx/impl/acctdelete.cpp | 1 + 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/src/test/consensus/UNLReport_test.cpp b/src/test/consensus/UNLReport_test.cpp index 59cd3437f..5be39a236 100644 --- a/src/test/consensus/UNLReport_test.cpp +++ b/src/test/consensus/UNLReport_test.cpp @@ -60,34 +60,12 @@ namespace test { // * @param pass if the Tx should be applied successfully // * @return true if meet the expectation of apply result // */ -bool inline applyAndTestResult( +inline bool +applyAndTestUNLRResult( jtx::Env& env, - ripple::OpenView& view, - ripple::STTx const& tx, - bool pass) -{ - auto res = apply(env.app(), view, tx, ApplyFlags::tapNONE, env.journal); - if (pass) - return res.first == tesSUCCESS; - else - return res.first == tefFAILURE || res.first == temDISABLED; -} -* / - inline bool - applyAndTestUNLRResult( - jtx::Env& env, - OpenView& view, - STTx const& tx, - bool pass) -{ - auto res = apply(env.app(), view, tx, ApplyFlags::tapNONE, env.journal); - if (pass) - return res.first == tesSUCCESS; - else - return res.first == tefFAILURE || res.first == temDISABLED || - res.first == temMALFORMED || - res.first == telIMPORT_VL_KEY_NOT_RECOGNISED; -} + OpenView& view, + STTx const& tx, + bool pass); /** * Verify the content of UNL Report entries (public key and ledger sequence) diff --git a/src/test/jtx/impl/acctdelete.cpp b/src/test/jtx/impl/acctdelete.cpp index f7d9aa9b6..ea104e22b 100644 --- a/src/test/jtx/impl/acctdelete.cpp +++ b/src/test/jtx/impl/acctdelete.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include