diff --git a/src/ripple/app/hook/Guard.h b/src/ripple/app/hook/Guard.h index 6231ced44..f065381ca 100644 --- a/src/ripple/app/hook/Guard.h +++ b/src/ripple/app/hook/Guard.h @@ -3,13 +3,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include using GuardLog = std::optional>>; diff --git a/src/ripple/app/tx/impl/Escrow.cpp b/src/ripple/app/tx/impl/Escrow.cpp index f54299d29..552a0ebaa 100644 --- a/src/ripple/app/tx/impl/Escrow.cpp +++ b/src/ripple/app/tx/impl/Escrow.cpp @@ -447,7 +447,7 @@ EscrowFinish::preflight(PreflightContext const& ctx) if ((!ctx.tx.isFieldPresent(sfEscrowID) && !ctx.tx.isFieldPresent(sfOfferSequence)) || (ctx.tx.isFieldPresent(sfEscrowID) && - ctx.tx.isFieldPresent(sfOfferSequence))) + ctx.tx.isFieldPresent(sfOfferSequence))) return temMALFORMED; } @@ -730,7 +730,7 @@ EscrowCancel::preflight(PreflightContext const& ctx) if ((!ctx.tx.isFieldPresent(sfEscrowID) && !ctx.tx.isFieldPresent(sfOfferSequence)) || (ctx.tx.isFieldPresent(sfEscrowID) && - ctx.tx.isFieldPresent(sfOfferSequence))) + ctx.tx.isFieldPresent(sfOfferSequence))) return temMALFORMED; } diff --git a/src/ripple/json/impl/json_reader.cpp b/src/ripple/json/impl/json_reader.cpp index 88dd551d4..dd2f9a694 100644 --- a/src/ripple/json/impl/json_reader.cpp +++ b/src/ripple/json/impl/json_reader.cpp @@ -924,7 +924,8 @@ Reader::getLocationLineAndColumn(Location location) const { int line, column; getLocationLineAndColumn(location, line, column); - return "Line " + std::to_string(line) + ", Column " + std::to_string(column); + return "Line " + std::to_string(line) + ", Column " + + std::to_string(column); } std::string diff --git a/src/test/app/SetHook_test.cpp b/src/test/app/SetHook_test.cpp index 06b0863a3..c70c6e835 100644 --- a/src/test/app/SetHook_test.cpp +++ b/src/test/app/SetHook_test.cpp @@ -320,7 +320,7 @@ public: HSFEE, ter(temMALFORMED)); - env(ripple::test::jtx::hook(alice, {{}}, 0), + env(ripple::test::jtx::hook(alice, Json::Value{Json::arrayValue}, 0), M("Must have a non-empty hooks field"), HSFEE, ter(temMALFORMED));