From 96bb67bfe59cc73bad8985ccbd4aa4823057e318 Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Tue, 2 Apr 2024 17:12:59 +0200 Subject: [PATCH] clang-format --- src/ripple/app/tx/impl/SetRemarks.cpp | 22 ++++---- src/test/app/SetRemarks_test.cpp | 80 +++++++++++++++++---------- src/test/jtx/remarks.h | 4 +- 3 files changed, 65 insertions(+), 41 deletions(-) diff --git a/src/ripple/app/tx/impl/SetRemarks.cpp b/src/ripple/app/tx/impl/SetRemarks.cpp index 5cd03483f..25ff1d080 100644 --- a/src/ripple/app/tx/impl/SetRemarks.cpp +++ b/src/ripple/app/tx/impl/SetRemarks.cpp @@ -42,8 +42,8 @@ SetRemarks::validateRemarks(STArray const& remarks, beast::Journal const& j) if (remarks.empty() || remarks.size() > 32) { - JLOG(j.warn()) << "SetRemarks: Cannot set more than 32 remarks (or fewer " - "than 1) in a txn."; + JLOG(j.warn()) << "SetRemarks: Cannot set more than 32 remarks (or " + "fewer than 1) in a txn."; return temMALFORMED; } @@ -67,8 +67,8 @@ SetRemarks::validateRemarks(STArray const& remarks, beast::Journal const& j) } if (name.size() == 0 || name.size() > 256) { - JLOG(j.warn()) << "SetRemarks: RemarkName cannot be empty or larger " - "than 256 chars."; + JLOG(j.warn()) << "SetRemarks: RemarkName cannot be empty or " + "larger than 256 chars."; return temMALFORMED; } @@ -78,7 +78,8 @@ SetRemarks::validateRemarks(STArray const& remarks, beast::Journal const& j) remark.isFieldPresent(sfFlags) ? remark.getFieldU32(sfFlags) : 0; if (flags != 0 && flags != tfImmutable) { - JLOG(j.warn()) << "SetRemarks: Flags must be either tfImmutable or 0"; + JLOG(j.warn()) + << "SetRemarks: Flags must be either tfImmutable or 0"; return temMALFORMED; } @@ -86,8 +87,8 @@ SetRemarks::validateRemarks(STArray const& remarks, beast::Journal const& j) { if (flags & tfImmutable) { - JLOG(j.warn()) - << "SetRemarks: A remark deletion cannot be marked immutable."; + JLOG(j.warn()) << "SetRemarks: A remark deletion cannot be " + "marked immutable."; return temMALFORMED; } continue; @@ -96,8 +97,8 @@ SetRemarks::validateRemarks(STArray const& remarks, beast::Journal const& j) Blob const& val = remark.getFieldVL(sfRemarkValue); if (val.size() == 0 || val.size() > 256) { - JLOG(j.warn()) << "SetRemarks: RemarkValue cannot be empty or larger " - "than 256 chars."; + JLOG(j.warn()) << "SetRemarks: RemarkValue cannot be empty or " + "larger than 256 chars."; return temMALFORMED; } } @@ -300,7 +301,8 @@ SetRemarks::preclaim(PreclaimContext const& ctx) if (count > 32) { - JLOG(ctx.j.warn()) << "SetRemarks: an object may have at most 32 remarks."; + JLOG(ctx.j.warn()) + << "SetRemarks: an object may have at most 32 remarks."; return tecTOO_MANY_REMARKS; } diff --git a/src/test/app/SetRemarks_test.cpp b/src/test/app/SetRemarks_test.cpp index b3fc9dcb5..c487f443d 100644 --- a/src/test/app/SetRemarks_test.cpp +++ b/src/test/app/SetRemarks_test.cpp @@ -50,8 +50,10 @@ struct SetRemarks_test : public beast::unit_test::suite std::vector marks = { {"CAFE", "DEADBEEF", 0}, }; - auto const txResult = withRemarks ? ter(tesSUCCESS) : ter(temDISABLED); - env(remarks::setRemarks(alice, keylet::account(alice).key, marks), txResult); + auto const txResult = + withRemarks ? ter(tesSUCCESS) : ter(temDISABLED); + env(remarks::setRemarks(alice, keylet::account(alice).key, marks), + txResult); env.close(); } } @@ -82,25 +84,33 @@ struct SetRemarks_test : public beast::unit_test::suite std::vector marks = { {"CAFE", "DEADBEEF", 0}, }; - env(remarks::setRemarks(alice, keylet::account(alice).key, marks), txflags(tfClose), ter(temMALFORMED)); + env(remarks::setRemarks(alice, keylet::account(alice).key, marks), + txflags(tfClose), + ter(temMALFORMED)); env.close(); } - // temMALFORMED: SetRemarks: Cannot set more than 32 remarks (or fewer than 1) in a txn. + // temMALFORMED: SetRemarks: Cannot set more than 32 remarks (or fewer + // than 1) in a txn. { std::vector marks; - for (int i = 0; i < 0; ++i) { + for (int i = 0; i < 0; ++i) + { marks.push_back({"CAFE", "DEADBEEF", 0}); } - env(remarks::setRemarks(alice, keylet::account(alice).key, marks), ter(temMALFORMED)); + env(remarks::setRemarks(alice, keylet::account(alice).key, marks), + ter(temMALFORMED)); env.close(); } - // temMALFORMED: SetRemarks: Cannot set more than 32 remarks (or fewer than 1) in a txn. + // temMALFORMED: SetRemarks: Cannot set more than 32 remarks (or fewer + // than 1) in a txn. { std::vector marks; - for (int i = 0; i < 33; ++i) { + for (int i = 0; i < 33; ++i) + { marks.push_back({"CAFE", "DEADBEEF", 0}); } - env(remarks::setRemarks(alice, keylet::account(alice).key, marks), ter(temMALFORMED)); + env(remarks::setRemarks(alice, keylet::account(alice).key, marks), + ter(temMALFORMED)); env.close(); } // temMALFORMED: SetRemarks: contained non-sfRemark field. @@ -116,7 +126,8 @@ struct SetRemarks_test : public beast::unit_test::suite for (std::size_t i = 0; i < 1; ++i) { ja[i][sfGenesisMint.jsonName] = Json::Value{}; - ja[i][sfGenesisMint.jsonName][jss::Amount] = STAmount(1).getJson(JsonOptions::none); + ja[i][sfGenesisMint.jsonName][jss::Amount] = + STAmount(1).getJson(JsonOptions::none); ja[i][sfGenesisMint.jsonName][jss::Destination] = bob.human(); } jv[sfRemarks.jsonName] = ja; @@ -129,24 +140,29 @@ struct SetRemarks_test : public beast::unit_test::suite {"CAFE", "DEADBEEF", 0}, {"CAFE", "DEADBEEF", 0}, }; - env(remarks::setRemarks(alice, keylet::account(alice).key, marks), ter(temMALFORMED)); + env(remarks::setRemarks(alice, keylet::account(alice).key, marks), + ter(temMALFORMED)); env.close(); } - // temMALFORMED: SetRemarks: RemarkName cannot be empty or larger than 256 chars. + // temMALFORMED: SetRemarks: RemarkName cannot be empty or larger than + // 256 chars. { std::vector marks = { {"", "DEADBEEF", 0}, }; - env(remarks::setRemarks(alice, keylet::account(alice).key, marks), ter(temMALFORMED)); + env(remarks::setRemarks(alice, keylet::account(alice).key, marks), + ter(temMALFORMED)); env.close(); } - // temMALFORMED: SetRemarks: RemarkName cannot be empty or larger than 256 chars. + // temMALFORMED: SetRemarks: RemarkName cannot be empty or larger than + // 256 chars. { std::string const name((256 * 2) + 1, 'A'); std::vector marks = { {name, "DEADBEEF", 0}, }; - env(remarks::setRemarks(alice, keylet::account(alice).key, marks), ter(temMALFORMED)); + env(remarks::setRemarks(alice, keylet::account(alice).key, marks), + ter(temMALFORMED)); env.close(); } // temMALFORMED: SetRemarks: Flags must be either tfImmutable or 0 @@ -154,32 +170,39 @@ struct SetRemarks_test : public beast::unit_test::suite std::vector marks = { {"CAFE", "DEADBEEF", 2}, }; - env(remarks::setRemarks(alice, keylet::account(alice).key, marks), ter(temMALFORMED)); + env(remarks::setRemarks(alice, keylet::account(alice).key, marks), + ter(temMALFORMED)); env.close(); } - // temMALFORMED: SetRemarks: A remark deletion cannot be marked immutable. + // temMALFORMED: SetRemarks: A remark deletion cannot be marked + // immutable. { std::vector marks = { {"CAFE", std::nullopt, 1}, }; - env(remarks::setRemarks(alice, keylet::account(alice).key, marks), ter(temMALFORMED)); + env(remarks::setRemarks(alice, keylet::account(alice).key, marks), + ter(temMALFORMED)); env.close(); } - // temMALFORMED: SetRemarks: RemarkValue cannot be empty or larger than 256 chars. + // temMALFORMED: SetRemarks: RemarkValue cannot be empty or larger than + // 256 chars. { std::vector marks = { {"CAFE", "", 0}, }; - env(remarks::setRemarks(alice, keylet::account(alice).key, marks), ter(temMALFORMED)); + env(remarks::setRemarks(alice, keylet::account(alice).key, marks), + ter(temMALFORMED)); env.close(); } - // temMALFORMED: SetRemarks: RemarkValue cannot be empty or larger than 256 chars. + // temMALFORMED: SetRemarks: RemarkValue cannot be empty or larger than + // 256 chars. { std::string const value((256 * 2) + 1, 'A'); std::vector marks = { {"CAFE", value, 0}, }; - env(remarks::setRemarks(alice, keylet::account(alice).key, marks), ter(temMALFORMED)); + env(remarks::setRemarks(alice, keylet::account(alice).key, marks), + ter(temMALFORMED)); env.close(); } } @@ -196,9 +219,8 @@ struct SetRemarks_test : public beast::unit_test::suite // Env env{*this, features}; - Env env{*this, envconfig(), features, nullptr, - beast::severities::kWarning - }; + Env env{ + *this, envconfig(), features, nullptr, beast::severities::kWarning}; env.fund(XRP(1000), alice, bob); env.close(); @@ -226,7 +248,8 @@ struct SetRemarks_test : public beast::unit_test::suite // tecNO_PERMISSION: issuer != _account // tecIMMUTABLE: SetRemarks: attempt to mutate an immutable remark. // tecCLAIM: SetRemarks: insane remarks accounting. - // tecTOO_MANY_REMARKS: SetRemarks: an object may have at most 32 remarks. + // tecTOO_MANY_REMARKS: SetRemarks: an object may have at most 32 + // remarks. } void @@ -241,9 +264,8 @@ struct SetRemarks_test : public beast::unit_test::suite // Env env{*this, features}; - Env env{*this, envconfig(), features, nullptr, - beast::severities::kWarning - }; + Env env{ + *this, envconfig(), features, nullptr, beast::severities::kWarning}; env.fund(XRP(1000), alice, bob); env.close(); diff --git a/src/test/jtx/remarks.h b/src/test/jtx/remarks.h index 192cd64a7..b4d958598 100644 --- a/src/test/jtx/remarks.h +++ b/src/test/jtx/remarks.h @@ -38,11 +38,11 @@ struct remark std::string name_, std::optional value_ = std::nullopt, std::optional flags_ = std::nullopt) - : name(name_), value(value_), flags(flags_) + : name(name_), value(value_), flags(flags_) { if (value_) value = *value_; - + if (flags_) flags = *flags_; }